From 47f4396fb7bd24ed36cab8ac16ca9d59736b0e49 Mon Sep 17 00:00:00 2001
From: Emiliano Bonassi <emiliano.bonassi@beqid.com>
Date: Tue, 10 Nov 2015 12:30:13 +0100
Subject: [PATCH] - fix source/target java version to 1.6 - add test profile
 for CI

---
 .../Java/libraries/retrofit2/ApiClient.mustache      |  2 +-
 pom.xml                                              | 12 ++++++++++++
 .../retrofit2/.settings/org.eclipse.jdt.core.prefs   | 12 ------------
 .../src/main/java/io/swagger/client/ApiClient.java   |  2 +-
 .../src/main/java/io/swagger/client/StringUtil.java  |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 samples/client/petstore/java/retrofit2/.settings/org.eclipse.jdt.core.prefs

diff --git a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
index f9f7d77f47..56e83f7d91 100644
--- a/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache
@@ -330,7 +330,7 @@ class GsonCustomConverterFactory extends Converter.Factory
 	  @Override
 	  public Converter<ResponseBody, ?> fromResponseBody(Type type, Annotation[] annotations) {
 		  if(type.equals(String.class))
-			  return new GsonResponseBodyConverterToString<>(gson, type);
+			  return new GsonResponseBodyConverterToString<Object>(gson, type);
 		  else
 			  return gsonConverterFactory.fromResponseBody(type, annotations);
 	  }
diff --git a/pom.xml b/pom.xml
index 94d4741f18..31a34489f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -353,6 +353,18 @@
                 <module>samples/client/petstore/java/retrofit</module>
             </modules>
         </profile>
+        <profile>
+            <id>java-client-retrofit2</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>java</value>
+                </property>
+            </activation>
+            <modules>
+                <module>samples/client/petstore/java/retrofit2</module>
+            </modules>
+        </profile>
         <profile>
             <id>scala-client</id>
             <activation>
diff --git a/samples/client/petstore/java/retrofit2/.settings/org.eclipse.jdt.core.prefs b/samples/client/petstore/java/retrofit2/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 62492222ad..0000000000
--- a/samples/client/petstore/java/retrofit2/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
index a58542bf3a..2138c3a172 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/ApiClient.java
@@ -329,7 +329,7 @@ class GsonCustomConverterFactory extends Converter.Factory
 	  @Override
 	  public Converter<ResponseBody, ?> fromResponseBody(Type type, Annotation[] annotations) {
 		  if(type.equals(String.class))
-			  return new GsonResponseBodyConverterToString<>(gson, type);
+			  return new GsonResponseBodyConverterToString<Object>(gson, type);
 		  else
 			  return gsonConverterFactory.fromResponseBody(type, annotations);
 	  }
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
index 33dc56510e..5125ae3e55 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
@@ -1,6 +1,6 @@
 package io.swagger.client;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-10T03:03:11.515+01:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2015-11-10T12:25:26.227+01:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).