Remove import for ApiModel at fromModel(..), postProcessModelProperty…

…(..) is too early
OpenAPITools · Aug 14, 2018 · 82eba8d · 82eba8d
1 parent aed302d
commit 82eba8d
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/...enerator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java b/...enerator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java
@@ -18,13 +18,13 @@
 package org.openapitools.codegen.languages;
 
 import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.media.Schema;
 
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.CodegenModel;
 import org.openapitools.codegen.CodegenOperation;
-import org.openapitools.codegen.CodegenProperty;
 import org.openapitools.codegen.SupportingFile;
 
 import java.io.File;
@@ -113,7 +113,7 @@ public void processOpts() {
             }
         }
         if (additionalProperties.containsKey(USE_SWAGGER_ANNOTATIONS)) {
-            setUseSwaggerAnnotations(Boolean.valueOf(additionalProperties.get(USE_SWAGGER_ANNOTATIONS).toString()));
+            useSwaggerAnnotations = Boolean.valueOf(additionalProperties.get(USE_SWAGGER_ANNOTATIONS).toString());
         }
         writePropertyBack(USE_SWAGGER_ANNOTATIONS, useSwaggerAnnotations);
 
@@ -174,14 +174,15 @@ public void addOperationToGroup(String tag, String resourcePath, Operation opera
     }
 
     @Override
-    public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
-        super.postProcessModelProperty(model, property);
-        model.imports.remove("ApiModelProperty");
-        model.imports.remove("ApiModel");
-        model.imports.remove("JsonSerialize");
-        model.imports.remove("ToStringSerializer");
-        model.imports.remove("JsonValue");
-        model.imports.remove("JsonProperty");
+    public CodegenModel fromModel(String name, Schema model, Map<String, Schema> allDefinitions) {
+        CodegenModel codegenModel = super.fromModel(name, model, allDefinitions);
+        codegenModel.imports.remove("ApiModelProperty");
+        codegenModel.imports.remove("ApiModel");
+        codegenModel.imports.remove("JsonSerialize");
+        codegenModel.imports.remove("ToStringSerializer");
+        codegenModel.imports.remove("JsonValue");
+        codegenModel.imports.remove("JsonProperty");
+        return codegenModel;
     }
 
     @Override
@@ -195,7 +196,4 @@ public String getHelp() {
         return "Generates a Java JAXRS Server according to JAXRS 2.0 specification.";
     }
 
-    public void setUseSwaggerAnnotations(boolean useSwaggerAnnotations) {
-        this.useSwaggerAnnotations = useSwaggerAnnotations;
-    }
 }