implement /model endpoint returning intermediate model

Author: frantuma

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/AbstractGenerator.java

@@ -144,4 +144,5 @@ public String getCPResourcePath(String name) {
         }
         return name;
     }
+
 }

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/DefaultGenerator.java

@@ -792,11 +792,40 @@ public List<File> generate() {
 
         // supporting files
         Map<String, Object> bundle = buildSupportFileBundle(allOperations, allModels);
+        Json.prettyPrint(bundle);
         generateSupportingFiles(files, bundle);
         config.processOpenAPI(openAPI);
         return files;
     }
 
+    @Override
+    public Map<String, Object> generateBundle() {
+
+        if (openAPI == null) {
+            throw new RuntimeException("missing OpenAPI input!");
+        }
+        if (config == null) {
+            throw new RuntimeException("missing configuration input!");
+        }
+        configureGeneratorProperties();
+        configureSwaggerInfo();
+
+        List<File> files = new ArrayList<>();
+        // models
+        List<Object> allModels = new ArrayList<>();
+        generateModels(files, allModels);
+        // apis
+        List<Object> allOperations = new ArrayList<>();
+        generateApis(files, allOperations, allModels);
+
+        // supporting files
+        Map<String, Object> bundle = buildSupportFileBundle(allOperations, allModels);
+        Json.prettyPrint(bundle);
+        generateSupportingFiles(files, bundle);
+        config.processOpenAPI(openAPI);
+        return bundle;
+    }
+
     private File processTemplateToFile(Map<String, Object> templateData, String templateName, String outputFilename) throws IOException {
         String adjustedOutputFilename = outputFilename.replaceAll("//", "/").replace('/', File.separatorChar);
         if(ignoreProcessor.allowsFile(new File(adjustedOutputFilename))) {

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/Generator.java

@@ -2,9 +2,12 @@
 
 import java.io.File;
 import java.util.List;
+import java.util.Map;
 
 public interface Generator {
     Generator opts(ClientOptInput opts);
 
     List<File> generate();
+    Map<String, Object> generateBundle();
+
 }

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/service/GeneratorService.java

@@ -8,6 +8,7 @@
 
 import java.io.File;
 import java.util.List;
+import java.util.Map;
 
 public class GeneratorService {
     protected final Logger LOGGER = LoggerFactory.getLogger(GeneratorService.class);
@@ -52,4 +53,11 @@ public List<File> generate() {
         throw new RuntimeException("missing opts input");
     }
 
+    public Map<String, Object> generateBundle() {
+        if (optsV3 != null) {
+            return new DefaultGenerator().opts(optsV3).generateBundle();
+        }
+        throw new RuntimeException("missing opts input");
+    }
+
 }

modules/swagger-generator/src/main/java/io/swagger/v3/generator/online/GeneratorController.java

@@ -484,6 +484,58 @@ public ResponseContext generate(RequestContext context, GenerationRequest genera
 
     }
 
+    public ResponseContext generateBundle(RequestContext context, GenerationRequest generationRequest) {
+
+        String requestLog = requestLog(generationRequest);
+        LOGGER.debug("generate start - " + requestLog);
+        File outputRootFolder = getTmpFolder();
+        String destPath = null;
+
+        if(generationRequest != null && generationRequest.getOptions() != null) {
+            Object destPathObj = generationRequest.getOptions().getAdditionalProperties().get("outputFolder");
+            if (destPathObj != null && destPathObj instanceof String) {
+                destPath = (String)destPathObj;
+            }
+        }
+        if(destPath == null) {
+            destPath = "";
+        }
+
+        // remove double slashes
+        destPath.replaceAll("//", "/");
+
+        if(destPath.indexOf("..") != -1) {
+            return new ResponseContext()
+                    .status(400)
+                    .contentType(MediaType.TEXT_PLAIN)
+                    .entity("Illegal output folder");
+        }
+
+        // remove leading slash (will typically not hurt)
+        if(destPath.indexOf("/") == 0 && destPath.length() > 1) {
+            destPath = destPath.substring(1);
+        }
+
+        // destPath is where the files are written, relative to output folder
+        LOGGER.info("using destination path " + destPath);
+
+        File outputContentFolder = null;
+        if (!StringUtils.isBlank(destPath.trim())) {
+            outputContentFolder = new File(outputRootFolder, destPath);
+        } else {
+            outputContentFolder = outputRootFolder;
+        }
+        generationRequest.getOptions().setOutputDir(outputContentFolder.getAbsolutePath());
+        File outputFile = new File(getTmpFolder(), generationRequest.getLang() + "-bundle.zip");
+
+        LOGGER.info("file zip file: " + outputFile.getAbsolutePath());
+
+        ResponseContext responseContext = generateBundle(generationRequest, outputRootFolder, outputContentFolder, outputFile);
+        LOGGER.debug("generate end - " + requestLog);
+        return responseContext;
+
+    }
+
     protected static File getTmpFolder() {
         try {
             File outputFolder = Files.createTempDirectory("codegen-").toFile();
@@ -557,6 +609,45 @@ private ResponseContext generate(GenerationRequest generationRequest, File outpu
 
 
     }
+
+    private ResponseContext generateBundle(GenerationRequest generationRequest, File outputRootFolder, File outputContentFolder, File outputFile) {
+        GeneratorService generatorService = new GeneratorService();
+        try {
+            generatorService.generationRequest(generationRequest);
+        } catch (Exception e) {
+            String msg = "Error processing generation request: " + e.getMessage();
+            LOGGER.error(msg, e);
+            return new ResponseContext()
+                    .status(400)
+                    .contentType(MediaType.TEXT_PLAIN)
+                    .entity(msg);
+        }
+
+        // final List<File> files;
+        final Map<String, Object> files;
+        try {
+            files = generatorService.generateBundle();
+        } catch (Exception e) {
+            String msg = String.format("Error generating `%s` code : %s", generationRequest.getLang(), e.getMessage());
+            LOGGER.error(msg, e);
+            return new ResponseContext()
+                    .status(500)
+                    .contentType(MediaType.TEXT_PLAIN)
+                    .entity(msg);
+        }
+        if (files.size() > 0) {
+            return new ResponseContext()
+                    .status(200)
+                    .contentType(MediaType.APPLICATION_JSON_TYPE)
+                    .entity(files);
+        } else {
+            return new ResponseContext()
+                    .status(500)
+                    .contentType(MediaType.TEXT_PLAIN)
+                    .entity("A target generation was attempted, but no files were created");
+        }
+    }
+
     private ResponseContext downloadFile(File outputRootFolder, File outputContentFolder, File outputFile, String lang, GenerationRequest.Type type) {
 
         final ZipUtil zipUtil = new ZipUtil();

modules/swagger-generator/src/main/resources/openapi.yaml

@@ -15,6 +15,29 @@ tags:
 - name: documentation
 - name: config
 paths:
+  "/model":
+    post:
+      tags:
+        - clients
+        - servers
+        - documentation
+        - config
+      x-swagger-router-controller: io.swagger.v3.generator.online.GeneratorController
+      operationId: generateBundle
+      summary: Generates the intermediate model ("bundle") and returns it as a JSON.
+        body.
+      requestBody:
+        content:
+          application/json:
+            schema:
+              "$ref": "#/components/schemas/GenerationRequest"
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                type: object
   "/generate":
     get:
       tags: