use setters in constructors, the underlying map isn't updated otherwise

OpenAPITools · Feb 16, 2019 · 01284e6 · 01284e6
1 parent 11eda29
commit 01284e6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/ModelBundle.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/ModelBundle.java
@@ -9,8 +9,8 @@ public class ModelBundle extends BaseBundle{
     String importPath;
 
     public ModelBundle(Map<String, Object> model) {
-        this.model = (CodegenModel) model.get("model");
-        this.importPath = (String) model.get("importPath");
+        setModel((CodegenModel) model.get("model"));
+        setImportPath((String) model.get("importPath"));
     }
 
     public ModelBundle() {

diff --git a/...les/openapi-generator/src/main/java/org/openapitools/codegen/templating/ModelsBundle.java b/...les/openapi-generator/src/main/java/org/openapitools/codegen/templating/ModelsBundle.java
@@ -11,15 +11,18 @@ public class ModelsBundle extends BaseBundle {
     private String classname;
     private String modelPackage;
 
+    @SuppressWarnings("unchecked")
     public ModelsBundle (Map<String, Object> value) {
-        this._package = (String) value.get("package");
+        setPackage((String) value.get("package"));
         List<Map<String, Object>> models = (List<Map<String, Object>>) value.get("models");
+        List<ModelBundle> modelBundles = new ArrayList<>();
         for (Map<String, Object> model : models) {
-            this.models.add(new ModelBundle(model));
+            modelBundles.add(new ModelBundle(model));
         }
-        this.imports = (List<Map<String, String>>) value.get("imports");
-        this.classname = (String) value.get("classname");
-        this.modelPackage = (String) value.get("modelPackage");
+        setModels(modelBundles);
+        setImports((List<Map<String, String>>) value.get("imports"));
+        setClassname((String) value.get("classname"));
+        setModelPackage((String) value.get("modelPackage"));
     }
 
     public ModelsBundle() {

diff --git a/...pi-generator/src/main/java/org/openapitools/codegen/templating/TemplatingInputBundle.java b/...pi-generator/src/main/java/org/openapitools/codegen/templating/TemplatingInputBundle.java
@@ -179,22 +179,13 @@ public void setExternalDocs(ExternalDocumentation externalDocs) {
     }
 
 
-    public List<Map<String, String>> getPathSet() {
-        return pathSet;
-    }
-
-    public void setPathSet(List<Map<String, String>> pathSet) {
-        this.pathSet = pathSet;
-        put("pathSet", pathSet);
-    }
-
-
     public boolean getHasAuthMethods() {
         return hasAuthMethods;
     }
 
     public void setHasAuthMethods(boolean hasAuthMethods) {
         this.hasAuthMethods = hasAuthMethods;
+        put("hasAuthMethods", hasAuthMethods);
     }
 
 
@@ -204,6 +195,7 @@ public boolean getHasOAuthMethods() {
 
     public void setHasOAuthMethods(boolean hasOAuthMethods) {
         this.hasOAuthMethods = hasOAuthMethods;
+        put("hasOAuthMethods", hasOAuthMethods);
     }
 
 
@@ -213,6 +205,7 @@ public List<CodegenSecurity> getOauthMethods() {
 
     public void setOauthMethods(List<CodegenSecurity> oauthMethods) {
         this.oauthMethods = oauthMethods;
+        put("oauthMethods", oauthMethods);
     }
 
 
@@ -222,5 +215,6 @@ public boolean getHasBearerMethods() {
 
     public void setHasBearerMethods(boolean hasBearerMethods) {
         this.hasBearerMethods = hasBearerMethods;
+        put("hasBearerMethods", hasBearerMethods);
     }
 }