Skip to content

Commit feb8b16

Browse files
stianlikstianlik
committed
Merge branch 'master' into gson-disableHtmlEscaping
2 parents 282f359 + c91ce17 commit feb8b16

File tree

227 files changed

+6738
-2487
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+6738
-2487
lines changed

‎bin/java-play-framework-petstore-server-all.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
./bin/java-play-framework-petstore-server-no-swagger-ui.sh
99
./bin/java-play-framework-petstore-server-no-wrap-calls.sh
1010
./bin/java-play-framework-petstore-server-fake-endpoints.sh
11-
./bin/java-play-framework-petstore-server-api-package-override.sh
11+
./bin/java-play-framework-petstore-server-api-package-override.sh
12+
./bin/java-play-framework-petstore-server-async.sh

‎bin/java-play-framework-petstore-server-async.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"additionalProperties" : {
3+
"supportAsync" : true
4+
}
5+
}

‎bin/java-play-framework-petstore-server-async.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/bin/sh
2+
3+
SCRIPT="$0"
4+
5+
while [ -h "$SCRIPT" ] ; do
6+
ls=`ls -ld "$SCRIPT"`
7+
link=`expr "$ls" : '.*-> \(.*\)$'`
8+
if expr "$link" : '/.*' > /dev/null; then
9+
SCRIPT="$link"
10+
else
11+
SCRIPT=`dirname "$SCRIPT"`/"$link"
12+
fi
13+
done
14+
15+
if [ ! -d "${APP_DIR}" ]; then
16+
APP_DIR=`dirname "$SCRIPT"`/..
17+
APP_DIR=`cd "${APP_DIR}"; pwd`
18+
fi
19+
20+
executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
21+
22+
if [ ! -f "$executable" ]
23+
then
24+
mvn clean package
25+
fi
26+
27+
# if you've executed sbt assembly previously it will use that instead.
28+
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
29+
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaPlayFramework -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l java-play-framework -c bin/java-play-framework-petstore-server-async.json -o samples/server/petstore/java-play-framework-async -DhideGenerationTimestamp=true"
30+
31+
java $JAVA_OPTS -jar $executable $ags

‎bin/jaxrs-cxf-client-petstore.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ fi
2626

2727
# if you've executed sbt assembly previously it will use that instead.
2828
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
29-
ags="$@ generate --artifact-id "jaxrs-cxf-petstore-client" -t modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/ -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-cxf -o samples/client/petstore/jaxrs-cxf-client/"
29+
ags="$@ generate --artifact-id "jaxrs-cxf-petstore-client" -t modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/ -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-cxf-client -o samples/client/petstore/jaxrs-cxf-client/"
3030

3131
java $JAVA_OPTS -jar $executable $ags

‎bin/windows/jaxrs-cxf-petstore-server.bat

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
2+
3+
If Not Exist %executable% (
4+
mvn clean package
5+
)
6+
7+
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
8+
set ags=generate -t modules\swagger-codegen\src\main\resources\JavaJaxRS\cxf -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l jaxrs-cxf -o samples\server\petstore\jaxrs-cxf -DhideGenerationTimestamp=true
9+
10+
java %JAVA_OPTS% -jar %executable% %ags%

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,13 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
5151
public static final String DEFAULT_LIBRARY = "<default>";
5252
public static final String DATE_LIBRARY = "dateLibrary";
5353
public static final String JAVA8_MODE = "java8";
54+
public static final String SUPPORT_ASYNC = "supportAsync";
5455
public static final String WITH_XML = "withXml";
5556
public static final String SUPPORT_JAVA6 = "supportJava6";
5657
public static final String DISABLE_HTML_ESCAPING = "disableHtmlEscaping";
5758

5859
protected String dateLibrary = "threetenbp";
60+
protected boolean supportAsync = false;
5961
protected boolean java8Mode = false;
6062
protected boolean withXml = false;
6163
protected String invokerPackage = "io.swagger";
@@ -388,14 +390,21 @@ public void processOpts() {
388390
// used later in recursive import in postProcessingModels
389391
importMapping.put("com.fasterxml.jackson.annotation.JsonProperty", "com.fasterxml.jackson.annotation.JsonCreator");
390392

391-
if(additionalProperties.containsKey(JAVA8_MODE)) {
393+
if (additionalProperties.containsKey(JAVA8_MODE)) {
392394
setJava8Mode(Boolean.parseBoolean(additionalProperties.get(JAVA8_MODE).toString()));
393395
if ( java8Mode ) {
394396
additionalProperties.put("java8", "true");
395397
}
396398
}
397399

398-
if(additionalProperties.containsKey(WITH_XML)) {
400+
if (additionalProperties.containsKey(SUPPORT_ASYNC)) {
401+
setSupportAsync(Boolean.parseBoolean(additionalProperties.get(SUPPORT_ASYNC).toString()));
402+
if (supportAsync) {
403+
additionalProperties.put(SUPPORT_ASYNC, "true");
404+
}
405+
}
406+
407+
if (additionalProperties.containsKey(WITH_XML)) {
399408
setWithXml(Boolean.parseBoolean(additionalProperties.get(WITH_XML).toString()));
400409
if ( withXml ) {
401410
additionalProperties.put(WITH_XML, "true");
@@ -1228,6 +1237,10 @@ public void setDisableHtmlEscaping(boolean disabled) {
12281237
this.disableHtmlEscaping = disabled;
12291238
}
12301239

1240+
public void setSupportAsync(boolean enabled) {
1241+
this.supportAsync = enabled;
1242+
}
1243+
12311244
@Override
12321245
public String escapeQuotationMark(String input) {
12331246
// remove " to avoid code injection

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaJAXRSServerCodegen.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ public void preprocessSwagger(Swagger swagger) {
134134

135135
@Override
136136
public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
137+
return jaxrsPostProcessOperations(objs);
138+
}
139+
140+
static Map<String, Object> jaxrsPostProcessOperations(Map<String, Object> objs) {
137141
@SuppressWarnings("unchecked")
138142
Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
139143
if ( operations != null ) {

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaCXFClientCodegen.java

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -137,22 +137,7 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert
137137
@SuppressWarnings("unchecked")
138138
public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
139139
objs = super.postProcessOperations(objs);
140-
141-
Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
142-
if (operations != null) {
143-
List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
144-
for (CodegenOperation operation : ops) {
145-
146-
if (operation.returnType == null) {
147-
operation.returnType = "void";
148-
// set vendorExtensions.x-java-is-response-void to true as
149-
// returnType is set to "void"
150-
operation.vendorExtensions.put("x-java-is-response-void", true);
151-
}
152-
}
153-
}
154-
155-
return operations;
140+
return AbstractJavaJAXRSServerCodegen.jaxrsPostProcessOperations(objs);
156141
}
157142

158143
@Override

‎modules/swagger-codegen/src/main/resources/Java/build.gradle.mustache

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,13 @@ dependencies {
122122
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
123123
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
124124
{{#joda}}
125-
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version",
125+
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
126126
{{/joda}}
127127
{{#java8}}
128-
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version",
128+
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
129129
{{/java8}}
130130
{{#threetenbp}}
131-
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version",
131+
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version"
132132
{{/threetenbp}}
133133
{{^java8}}
134134
compile "com.brsanthu:migbase64:2.2"

‎modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/model.mustache

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package {{package}};
44
{{/imports}}
55
{{#useBeanValidation}}
66
import javax.validation.constraints.*;
7+
import javax.validation.Valid;
78
{{/useBeanValidation}}
89

910
{{#models}}

0 commit comments

Comments
 (0)