refactored swagger-generator endpoints.

Author: HugoMario

modules/swagger-codegen/src/main/java/io/swagger/codegen/config/CodegenConfigurator.java

@@ -439,6 +439,62 @@ public ClientOptInput toClientOptInput() {
         return input;
     }
 
+    public ClientOptInput toClientOptInput(String content) {
+
+        Validate.notEmpty(lang, "language must be specified");
+
+        setVerboseFlags();
+        setSystemProperties();
+
+        CodegenConfig config = CodegenConfigLoader.forName(lang);
+
+        config.setOutputDir(outputDir);
+        config.setSkipOverwrite(skipOverwrite);
+        config.setIgnoreFilePathOverride(ignoreFileOverride);
+        config.setRemoveOperationIdPrefix(removeOperationIdPrefix);
+
+        config.instantiationTypes().putAll(instantiationTypes);
+        config.typeMapping().putAll(typeMappings);
+        config.importMapping().putAll(importMappings);
+        config.languageSpecificPrimitives().addAll(languageSpecificPrimitives);
+        config.reservedWordsMappings().putAll(reservedWordMappings);
+
+        checkAndSetAdditionalProperty(apiPackage, CodegenConstants.API_PACKAGE);
+        checkAndSetAdditionalProperty(modelPackage, CodegenConstants.MODEL_PACKAGE);
+        checkAndSetAdditionalProperty(invokerPackage, CodegenConstants.INVOKER_PACKAGE);
+        checkAndSetAdditionalProperty(groupId, CodegenConstants.GROUP_ID);
+        checkAndSetAdditionalProperty(artifactId, CodegenConstants.ARTIFACT_ID);
+        checkAndSetAdditionalProperty(artifactVersion, CodegenConstants.ARTIFACT_VERSION);
+        checkAndSetAdditionalProperty(templateDir, toAbsolutePathStr(templateDir), CodegenConstants.TEMPLATE_DIR);
+        checkAndSetAdditionalProperty(modelNamePrefix, CodegenConstants.MODEL_NAME_PREFIX);
+        checkAndSetAdditionalProperty(modelNameSuffix, CodegenConstants.MODEL_NAME_SUFFIX);
+        checkAndSetAdditionalProperty(gitUserId, CodegenConstants.GIT_USER_ID);
+        checkAndSetAdditionalProperty(gitRepoId, CodegenConstants.GIT_REPO_ID);
+        checkAndSetAdditionalProperty(releaseNote, CodegenConstants.RELEASE_NOTE);
+        checkAndSetAdditionalProperty(httpUserAgent, CodegenConstants.HTTP_USER_AGENT);
+
+        handleDynamicProperties(config);
+
+        if (isNotEmpty(library)) {
+            config.setLibrary(library);
+        }
+
+        config.additionalProperties().putAll(additionalProperties);
+
+        ClientOptInput input = new ClientOptInput()
+                .config(config);
+
+        final List<AuthorizationValue> authorizationValues = AuthParser.parse(auth);
+
+        SwaggerParseResult result = new OpenAPIParser().readContents(content, authorizationValues, null);
+        OpenAPI openAPI = result.getOpenAPI();
+
+        input.opts(new ClientOpts())
+                .openAPI(openAPI);
+
+        return input;
+    }
+
     @JsonAnySetter
     public CodegenConfigurator addDynamicProperty(String name, Object value) {
         dynamicProperties.put(name, value);

modules/swagger-generator/src/main/java/io/swagger/generator/model/GenerationRequest.java

@@ -7,103 +7,32 @@
 public class GenerationRequest implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    private String spec = null;
-    private String lang = null;
-    private String library = null;
-    private Map<String, Object> additionalProperties = null;
+    private Object spec = null;
+    private Options options = null;
 
-    public GenerationRequest spec(String spec) {
+    public GenerationRequest spec(Object spec) {
         this.spec = spec;
         return this;
     }
 
-    public String getSpec() {
+    public Object getSpec() {
         return spec;
     }
 
-    public void setSpec(String spec) {
+    public void setSpec(Object spec) {
         this.spec = spec;
     }
 
-    public GenerationRequest lang(String lang) {
-        this.lang = lang;
+    public GenerationRequest options(Options options) {
+        this.options = options;
         return this;
     }
 
-    public String getLang() {
-        return lang;
+    public Options getOptions() {
+        return options;
     }
 
-    public void setLang(String lang) {
-        this.lang = lang;
+    public void setOptions(Options options) {
+        this.options = options;
     }
-
-    public GenerationRequest library(String library) {
-        this.library = library;
-        return this;
-    }
-
-    public String getLibrary() {
-        return library;
-    }
-
-    public void setLibrary(String library) {
-        this.library = library;
-    }
-
-    public GenerationRequest additionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-        return this;
-    }
-
-    public Map<String, Object> getAdditionalProperties() {
-        return additionalProperties;
-    }
-
-    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
-
-
-    @Override
-    public boolean equals(java.lang.Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(spec, lang, library, additionalProperties);
-    }
-
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class GenerationRequest {\n");
-
-        sb.append("    spec: ").append(toIndentedString(spec)).append("\n");
-        sb.append("    lang: ").append(toIndentedString(lang)).append("\n");
-        sb.append("    library: ").append(toIndentedString(library)).append("\n");
-        sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
-        sb.append("}");
-        return sb.toString();
-    }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
-    private String toIndentedString(java.lang.Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
 }