[Java] fix bug to only remove "CustomInstantDeserializer" for Play v2.5 (#6444)

* fix bug to only remove CustomInstantDeserializer for play25

* revise logic

* fix logic for CustomInstantDeserializer.java

Author: wing328

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

@@ -280,8 +280,8 @@ public void processOpts() {
 
         if (additionalProperties.containsKey("jackson")) {
             supportingFiles.add(new SupportingFile("RFC3339DateFormat.mustache", invokerFolder, "RFC3339DateFormat.java"));
-            if (!"threetenbp".equals(dateLibrary)) {
-                supportingFiles.remove("CustomInstantDeserializer.mustache");
+            if ("threetenbp".equals(dateLibrary) && !usePlayWS) {
+                supportingFiles.add(new SupportingFile("CustomInstantDeserializer.mustache", invokerFolder, "CustomInstantDeserializer.java"));
             }
         }
     }

samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java

@@ -41,7 +41,7 @@ public AdditionalPropertiesClass mapProperty(Map<String, String> mapProperty) {
 
   public AdditionalPropertiesClass putMapPropertyItem(String key, String mapPropertyItem) {
     if (this.mapProperty == null) {
-      this.mapProperty = new HashMap<>();
+      this.mapProperty = new HashMap<String, String>();
     }
     this.mapProperty.put(key, mapPropertyItem);
     return this;
@@ -67,7 +67,7 @@ public AdditionalPropertiesClass mapOfMapProperty(Map<String, Map<String, String
 
   public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String, String> mapOfMapPropertyItem) {
     if (this.mapOfMapProperty == null) {
-      this.mapOfMapProperty = new HashMap<>();
+      this.mapOfMapProperty = new HashMap<String, Map<String, String>>();
     }
     this.mapOfMapProperty.put(key, mapOfMapPropertyItem);
     return this;

samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java

@@ -38,7 +38,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArr
 
   public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayArrayNumberItem) {
     if (this.arrayArrayNumber == null) {
-      this.arrayArrayNumber = new ArrayList<>();
+      this.arrayArrayNumber = new ArrayList<List<BigDecimal>>();
     }
     this.arrayArrayNumber.add(arrayArrayNumberItem);
     return this;

samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java

@@ -38,7 +38,7 @@ public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
 
   public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     if (this.arrayNumber == null) {
-      this.arrayNumber = new ArrayList<>();
+      this.arrayNumber = new ArrayList<BigDecimal>();
     }
     this.arrayNumber.add(arrayNumberItem);
     return this;

samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/ArrayTest.java

@@ -44,7 +44,7 @@ public ArrayTest arrayOfString(List<String> arrayOfString) {
 
   public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     if (this.arrayOfString == null) {
-      this.arrayOfString = new ArrayList<>();
+      this.arrayOfString = new ArrayList<String>();
     }
     this.arrayOfString.add(arrayOfStringItem);
     return this;
@@ -70,7 +70,7 @@ public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
 
   public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem) {
     if (this.arrayArrayOfInteger == null) {
-      this.arrayArrayOfInteger = new ArrayList<>();
+      this.arrayArrayOfInteger = new ArrayList<List<Long>>();
     }
     this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem);
     return this;
@@ -96,7 +96,7 @@ public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel)
 
   public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelItem) {
     if (this.arrayArrayOfModel == null) {
-      this.arrayArrayOfModel = new ArrayList<>();
+      this.arrayArrayOfModel = new ArrayList<List<ReadOnlyFirst>>();
     }
     this.arrayArrayOfModel.add(arrayArrayOfModelItem);
     return this;

samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumArrays.java

@@ -128,7 +128,7 @@ public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {
 
   public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     if (this.arrayEnum == null) {
-      this.arrayEnum = new ArrayList<>();
+      this.arrayEnum = new ArrayList<ArrayEnumEnum>();
     }
     this.arrayEnum.add(arrayEnumItem);
     return this;

samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MapTest.java

@@ -76,7 +76,7 @@ public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
 
   public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStringItem) {
     if (this.mapMapOfString == null) {
-      this.mapMapOfString = new HashMap<>();
+      this.mapMapOfString = new HashMap<String, Map<String, String>>();
     }
     this.mapMapOfString.put(key, mapMapOfStringItem);
     return this;
@@ -102,7 +102,7 @@ public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
 
   public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) {
     if (this.mapOfEnumString == null) {
-      this.mapOfEnumString = new HashMap<>();
+      this.mapOfEnumString = new HashMap<String, InnerEnum>();
     }
     this.mapOfEnumString.put(key, mapOfEnumStringItem);
     return this;

samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java

@@ -83,7 +83,7 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map)
 
   public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
     if (this.map == null) {
-      this.map = new HashMap<>();
+      this.map = new HashMap<String, Animal>();
     }
     this.map.put(key, mapItem);
     return this;

samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Pet.java

@@ -39,7 +39,7 @@ public class Pet {
   private String name = null;
 
   @JsonProperty("photoUrls")
-  private List<String> photoUrls = new ArrayList<>();
+  private List<String> photoUrls = new ArrayList<String>();
 
   @JsonProperty("tags")
   private List<Tag> tags = null;
@@ -168,7 +168,7 @@ public Pet tags(List<Tag> tags) {
 
   public Pet addTagsItem(Tag tagsItem) {
     if (this.tags == null) {
-      this.tags = new ArrayList<>();
+      this.tags = new ArrayList<Tag>();
     }
     this.tags.add(tagsItem);
     return this;