Skip to content

Commit 2f6ad43

Browse files
frantumafrantuma
authored
Merge branch 'master' into add-missing-reserved-words
2 parents 7f9c925 + b827bb9 commit 2f6ad43

File tree

122 files changed

+2229
-130
lines changed

Some content is hidden

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

122 files changed

+2229
-130
lines changed

‎bin/java-petstore-resteasy-all.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
./bin/jaxrs-resteasy-eap-petstore-server.sh
55
./bin/jaxrs-resteasy-eap-java8-petstore-server.sh
66
./bin/jaxrs-resteasy-joda-petstore-server.sh
7+
./bin/jaxrs-resteasy-java8-petstore-server.sh
78
./bin/jaxrs-resteasy-eap-joda-petstore-server.sh
89
./bin/jaxrs-resteasy-petstore-server.sh*

‎bin/jaxrs-resteasy-java8-petstore-server.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"dateLibrary": "java8"
3+
}

‎bin/jaxrs-resteasy-java8-petstore-server.sh

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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 --artifact-id swagger-jaxrs-resteasy-java8-server -t modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-resteasy -o samples/server/petstore/jaxrs-resteasy/java8 -DhideGenerationTimestamp=true -c ./bin/jaxrs-resteasy-java8-petstore-server.json"
30+
31+
echo "Removing files and folders under samples/server/petstore/jaxrs-resteasy/java8/src/main"
32+
rm -rf samples/server/petstore/jaxrs-resteasy/java8/src/main
33+
find samples/server/petstore/jaxrs-resteasy/java8 -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
34+
35+
java $JAVA_OPTS -jar $executable $ags

‎bin/jaxrs-resteasy-joda-petstore-server.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,8 @@ fi
2828
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
2929
ags="$@ generate --artifact-id swagger-jaxrs-resteasy-joda-server -t modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-resteasy -o samples/server/petstore/jaxrs-resteasy/joda -DhideGenerationTimestamp=true -c ./bin/jaxrs-resteasy-joda-petstore-server.json"
3030

31+
echo "Removing files and folders under samples/server/petstore/jaxrs-resteasy/joda/src/main"
32+
rm -rf samples/server/petstore/jaxrs-resteasy/joda/src/main
33+
find samples/server/petstore/jaxrs-resteasy/joda -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
34+
3135
java $JAVA_OPTS -jar $executable $ags

‎bin/jaxrs-resteasy-petstore-server.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,8 @@ fi
2828
export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
2929
ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l jaxrs-resteasy -o samples/server/petstore/jaxrs-resteasy/default -DhideGenerationTimestamp=true"
3030

31+
echo "Removing files and folders under samples/server/petstore/jaxrs-resteasy/default/src/main"
32+
rm -rf samples/server/petstore/jaxrs-resteasy/default/src/main
33+
find samples/server/petstore/jaxrs-resteasy/default -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
34+
3135
java $JAVA_OPTS -jar $executable $ags

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ public void processOpts() {
403403
if (additionalProperties.containsKey(JAVA8_MODE)) {
404404
setJava8Mode(Boolean.parseBoolean(additionalProperties.get(JAVA8_MODE).toString()));
405405
if ( java8Mode ) {
406-
additionalProperties.put("java8", "true");
406+
additionalProperties.put("java8", true);
407407
}
408408
}
409409

@@ -426,20 +426,20 @@ public void processOpts() {
426426
}
427427

428428
if ("threetenbp".equals(dateLibrary)) {
429-
additionalProperties.put("threetenbp", "true");
429+
additionalProperties.put("threetenbp", true);
430430
additionalProperties.put("jsr310", "true");
431431
typeMapping.put("date", "LocalDate");
432432
typeMapping.put("DateTime", "OffsetDateTime");
433433
importMapping.put("LocalDate", "org.threeten.bp.LocalDate");
434434
importMapping.put("OffsetDateTime", "org.threeten.bp.OffsetDateTime");
435435
} else if ("joda".equals(dateLibrary)) {
436-
additionalProperties.put("joda", "true");
436+
additionalProperties.put("joda", true);
437437
typeMapping.put("date", "LocalDate");
438438
typeMapping.put("DateTime", "DateTime");
439439
importMapping.put("LocalDate", "org.joda.time.LocalDate");
440440
importMapping.put("DateTime", "org.joda.time.DateTime");
441441
} else if (dateLibrary.startsWith("java8")) {
442-
additionalProperties.put("java8", "true");
442+
additionalProperties.put("java8", true);
443443
additionalProperties.put("jsr310", "true");
444444
if ("java8-localdatetime".equals(dateLibrary)) {
445445
typeMapping.put("date", "LocalDate");
@@ -457,7 +457,7 @@ public void processOpts() {
457457
importMapping.put("OffsetDateTime", "java.time.OffsetDateTime");
458458
}
459459
} else if (dateLibrary.equals("legacy")) {
460-
additionalProperties.put("legacyDates", "true");
460+
additionalProperties.put("legacyDates", true);
461461
}
462462
}
463463

‎modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/JacksonConfig.mustache

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@ import com.fasterxml.jackson.core.JsonGenerator;
55
import com.fasterxml.jackson.databind.ObjectMapper;
66
import com.fasterxml.jackson.databind.SerializerProvider;
77
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
8-
import com.fasterxml.jackson.datatype.joda.JodaModule;
9-
import org.joda.time.DateTime;
10-
import org.joda.time.LocalDate;
11-
import org.joda.time.format.ISODateTimeFormat;
8+
{{#java8}}
9+
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
10+
{{/java8}}
11+
{{#joda}}
12+
import com.fasterxml.jackson.datatype.joda.JodaModule;
13+
import org.joda.time.DateTime;
14+
import org.joda.time.LocalDate;
15+
import org.joda.time.format.ISODateTimeFormat;
16+
{{/joda}}
1217

1318
import javax.ws.rs.ext.ContextResolver;
1419
import javax.ws.rs.ext.Provider;
@@ -21,7 +26,11 @@ public class JacksonConfig implements ContextResolver<ObjectMapper> {
2126
public JacksonConfig() throws Exception {
2227
2328
objectMapper = new ObjectMapper()
24-
.setDateFormat(new RFC3339DateFormat())
29+
.setDateFormat(new RFC3339DateFormat()){{#legacyDates}};{{/legacyDates}}
30+
{{#java8}}
31+
.registerModule(new JavaTimeModule());
32+
{{/java8}}
33+
{{#joda}}
2534
.registerModule(new JodaModule() {
2635
{
2736
addSerializer(DateTime.class, new StdSerializer<DateTime>(DateTime.class) {
@@ -39,6 +48,7 @@ public class JacksonConfig implements ContextResolver<ObjectMapper> {
3948

4049
}
4150
});
51+
{{/joda}}
4252
}
4353

4454
public ObjectMapper getContext(Class<?> arg0) {

‎modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/gradle.mustache

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,13 @@ dependencies {
2020
{{#useBeanValidation}}
2121
providedCompile 'javax.validation:validation-api:1.1.0.Final'
2222
{{/useBeanValidation}}
23+
{{#java8}}
24+
compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.10'
25+
{{/java8}}
26+
{{^java8}}
2327
compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.10'
2428
compile 'joda-time:joda-time:2.7'
29+
{{/java8}}
2530
//TODO: swaggerFeature
2631
compile 'io.swagger:swagger-jaxrs:1.5.12'
2732

‎modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,25 @@
119119
<version>1.2</version>
120120
<scope>provided</scope>
121121
</dependency>
122-
123-
<dependency>
124-
<groupId>com.fasterxml.jackson.datatype</groupId>
125-
<artifactId>jackson-datatype-joda</artifactId>
126-
<version>2.9.10</version>
127-
</dependency>
128-
<dependency>
129-
<groupId>joda-time</groupId>
130-
<artifactId>joda-time</artifactId>
131-
<version>2.7</version>
132-
</dependency>
122+
{{#java8}}
123+
<dependency>
124+
<groupId>com.fasterxml.jackson.datatype</groupId>
125+
<artifactId>jackson-datatype-jsr310</artifactId>
126+
<version>${jackson-version}</version>
127+
</dependency>
128+
{{/java8}}
129+
{{^java8}}
130+
<dependency>
131+
<groupId>com.fasterxml.jackson.datatype</groupId>
132+
<artifactId>jackson-datatype-joda</artifactId>
133+
<version>${jackson-version}</version>
134+
</dependency>
135+
<dependency>
136+
<groupId>joda-time</groupId>
137+
<artifactId>joda-time</artifactId>
138+
<version>2.7</version>
139+
</dependency>
140+
{{/java8}}
133141
<dependency>
134142
<groupId>io.swagger</groupId>
135143
<artifactId>swagger-jaxrs</artifactId>
@@ -188,5 +196,6 @@
188196
<slf4j-version>1.6.3</slf4j-version>
189197
<junit-version>4.8.1</junit-version>
190198
<servlet-api-version>2.5</servlet-api-version>
199+
<jackson-version>2.9.10</jackson-version>
191200
</properties>
192201
</project>

‎samples/server/petstore/jaxrs-resteasy/default/.swagger-codegen/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.8-SNAPSHOT
1+
2.4.9-SNAPSHOT

0 commit comments

Comments
 (0)