v2 adds servers

modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CodegenConfig.java

@@ -20,6 +20,8 @@
 import com.samskivert.mustache.Mustache.Compiler;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.PathItem;
+import io.swagger.v3.oas.models.Paths;
 import io.swagger.v3.oas.models.headers.Header;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.parameters.Parameter;
@@ -30,20 +32,21 @@
 import io.swagger.v3.oas.models.servers.Server;
 import io.swagger.v3.oas.models.servers.ServerVariable;
 import org.openapijsonschematools.codegen.model.CodegenHeader;
+import org.openapijsonschematools.codegen.model.CodegenKey;
 import org.openapijsonschematools.codegen.model.CodegenOperation;
 import org.openapijsonschematools.codegen.model.CodegenParameter;
+import org.openapijsonschematools.codegen.model.CodegenPathItem;
 import org.openapijsonschematools.codegen.model.CodegenPatternInfo;
 import org.openapijsonschematools.codegen.model.CodegenRequestBody;
 import org.openapijsonschematools.codegen.model.CodegenResponse;
 import org.openapijsonschematools.codegen.model.CodegenSchema;
 import org.openapijsonschematools.codegen.model.CodegenSecurityRequirementValue;
 import org.openapijsonschematools.codegen.model.CodegenSecurityScheme;
 import org.openapijsonschematools.codegen.model.CodegenServer;
-import org.openapijsonschematools.codegen.model.CodegenServerVariable;
-import org.openapijsonschematools.codegen.model.OperationsMap;
 import org.openapijsonschematools.codegen.api.TemplatingEngineAdapter;
 import org.openapijsonschematools.codegen.meta.FeatureSet;
 import org.openapijsonschematools.codegen.meta.GeneratorMetadata;
+import org.openapijsonschematools.codegen.model.CodegenTag;
 
 import java.io.File;
 import java.util.HashMap;
@@ -135,15 +138,23 @@ public interface CodegenConfig {
 
     CodegenSchema fromSchema(Schema<?> schema, String sourceJsonPath, String currentJsonPath);
 
-    CodegenOperation fromOperation(String resourcePath, String httpMethod, Operation operation, List<Server> servers);
+    CodegenTag fromTag(String name, String description);
+
+    CodegenOperation fromOperation(Operation operation, String jsonPath);
+
+    CodegenKey getKey(String key);
 
     CodegenSecurityScheme fromSecurityScheme(SecurityScheme securityScheme, String jsonPath);
 
     HashMap<String, CodegenSecurityRequirementValue> fromSecurityRequirement(SecurityRequirement securityScheme, String jsonPath);
 
-    List<CodegenServer> fromServers(List<Server> servers);
+    TreeMap<CodegenKey, CodegenPathItem> fromPaths(Paths paths);
+
+    CodegenPathItem fromPathItem(PathItem pathItem, String jsonPath);
+
+    List<CodegenServer> fromServers(List<Server> servers, String jsonPath);
 
-    List<CodegenServerVariable> fromServerVariables(Map<String, ServerVariable> variables);
+    HashMap<CodegenKey, CodegenSchema> fromServerVariables(Map<String, ServerVariable> variables, String jsonPath);
 
     Map<String, String> typeMapping();
 
@@ -157,24 +168,16 @@ public interface CodegenConfig {
 
     Map<String, String> inlineSchemaNameDefault();
 
-    Map<String, String> apiTemplateFiles();
+    HashMap<CodegenConstants.JSON_PATH_LOCATION_TYPE, HashMap<String, String>> jsonPathTemplateFiles();
 
-    Map<String, String> apiXToApiTemplateFiles();
-
-    Map<CodegenConstants.JSON_PATH_LOCATION_TYPE, Map<String, String>> jsonPathTemplateFiles();
-
-    Map<CodegenConstants.JSON_PATH_LOCATION_TYPE, Map<String, String>> jsonPathDocTemplateFiles();
+    HashMap<CodegenConstants.JSON_PATH_LOCATION_TYPE, HashMap<String, String>> jsonPathDocTemplateFiles();
 
     Set<String> pathEndpointTestTemplateFiles();
 
-    Set<String> pathEndpointDocTemplateFiles();
-
     Map<String, String> apiTestTemplateFiles();
 
     Map<String, String> modelTestTemplateFiles();
 
-    Map<String, String> apiDocTemplateFiles();
-
     Set<String> languageSpecificPrimitives();
 
     Map<String, String> reservedWordsMappings();
@@ -209,6 +212,10 @@ public interface CodegenConfig {
 
     String toSecuritySchemeFilename(String baseName);
 
+    String toServerFilename(String baseName);
+
+    String getCamelCaseServer(String baseName);
+
     String toModelImport(String refClass);
 
     Map<String, String> toModelImportMap(String name);
@@ -225,8 +232,6 @@ public interface CodegenConfig {
 
     TreeMap<String, CodegenSchema> postProcessModels(TreeMap<String, CodegenSchema> models);
 
-    OperationsMap postProcessOperationsWithModels(OperationsMap operations, TreeMap<String, CodegenSchema> schemas);
-
     Map<String, Object> postProcessSupportingFileData(Map<String, Object> data);
 
     void postProcessModelProperty(CodegenSchema model, CodegenSchema property);
@@ -236,12 +241,8 @@ public interface CodegenConfig {
 
     String getDocsFilepath(String jsonPath);
 
-    String apiFilename(String templateName, String tag);
-
     String apiTestFilename(String templateName, String tag);
 
-    String apiDocFilename(String templateName, String tag);
-
     boolean isSkipOverwrite();
 
     void setSkipOverwrite(boolean skipOverwrite);

modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CodegenConstants.java

@@ -23,6 +23,7 @@
 public class CodegenConstants {
     /* System Properties */
     // NOTE: We may want to move these to a separate class to avoid confusion or modification.
+    public static final String SERVERS = "servers";
     public static final String APIS = "apis";
     public static final String MODELS = "models";
     public static final String CONTENT = "content";
@@ -242,7 +243,7 @@ public class CodegenConstants {
 
     public static enum PARAM_NAMING_TYPE {camelCase, PascalCase, snake_case, original}
 
-    public static enum JSON_PATH_LOCATION_TYPE {SCHEMA, REQUEST_BODY, PARAMETER, RESPONSE, HEADER, CONTENT, CONTENT_TYPE, HEADERS, PARAMETERS, RESPONSES, REQUEST_BODIES, SCHEMAS, PATHS, PATH, COMPONENTS, OPERATION, SECURITY_SCHEMES, SECURITY_SCHEME}
+    public static enum JSON_PATH_LOCATION_TYPE {SCHEMA, REQUEST_BODY, PARAMETER, RESPONSE, HEADER, CONTENT, CONTENT_TYPE, HEADERS, PARAMETERS, RESPONSES, REQUEST_BODIES, SCHEMAS, PATHS, PATH, COMPONENTS, OPERATION, SECURITY_SCHEMES, SECURITY_SCHEME, SERVERS, SERVER, API_ROOT_FOLDER, API_PATH, API_TAG, API_PATHS, API_TAGS}
 
     public static enum MODEL_PROPERTY_NAMING_TYPE {camelCase, PascalCase, snake_case, original}