fix inner item (list, map) for play framework (#217)

OpenAPITools · Apr 24, 2018 · 2c6380c · 2c6380c
1 parent c8c316e
commit 2c6380c
Show file tree

Hide file tree

Showing 15 changed files with 652 additions and 516 deletions.
diff --git a/bin/java-play-framework-petstore-server.sh b/bin/java-play-framework-petstore-server.sh
@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/openapi-generator/src/main/resources/JavaPlayFramework -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l java-play-framework -o samples/server/petstore/java-play-framework -DhideGenerationTimestamp=true"
+ags="generate -t modules/openapi-generator/src/main/resources/JavaPlayFramework -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l java-play-framework -o samples/server/petstore/java-play-framework -DhideGenerationTimestamp=true $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache
@@ -69,12 +69,12 @@ public class {{classname}}Controller extends Controller {
             {{#useBeanValidation}}
             if (configuration.getBoolean("useInputBeanValidation")) {
                 {{#isListContainer}}
-                for ({{{baseType}}} curItem : {{paramName}}) {
+                for ({{{items.baseType}}} curItem : {{paramName}}) {
                     SwaggerUtils.validate(curItem);
                 }
                 {{/isListContainer}}
                 {{#isMapContainer}}
-                for (Map.Entry<String, {{{baseType}}}> entry : {{paramName}}.entrySet()) {
+                for (Map.Entry<String, {{{items.baseType}}}> entry : {{paramName}}.entrySet()) {
                     SwaggerUtils.validate(entry.getValue());
                 }
                 {{/isMapContainer}}

diff --git a/samples/server/petstore/java-play-framework/.openapi-generator/VERSION b/samples/server/petstore/java-play-framework/.openapi-generator/VERSION
@@ -1 +1 @@
-2.4.0-SNAPSHOT
+3.0.0-SNAPSHOT
diff --git a/samples/server/petstore/java-play-framework/app/controllers/ApiDocController.java b/samples/server/petstore/java-play-framework/app/controllers/ApiDocController.java
@@ -10,6 +10,6 @@ private ApiDocController() {
     }
 
     public Result api() {
-        return redirect("/assets/lib/swagger-ui/index.html?/url=/assets/swagger.json");
+        return redirect("/assets/lib/swagger-ui/index.html?/url=/assets/openapi.json");
     }
 }
diff --git a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java
@@ -39,17 +39,17 @@ private PetApiController(Configuration configuration, PetApiControllerImpInterfa
 
     @ApiAction
     public Result addPet() throws Exception {
-        JsonNode nodebody = request().body().asJson();
-        Pet body;
-        if (nodebody != null) {
-            body = mapper.readValue(nodebody.toString(), Pet.class);
+        JsonNode nodepet = request().body().asJson();
+        Pet pet;
+        if (nodepet != null) {
+            pet = mapper.readValue(nodepet.toString(), Pet.class);
             if (configuration.getBoolean("useInputBeanValidation")) {
-                SwaggerUtils.validate(body);
+                SwaggerUtils.validate(pet);
             }
         } else {
-            throw new IllegalArgumentException("'body' parameter is required");
+            throw new IllegalArgumentException("'Pet' parameter is required");
         }
-        imp.addPet(body);
+        imp.addPet(pet);
         return ok();
     }
 
@@ -126,17 +126,17 @@ public Result getPetById(Long petId) throws Exception {
 
     @ApiAction
     public Result updatePet() throws Exception {
-        JsonNode nodebody = request().body().asJson();
-        Pet body;
-        if (nodebody != null) {
-            body = mapper.readValue(nodebody.toString(), Pet.class);
+        JsonNode nodepet = request().body().asJson();
+        Pet pet;
+        if (nodepet != null) {
+            pet = mapper.readValue(nodepet.toString(), Pet.class);
             if (configuration.getBoolean("useInputBeanValidation")) {
-                SwaggerUtils.validate(body);
+                SwaggerUtils.validate(pet);
             }
         } else {
-            throw new IllegalArgumentException("'body' parameter is required");
+            throw new IllegalArgumentException("'Pet' parameter is required");
         }
-        imp.updatePet(body);
+        imp.updatePet(pet);
         return ok();
     }
 

diff --git a/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java b/samples/server/petstore/java-play-framework/app/controllers/PetApiControllerImp.java
@@ -13,7 +13,7 @@
 
 public class PetApiControllerImp implements PetApiControllerImpInterface {
     @Override
-    public void addPet(Pet body) throws Exception {
+    public void addPet(Pet pet) throws Exception {
         //Do your magic!!!
     }
 
@@ -41,7 +41,7 @@ public Pet getPetById(Long petId) throws Exception {
     }
 
     @Override
-    public void updatePet(Pet body) throws Exception {
+    public void updatePet(Pet pet) throws Exception {
         //Do your magic!!!
     }
 

diff --git a/...les/server/petstore/java-play-framework/app/controllers/PetApiControllerImpInterface.java b/...les/server/petstore/java-play-framework/app/controllers/PetApiControllerImpInterface.java
@@ -13,7 +13,7 @@
 
 @SuppressWarnings("RedundantThrows")
 public interface PetApiControllerImpInterface {
-    void addPet(Pet body) throws Exception;
+    void addPet(Pet pet) throws Exception;
 
     void deletePet(Long petId, String apiKey) throws Exception;
 
@@ -23,7 +23,7 @@ public interface PetApiControllerImpInterface {
 
     Pet getPetById(Long petId) throws Exception;
 
-    void updatePet(Pet body) throws Exception;
+    void updatePet(Pet pet) throws Exception;
 
     void updatePetWithForm(Long petId, String name, String status) throws Exception;
 

diff --git a/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java b/samples/server/petstore/java-play-framework/app/controllers/StoreApiController.java
@@ -61,17 +61,17 @@ public Result getOrderById( @Min(1) @Max(5)Long orderId) throws Exception {
 
     @ApiAction
     public Result placeOrder() throws Exception {
-        JsonNode nodebody = request().body().asJson();
-        Order body;
-        if (nodebody != null) {
-            body = mapper.readValue(nodebody.toString(), Order.class);
+        JsonNode nodeorder = request().body().asJson();
+        Order order;
+        if (nodeorder != null) {
+            order = mapper.readValue(nodeorder.toString(), Order.class);
             if (configuration.getBoolean("useInputBeanValidation")) {
-                SwaggerUtils.validate(body);
+                SwaggerUtils.validate(order);
             }
         } else {
-            throw new IllegalArgumentException("'body' parameter is required");
+            throw new IllegalArgumentException("'Order' parameter is required");
         }
-        Order obj = imp.placeOrder(body);
+        Order obj = imp.placeOrder(order);
         if (configuration.getBoolean("useOutputBeanValidation")) {
             SwaggerUtils.validate(obj);
         }

diff --git a/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java b/samples/server/petstore/java-play-framework/app/controllers/StoreApiControllerImp.java
@@ -29,7 +29,7 @@ public Order getOrderById( @Min(1) @Max(5)Long orderId) throws Exception {
     }
 
     @Override
-    public Order placeOrder(Order body) throws Exception {
+    public Order placeOrder(Order order) throws Exception {
         //Do your magic!!!
         return new Order();
     }

diff --git a/...s/server/petstore/java-play-framework/app/controllers/StoreApiControllerImpInterface.java b/...s/server/petstore/java-play-framework/app/controllers/StoreApiControllerImpInterface.java
@@ -18,6 +18,6 @@ public interface StoreApiControllerImpInterface {
 
     Order getOrderById( @Min(1) @Max(5)Long orderId) throws Exception;
 
-    Order placeOrder(Order body) throws Exception;
+    Order placeOrder(Order order) throws Exception;
 
 }
diff --git a/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java b/samples/server/petstore/java-play-framework/app/controllers/UserApiController.java
@@ -38,53 +38,53 @@ private UserApiController(Configuration configuration, UserApiControllerImpInter
 
     @ApiAction
     public Result createUser() throws Exception {
-        JsonNode nodebody = request().body().asJson();
-        User body;
-        if (nodebody != null) {
-            body = mapper.readValue(nodebody.toString(), User.class);
+        JsonNode nodeuser = request().body().asJson();
+        User user;
+        if (nodeuser != null) {
+            user = mapper.readValue(nodeuser.toString(), User.class);
             if (configuration.getBoolean("useInputBeanValidation")) {
-                SwaggerUtils.validate(body);
+                SwaggerUtils.validate(user);
             }
         } else {
-            throw new IllegalArgumentException("'body' parameter is required");
+            throw new IllegalArgumentException("'User' parameter is required");
         }
-        imp.createUser(body);
+        imp.createUser(user);
         return ok();
     }
 
     @ApiAction
     public Result createUsersWithArrayInput() throws Exception {
-        JsonNode nodebody = request().body().asJson();
-        List<User> body;
-        if (nodebody != null) {
-            body = mapper.readValue(nodebody.toString(), new TypeReference<List<User>>(){});
+        JsonNode nodeuser = request().body().asJson();
+        List<User> user;
+        if (nodeuser != null) {
+            user = mapper.readValue(nodeuser.toString(), new TypeReference<List<User>>(){});
             if (configuration.getBoolean("useInputBeanValidation")) {
-                for (User curItem : body) {
+                for (User curItem : user) {
                     SwaggerUtils.validate(curItem);
                 }
             }
         } else {
-            throw new IllegalArgumentException("'body' parameter is required");
+            throw new IllegalArgumentException("'User' parameter is required");
         }
-        imp.createUsersWithArrayInput(body);
+        imp.createUsersWithArrayInput(user);
         return ok();
     }
 
     @ApiAction
     public Result createUsersWithListInput() throws Exception {
-        JsonNode nodebody = request().body().asJson();
-        List<User> body;
-        if (nodebody != null) {
-            body = mapper.readValue(nodebody.toString(), new TypeReference<List<User>>(){});
+        JsonNode nodeuser = request().body().asJson();
+        List<User> user;
+        if (nodeuser != null) {
+            user = mapper.readValue(nodeuser.toString(), new TypeReference<List<User>>(){});
             if (configuration.getBoolean("useInputBeanValidation")) {
-                for (User curItem : body) {
+                for (User curItem : user) {
                     SwaggerUtils.validate(curItem);
                 }
             }
         } else {
-            throw new IllegalArgumentException("'body' parameter is required");
+            throw new IllegalArgumentException("'User' parameter is required");
         }
-        imp.createUsersWithListInput(body);
+        imp.createUsersWithListInput(user);
         return ok();
     }
 
@@ -133,17 +133,17 @@ public Result logoutUser() throws Exception {
 
     @ApiAction
     public Result updateUser(String username) throws Exception {
-        JsonNode nodebody = request().body().asJson();
-        User body;
-        if (nodebody != null) {
-            body = mapper.readValue(nodebody.toString(), User.class);
+        JsonNode nodeuser = request().body().asJson();
+        User user;
+        if (nodeuser != null) {
+            user = mapper.readValue(nodeuser.toString(), User.class);
             if (configuration.getBoolean("useInputBeanValidation")) {
-                SwaggerUtils.validate(body);
+                SwaggerUtils.validate(user);
             }
         } else {
-            throw new IllegalArgumentException("'body' parameter is required");
+            throw new IllegalArgumentException("'User' parameter is required");
         }
-        imp.updateUser(username, body);
+        imp.updateUser(username, user);
         return ok();
     }
 }
diff --git a/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java b/samples/server/petstore/java-play-framework/app/controllers/UserApiControllerImp.java
@@ -12,17 +12,17 @@
 
 public class UserApiControllerImp implements UserApiControllerImpInterface {
     @Override
-    public void createUser(User body) throws Exception {
+    public void createUser(User user) throws Exception {
         //Do your magic!!!
     }
 
     @Override
-    public void createUsersWithArrayInput(List<User> body) throws Exception {
+    public void createUsersWithArrayInput(List<User> user) throws Exception {
         //Do your magic!!!
     }
 
     @Override
-    public void createUsersWithListInput(List<User> body) throws Exception {
+    public void createUsersWithListInput(List<User> user) throws Exception {
         //Do your magic!!!
     }
 
@@ -49,7 +49,7 @@ public void logoutUser() throws Exception {
     }
 
     @Override
-    public void updateUser(String username, User body) throws Exception {
+    public void updateUser(String username, User user) throws Exception {
         //Do your magic!!!
     }
 

diff --git a/...es/server/petstore/java-play-framework/app/controllers/UserApiControllerImpInterface.java b/...es/server/petstore/java-play-framework/app/controllers/UserApiControllerImpInterface.java
@@ -12,11 +12,11 @@
 
 @SuppressWarnings("RedundantThrows")
 public interface UserApiControllerImpInterface {
-    void createUser(User body) throws Exception;
+    void createUser(User user) throws Exception;
 
-    void createUsersWithArrayInput(List<User> body) throws Exception;
+    void createUsersWithArrayInput(List<User> user) throws Exception;
 
-    void createUsersWithListInput(List<User> body) throws Exception;
+    void createUsersWithListInput(List<User> user) throws Exception;
 
     void deleteUser(String username) throws Exception;
 
@@ -26,6 +26,6 @@ public interface UserApiControllerImpInterface {
 
     void logoutUser() throws Exception;
 
-    void updateUser(String username, User body) throws Exception;
+    void updateUser(String username, User user) throws Exception;
 
 }
diff --git a/samples/server/petstore/java-play-framework/build.sbt b/samples/server/petstore/java-play-framework/build.sbt
@@ -1,4 +1,4 @@
-name := """swagger-java-playframework"""
+name := """openapi-java-playframework"""
 
 version := "1.0-SNAPSHOT"