Merge pull request #8185 from Zomzog/feature/8168

[JAVA] Add import to models for jaxrs-reasteasy-eap

Author: frantuma

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaResteasyEapServerCodegen.java

@@ -138,6 +138,7 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
 
     @Override
     public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
+        super.postProcessModelProperty(model, property);
         // Add imports for Jackson
         if (!BooleanUtils.toBoolean(model.isEnum)) {
             model.imports.add("JsonProperty");

modules/swagger-codegen/src/test/java/io/swagger/codegen/jaxrs/JavaResteasyEapServerCodegenModelTest.java

@@ -0,0 +1,32 @@
+package io.swagger.codegen.jaxrs;
+
+import io.swagger.codegen.CodegenModel;
+import io.swagger.codegen.languages.JavaJerseyServerCodegen;
+import io.swagger.codegen.languages.JavaResteasyEapServerCodegen;
+import io.swagger.models.Model;
+import io.swagger.models.ModelImpl;
+import io.swagger.models.properties.DateProperty;
+import io.swagger.models.properties.DateTimeProperty;
+import io.swagger.models.properties.LongProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.util.Json;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class JavaResteasyEapServerCodegenModelTest {
+    @Test(description = "convert a simple java model with java8 types")
+    public void mapModelTest() {
+        final Model model = new ModelImpl()
+                .description("A model with a map")
+                .property("map", new MapProperty());
+
+        final JavaResteasyEapServerCodegen codegen = new JavaResteasyEapServerCodegen();
+        final CodegenModel cm = codegen.fromModel("sample", model);
+
+        Json.prettyPrint(cm);
+        assertEquals(cm.vars.get(0).baseType, "Map");
+        assertTrue(cm.imports.contains("HashMap"));
+    }
+}

samples/server/petstore/jaxrs-resteasy/eap-java8/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.3.1-SNAPSHOT
+2.4.0-SNAPSHOT

samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java renamed to samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/io/swagger/impl/api/PetApiServiceImpl.java

@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 

samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java renamed to samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/io/swagger/impl/api/StoreApiServiceImpl.java

@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;
 

samples/server/petstore/jaxrs-resteasy/eap-java8/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java renamed to samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/io/swagger/impl/api/UserApiServiceImpl.java

@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import java.time.OffsetDateTime;
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;

samples/server/petstore/jaxrs-resteasy/eap-java8/src/gen/java/io/swagger/model/Category.java

@@ -6,8 +6,10 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.model.Category;
 import io.swagger.model.Tag;
+import java.util.ArrayList;
 import java.util.List;
 import javax.validation.constraints.*;
 import io.swagger.annotations.*;