Maelig Nantel a39942f43f Merge remote-tracking branch 'refs/remotes/swagger-api/master' into fix-java-warnings ...

# Conflicts:

#	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java

2016-01-18 10:10:27 +01:00

..

akkascala

fix java warnings

2016-01-15 14:02:55 +01:00

android

fix java warnings

2016-01-15 14:02:55 +01:00

asyncscala

fix java warnings

2016-01-15 14:02:55 +01:00

config

fix java warnings

2016-01-15 14:02:55 +01:00

csharp

fix java warnings

2016-01-15 14:02:55 +01:00

csharpdotnettwo

fix java warnings

2016-01-15 14:02:55 +01:00

dart

fix java warnings

2016-01-15 14:02:55 +01:00

flash

fix java warnings

2016-01-15 14:02:55 +01:00

inflector

fix java warnings

2016-01-15 14:02:55 +01:00

java

fix java warnings

2016-01-15 14:02:55 +01:00

jaxrs

fix java warnings

2016-01-15 14:02:55 +01:00

languages

fix java warnings

2016-01-15 14:02:55 +01:00

nodejs

fix java warnings

2016-01-15 14:02:55 +01:00

objc

fix java warnings

2016-01-15 14:02:55 +01:00

options

Merge remote-tracking branch 'refs/remotes/swagger-api/master' into fix-java-warnings

2016-01-18 10:10:27 +01:00

perl

fix java warnings

2016-01-15 14:02:55 +01:00

php

fix java warnings

2016-01-15 14:02:55 +01:00

python

fix java warnings

2016-01-15 14:02:55 +01:00

qtfivecpp

fix java warnings

2016-01-15 14:02:55 +01:00

ruby

fix java warnings

2016-01-15 14:02:55 +01:00

scala

fix java warnings

2016-01-15 14:02:55 +01:00

scalatra

fix java warnings

2016-01-15 14:02:55 +01:00

silex

fix java warnings

2016-01-15 14:02:55 +01:00

sinatra

fix java warnings

2016-01-15 14:02:55 +01:00

slim

fix java warnings

2016-01-15 14:02:55 +01:00

springmvc

fix java warnings

2016-01-15 14:02:55 +01:00

staticDocs

fix java warnings

2016-01-15 14:02:55 +01:00

statichtml

fix java warnings

2016-01-15 14:02:55 +01:00

swagger

fix java warnings

2016-01-15 14:02:55 +01:00

swaggeryaml

fix java warnings

2016-01-15 14:02:55 +01:00

swift

fix java warnings

2016-01-15 14:02:55 +01:00

tizen

fix java warnings

2016-01-15 14:02:55 +01:00

typescriptangular

fix java warnings

2016-01-15 14:02:55 +01:00

typescriptnode

fix java warnings

2016-01-15 14:02:55 +01:00

AbstractOptionsTest.java

Fixing squid:S1161 - @Override annotation should be used on any method overriding (since Java 5) or implementing (since Java 6) another one

2015-12-15 14:09:31 +05:00

ClientAuthInputTest.java

Fixed #1304: Migrate tests from the Scala to the plain Java. Part 1

2015-09-28 19:03:02 +03:00

CodegenConfigLoaderTest.java

undo some of the debugging changes I made

2015-08-27 09:11:49 -07:00

CodegenTest.java

Fixing squid:S1161 - @Override annotation should be used on any method overriding (since Java 5) or implementing (since Java 6) another one

2015-12-15 14:09:31 +05:00

DefaultGeneratorTest.java

fix, tests for #1822

2016-01-06 05:29:44 -08:00

ExampleGeneratorTest.java

Fixed #1304: Migrate tests from the Scala to the plain Java. Part 3

2015-10-02 16:20:16 +03:00

InlineModelResolverTest.java

update test case for inline model

2015-12-18 16:50:55 +08:00

SwaggerMigratorTest.java

Fixed #1304: Migrate tests from the Scala to the plain Java. Part 1

2015-09-28 19:03:02 +03:00