Support generic over generic response type - Kotlin/Scala #484 (#486)

* Support generic over generic response type #484

* Support generic over generic response type - Kotlin/Scala #484

src/main/java/com/kobylynskyi/graphql/codegen/kotlin/KotlinGraphQLTypeMapper.java

@@ -85,7 +85,11 @@ public class KotlinGraphQLTypeMapper implements GraphQLTypeMapper {
 
     @Override
     public String getGenericsString(MappingContext mappingContext, String genericType, String typeParameter) {
-        return String.format("%s<%s>", genericType, typeParameter);
+        if (genericType.contains("%s")) {
+            return String.format(genericType, typeParameter);
+        } else {
+            return String.format("%s<%s>", genericType, typeParameter);
+        }
     }
 
     @Override

src/main/java/com/kobylynskyi/graphql/codegen/scala/ScalaGraphQLTypeMapper.java

@@ -88,7 +88,11 @@ public class ScalaGraphQLTypeMapper implements GraphQLTypeMapper {
 
     @Override
     public String getGenericsString(MappingContext mappingContext, String genericType, String typeParameter) {
-        return String.format("%s[%s]", genericType, typeParameter);
+        if (genericType.contains("%s")) {
+            return String.format(genericType, typeParameter);
+        } else {
+            return String.format("%s[%s]", genericType, typeParameter);
+        }
     }
 
     @Override