v2 adds security schemes

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

@@ -25,6 +25,7 @@
 import io.swagger.v3.oas.models.parameters.Parameter;
 import io.swagger.v3.oas.models.parameters.RequestBody;
 import io.swagger.v3.oas.models.responses.ApiResponse;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import io.swagger.v3.oas.models.servers.Server;
 import io.swagger.v3.oas.models.servers.ServerVariable;
@@ -35,7 +36,8 @@
 import org.openapijsonschematools.codegen.model.CodegenRequestBody;
 import org.openapijsonschematools.codegen.model.CodegenResponse;
 import org.openapijsonschematools.codegen.model.CodegenSchema;
-import org.openapijsonschematools.codegen.model.CodegenSecurity;
+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;
@@ -44,6 +46,7 @@
 import org.openapijsonschematools.codegen.meta.GeneratorMetadata;
 
 import java.io.File;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -86,22 +89,12 @@ public interface CodegenConfig {
 
     String modelTestFileFolder();
 
-    String modelDocFileFolder();
-
-    String requestBodyDocFileFolder();
-
-    String headerDocFileFolder();
-
-    String parameterDocFileFolder();
-
     String modelPackage();
 
     String modelPackagePathFragment();
 
     String packageName();
 
-    String responseDocFileFolder();
-
     String toApiName(String name);
 
     String toApiVarName(String name);
@@ -144,7 +137,9 @@ public interface CodegenConfig {
 
     CodegenOperation fromOperation(String resourcePath, String httpMethod, Operation operation, List<Server> servers);
 
-    List<CodegenSecurity> fromSecurity(Map<String, SecurityScheme> schemas);
+    CodegenSecurityScheme fromSecurityScheme(SecurityScheme securityScheme, String jsonPath);
+
+    HashMap<String, CodegenSecurityRequirementValue> fromSecurityRequirement(SecurityRequirement securityScheme, String jsonPath);
 
     List<CodegenServer> fromServers(List<Server> servers);
 
@@ -168,26 +163,18 @@ public interface CodegenConfig {
 
     Map<CodegenConstants.JSON_PATH_LOCATION_TYPE, Map<String, String>> jsonPathTemplateFiles();
 
-    Map<String, String> requestBodyDocTemplateFiles();
-
-    Map<String, String> headerDocTemplateFiles();
-
-    Map<String, String> parameterDocTemplateFiles();
+    Map<CodegenConstants.JSON_PATH_LOCATION_TYPE, Map<String, String>> jsonPathDocTemplateFiles();
 
     Set<String> pathEndpointTestTemplateFiles();
 
     Set<String> pathEndpointDocTemplateFiles();
 
-    Map<String, String> responseDocTemplateFiles();
-
     Map<String, String> apiTestTemplateFiles();
 
     Map<String, String> modelTestTemplateFiles();
 
     Map<String, String> apiDocTemplateFiles();
 
-    Map<String, String> modelDocTemplateFiles();
-
     Set<String> languageSpecificPrimitives();
 
     Map<String, String> reservedWordsMappings();
@@ -212,23 +199,15 @@ public interface CodegenConfig {
 
     String toApiDocFilename(String name);
 
-    String toModelDocFilename(String name);
-
     String toRequestBodyFilename(String componentName);
 
-    String toRequestBodyDocFilename(String componentName);
-
-    String toResponseDocFilename(String componentName);
-
-    String toHeaderDocFilename(String componentName);
-
     String toHeaderFilename(String componentName);
 
     String toPathFilename(String path);
 
     String toParameterFilename(String baseName);
 
-    String toParameterDocFilename(String componentName);
+    String toSecuritySchemeFilename(String baseName);
 
     String toModelImport(String refClass);
 
@@ -255,6 +234,8 @@ public interface CodegenConfig {
     // handles almost all files to be written
     String getFilepath(String jsonPath);
 
+    String getDocsFilepath(String jsonPath);
+
     String apiFilename(String templateName, String tag);
 
     String apiTestFilename(String templateName, String tag);

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

@@ -30,6 +30,7 @@ public class CodegenConstants {
     public static final String REQUEST_BODY_DOCS = "requestBodyDocs";
 
     public static final String RESPONSES = "responses";
+    public static final String RESPONSE_DOCS = "responseDocs";
 
     public static final String COMPONENTS = "components";
 
@@ -38,6 +39,9 @@ public class CodegenConstants {
 
     public static final String PARAMETERS = "parameters";
 
+    public static final String SECURITY_SCHEMES = "securitySchemes";
+    public static final String SECURITY_SCHEME_DOCS = "securitySchemeDocs";
+
     public static final String PARAMETER_DOCS = "parameterDocs";
     public static final String SUPPORTING_FILES = "supportingFiles";
     public static final String MODEL_TESTS = "modelTests";
@@ -238,7 +242,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}
+    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 MODEL_PROPERTY_NAMING_TYPE {camelCase, PascalCase, snake_case, original}