Skip to content

Commit 9e06f70

Browse files
sneumannwing328
sneumann
authored and
wing328
committed
Fix assignment of new object instance to variable (#7379)
* #7359 Fix - use reflection to instantiate non-generated class (#7360) * add tests for java vertx petstore * add swagger example to README.md (#7368) * Fix assignment of new object instance to variable Fixes `Error in foobar$fromJSONString(s) : object 'CategoryObject' not found` Discussion in #6520 (comment) , thanks @wing328 for encouraging.
1 parent 0f66960 commit 9e06f70

File tree

15 files changed

+120
-56
lines changed

15 files changed

+120
-56
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -929,6 +929,7 @@ Presentations/Videos/Tutorials/Books
929929
- 2017/12/07 - [API-driven development with OpenAPI and Swagger, Part 2](https://www.itworld.com/article/3199190/apis/api-driven-development-with-openapi-and-swagger-part-2.html) by Matthew Tyson
930930
- 2017/12/29 - [REST APIs代码生成指南](https://gumroad.com/l/swagger_codegen_beginner_zh)(eBook) by [William Cheng](https://github.com/wing328), [Xin Meng](https://github.com/xmeng1)
931931
- 2017/12/21 - [Using Protocol Buffer to Generate SDK at Hootsuite](http://code.hootsuite.com/using-protocol-buffer-to-generate-sdk-at-hoosuite/?lipi=urn%3Ali%3Apage%3Ad_flagship3_messaging%3By4ATz3SDRXyvXJJ14LQysQ%3D%3D) by [Joy Zhang](https://www.linkedin.com/in/joy8zhang/)
932+
- 2018/01/11 - [Swagger 工具箱介绍及代码自动生成示例](https://github.com/qct/swagger-example) by [qct](https://github.com/qct)
932933

933934
# Swagger Codegen Core Team
934935

‎bin/java-vertx-rx-petstore-server.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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l java-vertx -o samples/server/petstore/java-vertx/rx -DvertxSwaggerRouterVersion=1.2.0,rxInterface=true"
29+
ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l java-vertx --artifact-id swagger-java-vertx-rx-server -o samples/server/petstore/java-vertx/rx -DvertxSwaggerRouterVersion=1.2.0,rxInterface=true"
3030

3131
java $JAVA_OPTS -jar $executable $ags

‎modules/swagger-codegen/src/main/resources/JavaVertXServer/apiVerticle.mustache‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,17 @@ public class {{classname}}Verticle extends AbstractVerticle {
1919

2020
{{#operations}}{{#operation}}{{#vendorExtensions}}final static String {{x-serviceid-varname}} = "{{x-serviceid}}";
2121
{{/vendorExtensions}}{{/operation}}{{/operations}}
22-
//TODO : create Implementation
23-
{{classname}} service = new {{classname}}Impl();
22+
final {{classname}} service;
23+
24+
public {{classname}}Verticle() {
25+
try {
26+
Class serviceImplClass = getClass().getClassLoader().loadClass("{{package}}.{{classname}}Impl");
27+
service = ({{classname}})serviceImplClass.newInstance();
28+
} catch (Exception e) {
29+
logUnexpectedError("{{classname}}Verticle constructor", e);
30+
throw new RuntimeException(e);
31+
}
32+
}
2433

2534
@Override
2635
public void start() throws Exception {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
self$`{{baseName}}` <- lapply({{classname}}Object$`{{baseName}}`, function(x) {{datatype}}$new()$fromJSON(jsonlite::toJSON(x, auto_unbox = TRUE)))
128128
{{/isListContainer}}
129129
{{^isListContainer}}
130-
{{datatype}}Object -> {{datatype}}$new()
130+
{{datatype}}Object <- {{datatype}}$new()
131131
self$`{{baseName}}` <- {{datatype}}Object$fromJSON(jsonlite::toJSON({{classname}}Object${{baseName}}, auto_unbox = TRUE))
132132
{{/isListContainer}}
133133
{{/isPrimitiveType}}

‎pom.xml.circleci‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -843,8 +843,10 @@
843843
<!-- test non-java projects -->
844844
<module>samples/client/petstore/go</module>
845845
<!-- servers -->
846+
<module>samples/server/petstore/java-vertx/rx</module>
847+
<module>samples/server/petstore/java-vertx/async</module>
846848
<module>samples/server/petstore/java-inflector</module>
847-
<module>samples/server/petstore/java-pkmst</module>
849+
<module>samples/server/petstore/java-pkmst</module>
848850
<module>samples/server/petstore/java-play-framework</module>
849851
<module>samples/server/petstore/undertow</module>
850852
<module>samples/server/petstore/jaxrs/jersey1</module>

‎samples/server/petstore/java-vertx/async/.swagger-codegen/VERSION‎

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

‎samples/server/petstore/java-vertx/async/pom.xml‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<junit.version>4.12</junit.version>
1616
<vertx.version>3.4.1</vertx.version>
1717
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
18-
<vertx-swagger-router.version>1.2.0</vertx-swagger-router.version>
18+
<vertx-swagger-router.version>1.4.0</vertx-swagger-router.version>
1919
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
2020
<jackson-datatype-jsr310.version>2.7.4</jackson-datatype-jsr310.version>
2121
</properties>
@@ -28,25 +28,24 @@
2828
<scope>test</scope>
2929
</dependency>
3030

31-
<dependency>
32-
<groupId>io.vertx</groupId>
33-
<artifactId>vertx-unit</artifactId>
34-
<version>${vertx.version}</version>
35-
<scope>test</scope>
36-
</dependency>
37-
3831
<dependency>
39-
<groupId>com.github.phiz71</groupId>
40-
<artifactId>vertx-swagger-router</artifactId>
41-
<version>${vertx-swagger-router.version}</version>
42-
</dependency>
32+
<groupId>io.vertx</groupId>
33+
<artifactId>vertx-unit</artifactId>
34+
<version>${vertx.version}</version>
35+
<scope>test</scope>
36+
</dependency>
4337

44-
<dependency>
45-
<groupId>com.fasterxml.jackson.datatype</groupId>
46-
<artifactId>jackson-datatype-jsr310</artifactId>
47-
<version>${jackson-datatype-jsr310.version}</version>
48-
</dependency>
38+
<dependency>
39+
<groupId>com.github.phiz71</groupId>
40+
<artifactId>vertx-swagger-router</artifactId>
41+
<version>${vertx-swagger-router.version}</version>
42+
</dependency>
4943

44+
<dependency>
45+
<groupId>com.fasterxml.jackson.datatype</groupId>
46+
<artifactId>jackson-datatype-jsr310</artifactId>
47+
<version>${jackson-datatype-jsr310.version}</version>
48+
</dependency>
5049
</dependencies>
5150

5251
<build>
@@ -88,4 +87,4 @@
8887
</plugin>
8988
</plugins>
9089
</build>
91-
</project>
90+
</project>

‎samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/verticle/PetApiVerticle.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,17 @@ public class PetApiVerticle extends AbstractVerticle {
2828
final static String UPDATEPETWITHFORM_SERVICE_ID = "updatePetWithForm";
2929
final static String UPLOADFILE_SERVICE_ID = "uploadFile";
3030

31-
//TODO : create Implementation
32-
PetApi service = new PetApiImpl();
31+
final PetApi service;
32+
33+
public PetApiVerticle() {
34+
try {
35+
Class serviceImplClass = getClass().getClassLoader().loadClass("io.swagger.server.api.verticle.PetApiImpl");
36+
service = (PetApi)serviceImplClass.newInstance();
37+
} catch (Exception e) {
38+
logUnexpectedError("PetApiVerticle constructor", e);
39+
throw new RuntimeException(e);
40+
}
41+
}
3342

3443
@Override
3544
public void start() throws Exception {

‎samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/verticle/StoreApiVerticle.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,17 @@ public class StoreApiVerticle extends AbstractVerticle {
2222
final static String GETORDERBYID_SERVICE_ID = "getOrderById";
2323
final static String PLACEORDER_SERVICE_ID = "placeOrder";
2424

25-
//TODO : create Implementation
26-
StoreApi service = new StoreApiImpl();
25+
final StoreApi service;
26+
27+
public StoreApiVerticle() {
28+
try {
29+
Class serviceImplClass = getClass().getClassLoader().loadClass("io.swagger.server.api.verticle.StoreApiImpl");
30+
service = (StoreApi)serviceImplClass.newInstance();
31+
} catch (Exception e) {
32+
logUnexpectedError("StoreApiVerticle constructor", e);
33+
throw new RuntimeException(e);
34+
}
35+
}
2736

2837
@Override
2938
public void start() throws Exception {

‎samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/verticle/UserApiVerticle.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,17 @@ public class UserApiVerticle extends AbstractVerticle {
2626
final static String LOGOUTUSER_SERVICE_ID = "logoutUser";
2727
final static String UPDATEUSER_SERVICE_ID = "updateUser";
2828

29-
//TODO : create Implementation
30-
UserApi service = new UserApiImpl();
29+
final UserApi service;
30+
31+
public UserApiVerticle() {
32+
try {
33+
Class serviceImplClass = getClass().getClassLoader().loadClass("io.swagger.server.api.verticle.UserApiImpl");
34+
service = (UserApi)serviceImplClass.newInstance();
35+
} catch (Exception e) {
36+
logUnexpectedError("UserApiVerticle constructor", e);
37+
throw new RuntimeException(e);
38+
}
39+
}
3140

3241
@Override
3342
public void start() throws Exception {

0 commit comments

Comments
 (0)