jlengrand/openapi-generator
1
0
Fork 0
mirror of https://github.com/jlengrand/openapi-generator.git synced 2026-05-14 00:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:

#	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java
This commit is contained in:
Maelig Nantel
2016-01-18 10:10:27 +01:00
parent 467939216c 7b1dde3d85
commit a39942f43f
31 changed files with 272 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JavaOptionsProvider.java
View File

@@ -39,6 +39,7 @@ public class JavaOptionsProvider implements OptionsProvider {
.put(JavaClientCodegen.FULL_JAVA_UTIL, FULL_JAVA_UTIL_VALUE)
.put(CodegenConstants.LIBRARY, LIBRARY_VALUE)
.put(CodegenConstants.SERIALIZE_BIG_DECIMAL_AS_STRING, "true")
.put(JavaClientCodegen.DATE_LIBRARY, "joda")
.build();
}

4
modules/swagger-codegen/src/test/java/io/swagger/codegen/options/JaxRSServerOptionsProvider.java
View File

@@ -1,7 +1,6 @@
package io.swagger.codegen.options;
import com.google.common.collect.ImmutableMap;
import io.swagger.codegen.languages.JaxRSServerCodegen;
import io.swagger.codegen.CodegenConstants;
import java.util.Map;
@@ -26,8 +25,7 @@ public class JaxRSServerOptionsProvider extends JavaOptionsProvider {
ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<String, String>();
builder.putAll(options)
.put(CodegenConstants.IMPL_FOLDER, IMPL_FOLDER_VALUE)
.put(JaxRSServerCodegen.DATE_LIBRARY, "joda");
.put(CodegenConstants.IMPL_FOLDER, IMPL_FOLDER_VALUE);
return builder.build();
}