Added snippet option

Author: JanHolger

.gitignore

@@ -1,4 +1,5 @@
 .idea
 *.iml
 target
-dependency-reduced-pom.xml
+dependency-reduced-pom.xml
+snippet.java

README.md

@@ -17,3 +17,4 @@ Parameter | Description | Default
 --group-id [groupId] | Maven Group Id | Package Name (see --package)
 --artifact-id [artifactId] | Maven Artifact Id | API Name (see --api-name)
 --version [version] | Maven Artifact Version | `version` from API Info (1.0 if not present)
+--snippet [file] | A snippet that will be added to the client (multiple allowed) | None

src/main/java/org/javawebstack/openapi/client/JavaClientGenerator.java

@@ -40,6 +40,7 @@ public class JavaClientGenerator {
     String groupId;
     String artifactId;
     String version;
+    List<String> snippet = new ArrayList<>();
 
     public JavaClientGenerator(OpenAPI api){
         this.api = api;
@@ -148,7 +149,12 @@ private void generateClient(File targetFolder){
                 .append("Tag(this);\n")
         );
         sb
-                .append("    }\n\n")
+                .append("    }\n\n");
+        if(snippet != null && snippet.size() > 0){
+            snippet.forEach(l -> sb.append("    ").append(l).append("\n"));
+            sb.append("\n");
+        }
+        sb
                 .append("    public <T> T orError(HTTPRequest request, Class<T> type) throws ")
                 .append(apiName)
                 .append("Exception {\n")
@@ -253,18 +259,24 @@ private void generateTag(File targetFolder, String tag){
                     parameters.addAll(pathObject.getParameters());
                 if(operation.getParameters() != null)
                     parameters.addAll(operation.getParameters());
-                String returnType = getJavaType(
-                        getResponseSchema(
-                                operation
-                                        .getResponses()
-                                        .entrySet()
-                                        .stream()
-                                        .filter(e -> e.getKey().startsWith("2"))
-                                        .map(Map.Entry::getValue)
-                                        .findFirst()
-                                        .orElse(null)
-                        )
-                );
+                OpenAPIResponse response = operation
+                        .getResponses()
+                        .entrySet()
+                        .stream()
+                        .filter(e -> e.getKey().startsWith("2"))
+                        .map(Map.Entry::getValue)
+                        .findFirst()
+                        .orElse(null);
+                String returnType;
+                if(response != null && response.getReference() != null){
+                    returnType = response.getReference().split("/")[3];
+                }else{
+                    returnType = getJavaType(
+                            getResponseSchema(
+                                    response
+                            )
+                    );
+                }
                 List<String> methodParams = new ArrayList<>();
                 String url = "\""+path+"\"";
                 for(OpenAPIParameter p : parameters.stream().filter(p -> p.getIn() == OpenAPIParameter.Location.PATH).collect(Collectors.toList())){
@@ -326,7 +338,7 @@ private void generateSchema(File targetFolder, String name, OpenAPISchema schema
                 .append(basePackage)
                 .append(".schemas;\n\n")
                 .append("import com.google.gson.annotations.SerializedName;\n\n");
-        generateSchema(sb, "", name, schema);
+        generateSchema(sb, "", name, schema, new ArrayList<>());
         writeClassFile(targetFolder, basePackage+".schemas."+name, sb.toString());
     }
 
@@ -345,18 +357,20 @@ private void generateResponse(File targetFolder, String name, OpenAPIResponse re
         OpenAPISchema schema = getResponseSchema(response);
         if(schema == null)
             return;
-        generateSchema(sb, "", name, schema);
+        generateSchema(sb, "", name, schema, new ArrayList<>());
         writeClassFile(targetFolder, basePackage+".responses."+name, sb.toString());
     }
 
-    private void generateSchema(StringBuilder sb, String intendation, String name, OpenAPISchema schema){
+    private void generateSchema(StringBuilder sb, String intendation, String name, OpenAPISchema schema, List<String> usedNames){
         Map<String, String> types = new HashMap<>();
         Map<String, OpenAPISchema> subSchemas = new HashMap<>();
         Map<String, String> serializedNames = new HashMap<>();
         if(schema.getProperties() != null){
             schema.getProperties().forEach((pName, pSchema) -> {
                 String type = getJavaType(pSchema);
-                if(type == null){
+                if(type == null)
+                    type = "null";
+                if(type.startsWith("null")){
                     String subName = capitalize(pName);
                     if(subName.endsWith("ies")){
                         subName = subName.substring(0, subName.length()-3)+"y";
@@ -365,8 +379,15 @@ private void generateSchema(StringBuilder sb, String intendation, String name, O
                     }else if(subName.endsWith("s")) {
                         subName = subName.substring(0, subName.length() - 1);
                     }
-                    subSchemas.put(subName, pSchema);
-                    type = subName;
+                    int i=0;
+                    String orig = subName;
+                    while (usedNames.contains(subName)){
+                        i++;
+                        subName = orig + i;
+                    }
+                    usedNames.add(subName);
+                    subSchemas.put(subName, pSchema.getType() == OpenAPIDataType.ARRAY ? pSchema.getItems() : pSchema);
+                    type = subName+type.substring(4);
                 }
                 String sName = getSerializedName(pName, type);
                 if(sName != null){
@@ -443,7 +464,7 @@ private void generateSchema(StringBuilder sb, String intendation, String name, O
             }
         });
         if(subSchemas.size()>0){
-            subSchemas.forEach((subName, subSchema) -> generateSchema(sb, intendation+"    ", subName, subSchema));
+            subSchemas.forEach((subName, subSchema) -> generateSchema(sb, intendation+"    ", subName, subSchema, usedNames));
             sb.append("\n");
         }
         sb.append(intendation).append("}");
@@ -510,7 +531,8 @@ private String getJavaType(OpenAPISchema schema){
                 return elementType+"[]";
             }
             case OBJECT: {
-                return "com.google.gson.JsonObject";
+                return null;
+                //return "com.google.gson.JsonObject";
             }
         }
         return null;

src/main/java/org/javawebstack/openapi/client/command/JavaCommand.java

@@ -6,7 +6,13 @@
 import org.javawebstack.openapi.client.JavaClientGenerator;
 import org.javawebstack.openapi.parser.OpenAPI;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -21,6 +27,14 @@ public CommandResult execute(CommandSystem system, List<String> args, Map<String
             return CommandResult.error("The spec file isn't readable");
         JavaClientGenerator clientGenerator = new JavaClientGenerator(api);
 
+        if(params.containsKey("snippet")){
+            for(String name : params.get("snippet")){
+                File snippetFile = new File(name);
+                if(!snippetFile.exists())
+                    return CommandResult.error("Snippet '"+name+"' not found");
+                clientGenerator.getSnippet().addAll(readFile(snippetFile));
+            }
+        }
         if(params.containsKey("s"))
             clientGenerator.setJustSource(true);
         if(params.containsKey("artifact-id"))
@@ -42,4 +56,19 @@ public CommandResult execute(CommandSystem system, List<String> args, Map<String
         return CommandResult.success();
     }
 
+    private static List<String> readFile(File file){
+        try {
+            FileInputStream fis = new FileInputStream(file);
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            byte[] buffer = new byte[1024];
+            int r;
+            while ((r = fis.read(buffer)) != -1)
+                baos.write(buffer, 0, r);
+            fis.close();
+            return Arrays.asList(new String(baos.toByteArray(), StandardCharsets.UTF_8).replace("\r", "").split("\n"));
+        }catch (IOException ignored){
+            return new ArrayList<>();
+        }
+    }
+
 }