From f170ddd83c36d215d3f2e2ef53e37c1c5b27a2b5 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Tue, 18 Jul 2023 23:48:45 -0700 Subject: [PATCH 01/43] Merges core into generator --- Dockerfile | 1 - .../pom.xml | 72 ------------------- modules/openapi-json-schema-generator/pom.xml | 5 -- .../api/AbstractTemplatingEngineAdapter.java | 0 .../codegen/api/TemplateDefinition.java | 0 .../codegen/api/TemplateFileType.java | 0 .../codegen/api/TemplatePathLocator.java | 0 .../codegen/api/TemplateProcessor.java | 0 .../codegen/api/TemplatingEngineAdapter.java | 0 .../codegen/api/TemplatingExecutor.java | 0 .../codegen/api/TemplatingGenerator.java | 0 .../codegen/config/Context.java | 0 .../codegen/config/GeneratorSettings.java | 0 .../codegen/config/WorkflowSettings.java | 0 .../codegen/languages/JavaClientCodegen.java | 1 - .../languages/JavaJerseyServerCodegen.java | 1 - .../codegen/meta/FeatureSet.java | 0 .../codegen/meta/GeneratorMetadata.java | 0 .../codegen/meta/Stability.java | 0 .../features/ClientModificationFeature.java | 0 .../meta/features/ComponentsFeature.java | 0 .../meta/features/DataTypeFeature.java | 3 +- .../meta/features/DocumentationFeature.java | 2 +- .../codegen/meta/features/GlobalFeature.java | 2 +- .../meta/features/OperationFeature.java | 1 - .../meta/features/ParameterFeature.java | 2 +- .../codegen/meta/features/SchemaFeature.java | 2 +- .../meta/features/SecurityFeature.java | 2 +- .../meta/features/WireFormatFeature.java | 2 +- .../features/annotations/AnnotationType.java | 0 .../meta/features/annotations/OAS2.java | 0 .../meta/features/annotations/OAS3.java | 0 .../annotations/ToolingExtension.java | 0 .../codegen/validation/GenericValidator.java | 0 .../codegen/validation/Invalid.java | 0 .../codegen/validation/Severity.java | 0 .../codegen/validation/Valid.java | 0 .../codegen/validation/Validated.java | 0 .../codegen/validation/ValidationResult.java | 0 .../codegen/validation/ValidationRule.java | 0 .../codegen/validation/Validator.java | 0 .../codegen/config/WorkflowSettingsTest.java | 0 .../codegen/meta/FeatureSetTest.java | 0 .../validation/GenericValidatorTest.java | 0 .../codegen/validation/ValidatedTest.java | 0 .../validation/ValidationRuleTest.java | 0 pom.xml | 1 - samples/meta-codegen/pom.xml | 1 - 48 files changed, 7 insertions(+), 91 deletions(-) delete mode 100644 modules/openapi-json-schema-generator-core/pom.xml rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/api/AbstractTemplatingEngineAdapter.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/api/TemplateDefinition.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/api/TemplateFileType.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/api/TemplatePathLocator.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/api/TemplateProcessor.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/api/TemplatingEngineAdapter.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/api/TemplatingExecutor.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/api/TemplatingGenerator.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/config/Context.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/config/GeneratorSettings.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/meta/FeatureSet.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/meta/GeneratorMetadata.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/meta/Stability.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/meta/features/ClientModificationFeature.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/meta/features/ComponentsFeature.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/meta/features/DataTypeFeature.java (98%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/meta/features/DocumentationFeature.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/meta/features/GlobalFeature.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/meta/features/OperationFeature.java (93%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/meta/features/ParameterFeature.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/meta/features/SchemaFeature.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/meta/features/SecurityFeature.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/meta/features/WireFormatFeature.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/AnnotationType.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS2.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS3.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/ToolingExtension.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/validation/GenericValidator.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/validation/Severity.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/validation/Validator.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/test/java/org/openapijsonschematools/codegen/config/WorkflowSettingsTest.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/test/java/org/openapijsonschematools/codegen/meta/FeatureSetTest.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java (100%) rename modules/{openapi-json-schema-generator-core => openapi-json-schema-generator}/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java (100%) diff --git a/Dockerfile b/Dockerfile index 9cb61b342ae..7c809d1d451 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,6 @@ COPY ./google_checkstyle.xml ${GEN_DIR} # Modules are copied individually here to allow for caching of docker layers between major.minor versions COPY ./modules/openapi-json-schema-generator-cli ${GEN_DIR}/modules/openapi-json-schema-generator-cli -COPY ./modules/openapi-json-schema-generator-core ${GEN_DIR}/modules/openapi-json-schema-generator-core COPY ./modules/openapi-json-schema-generator ${GEN_DIR}/modules/openapi-json-schema-generator COPY ./pom.xml ${GEN_DIR} diff --git a/modules/openapi-json-schema-generator-core/pom.xml b/modules/openapi-json-schema-generator-core/pom.xml deleted file mode 100644 index 46882a785ed..00000000000 --- a/modules/openapi-json-schema-generator-core/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - openapi-json-schema-generator-project - org.openapijsonschematools - ${revision} - ../.. - - 4.0.0 - - openapi-json-schema-generator-core - openapi-json-schema-generator-core - https://github.com/openapi-json-schema-tools/openapi-json-schema-generator - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - ${project.parent.basedir}${file.separator}google_checkstyle.xml - - - - - - - - com.google.guava - guava - ${guava.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.testng - testng - ${testng.version} - test - - - - - - static-analysis - - - - com.github.spotbugs - spotbugs-maven-plugin - - ${project.parent.basedir}${file.separator}spotbugs-exclude.xml - - - - org.apache.maven.plugins - maven-pmd-plugin - - - se.bjurr.violations - violations-maven-plugin - - - - - - diff --git a/modules/openapi-json-schema-generator/pom.xml b/modules/openapi-json-schema-generator/pom.xml index 17fec32895e..2f061cce6e6 100644 --- a/modules/openapi-json-schema-generator/pom.xml +++ b/modules/openapi-json-schema-generator/pom.xml @@ -387,11 +387,6 @@ jackson-datatype-threetenbp ${jackson-threetenbp.version} - - org.openapijsonschematools - openapi-json-schema-generator-core - ${project.parent.version} - org.jetbrains.kotlin kotlin-stdlib-jdk8 diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/AbstractTemplatingEngineAdapter.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/AbstractTemplatingEngineAdapter.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/AbstractTemplatingEngineAdapter.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/AbstractTemplatingEngineAdapter.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplateDefinition.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplateDefinition.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplateDefinition.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplateDefinition.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplateFileType.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplateFileType.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplateFileType.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplateFileType.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatePathLocator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatePathLocator.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatePathLocator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatePathLocator.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplateProcessor.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplateProcessor.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplateProcessor.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplateProcessor.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatingEngineAdapter.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatingEngineAdapter.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatingEngineAdapter.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatingEngineAdapter.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatingExecutor.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatingExecutor.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatingExecutor.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatingExecutor.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatingGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatingGenerator.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/api/TemplatingGenerator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatingGenerator.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/config/Context.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/Context.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/config/Context.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/Context.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/config/GeneratorSettings.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/GeneratorSettings.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/config/GeneratorSettings.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/GeneratorSettings.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaClientCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaClientCodegen.java index 4755e3f2107..3c69043c416 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaClientCodegen.java @@ -29,7 +29,6 @@ import org.openapijsonschematools.codegen.languages.features.PerformBeanValidationFeatures; import org.openapijsonschematools.codegen.templating.mustache.CaseFormatLambda; import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; -import org.openapijsonschematools.codegen.meta.features.GlobalFeature; import org.openapijsonschematools.codegen.utils.ProcessUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaJerseyServerCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaJerseyServerCodegen.java index 887608e43e5..f3ddba23726 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaJerseyServerCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaJerseyServerCodegen.java @@ -24,7 +24,6 @@ import org.openapijsonschematools.codegen.SupportingFile; import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; -import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/FeatureSet.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/FeatureSet.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/FeatureSet.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/FeatureSet.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/GeneratorMetadata.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/GeneratorMetadata.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/GeneratorMetadata.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/GeneratorMetadata.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/Stability.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/Stability.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/Stability.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/Stability.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/ClientModificationFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/ClientModificationFeature.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/ClientModificationFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/ClientModificationFeature.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/ComponentsFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/ComponentsFeature.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/ComponentsFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/ComponentsFeature.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/DataTypeFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/DataTypeFeature.java similarity index 98% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/DataTypeFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/DataTypeFeature.java index 12dd7c09df2..95314f30953 100644 --- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/DataTypeFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/DataTypeFeature.java @@ -16,9 +16,8 @@ package org.openapijsonschematools.codegen.meta.features; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; import org.openapijsonschematools.codegen.meta.features.annotations.OAS3; -import org.openapijsonschematools.codegen.meta.features.annotations.ToolingExtension; +import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; /** * Defines common data types supported by a generator. diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/DocumentationFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/DocumentationFeature.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/DocumentationFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/DocumentationFeature.java index d42a1747a6f..c30b8ac9dfa 100644 --- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/DocumentationFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/DocumentationFeature.java @@ -16,8 +16,8 @@ package org.openapijsonschematools.codegen.meta.features; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; import org.openapijsonschematools.codegen.meta.features.annotations.OAS3; +import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; import org.openapijsonschematools.codegen.meta.features.annotations.ToolingExtension; /** diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/GlobalFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/GlobalFeature.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/GlobalFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/GlobalFeature.java index e9b076bf4ee..9c14350d74c 100644 --- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/GlobalFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/GlobalFeature.java @@ -16,8 +16,8 @@ package org.openapijsonschematools.codegen.meta.features; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; import org.openapijsonschematools.codegen.meta.features.annotations.OAS3; +import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; /** * Defines a set of globally available features. That is, support of these are defined at the top-level of the spec diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/OperationFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/OperationFeature.java similarity index 93% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/OperationFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/OperationFeature.java index 7c6faf8beaa..b6eb0ccccaf 100644 --- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/OperationFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/OperationFeature.java @@ -16,7 +16,6 @@ package org.openapijsonschematools.codegen.meta.features; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; import org.openapijsonschematools.codegen.meta.features.annotations.OAS3; /** diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/ParameterFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/ParameterFeature.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/ParameterFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/ParameterFeature.java index 62b34c725da..fa51f4068b3 100644 --- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/ParameterFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/ParameterFeature.java @@ -16,8 +16,8 @@ package org.openapijsonschematools.codegen.meta.features; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; import org.openapijsonschematools.codegen.meta.features.annotations.OAS3; +import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; /** * Defines parameters supported by endpoints in the generated code. diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/SchemaFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/SchemaFeature.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/SchemaFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/SchemaFeature.java index fc149c5574b..cb812bfcb1f 100644 --- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/SchemaFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/SchemaFeature.java @@ -16,8 +16,8 @@ package org.openapijsonschematools.codegen.meta.features; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; import org.openapijsonschematools.codegen.meta.features.annotations.OAS3; +import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; /** * Defines special circumstances handled by the generator. diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/SecurityFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/SecurityFeature.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/SecurityFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/SecurityFeature.java index a05b649ce96..829e4313493 100644 --- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/SecurityFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/SecurityFeature.java @@ -16,8 +16,8 @@ package org.openapijsonschematools.codegen.meta.features; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; import org.openapijsonschematools.codegen.meta.features.annotations.OAS3; +import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; /** * Defines security features supported in the generated code. diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/WireFormatFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/WireFormatFeature.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/WireFormatFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/WireFormatFeature.java index 86c5260a0ff..e0813115721 100644 --- a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/WireFormatFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/WireFormatFeature.java @@ -16,8 +16,8 @@ package org.openapijsonschematools.codegen.meta.features; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; import org.openapijsonschematools.codegen.meta.features.annotations.OAS3; +import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; import org.openapijsonschematools.codegen.meta.features.annotations.ToolingExtension; /** diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/AnnotationType.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/AnnotationType.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/AnnotationType.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/AnnotationType.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS2.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS2.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS2.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS2.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS3.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS3.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS3.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS3.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/ToolingExtension.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/ToolingExtension.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/ToolingExtension.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/ToolingExtension.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/GenericValidator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/GenericValidator.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/GenericValidator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/GenericValidator.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Severity.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Severity.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Severity.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Severity.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java diff --git a/modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Validator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validator.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/main/java/org/openapijsonschematools/codegen/validation/Validator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validator.java diff --git a/modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/config/WorkflowSettingsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/config/WorkflowSettingsTest.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/config/WorkflowSettingsTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/config/WorkflowSettingsTest.java diff --git a/modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/meta/FeatureSetTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/meta/FeatureSetTest.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/meta/FeatureSetTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/meta/FeatureSetTest.java diff --git a/modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java diff --git a/modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java diff --git a/modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java similarity index 100% rename from modules/openapi-json-schema-generator-core/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java diff --git a/pom.xml b/pom.xml index fc2e855c1ee..2d93bd91b4a 100644 --- a/pom.xml +++ b/pom.xml @@ -1197,7 +1197,6 @@ - modules/openapi-json-schema-generator-core modules/openapi-json-schema-generator modules/openapi-json-schema-generator-cli diff --git a/samples/meta-codegen/pom.xml b/samples/meta-codegen/pom.xml index 956b253926a..6248e3631fa 100644 --- a/samples/meta-codegen/pom.xml +++ b/samples/meta-codegen/pom.xml @@ -8,6 +8,5 @@ lib/ ../../modules/openapi-json-schema-generator - ../../modules/openapi-json-schema-generator-core From d6a6ed6380c047f8e76b835f9b27c249a3d7e76c Mon Sep 17 00:00:00 2001 From: Justin Black Date: Wed, 19 Jul 2023 00:31:38 -0700 Subject: [PATCH 02/43] Refactors codegen module --- .../codegen/cmd/AuthorTemplate.java | 6 +++--- .../codegen/cmd/ConfigHelp.java | 10 +++++----- .../codegen/cmd/Generate.java | 8 ++++---- .../codegen/cmd/GenerateBatch.java | 4 ++-- .../codegen/cmd/ListGenerators.java | 6 +++--- .../codegen/cmd/Meta.java | 6 +++--- .../codegen/cmd/GenerateTest.java | 2 +- .../codegen/DefaultCodegen.java | 9 ++++++++- .../codegen/DefaultGenerator.java | 15 ++++++++++----- .../codegen/DryRunTemplateManager.java | 2 +- .../codegen/SupportingFile.java | 4 ++-- .../codegen/{auth => cli}/AuthMethod.java | 2 +- .../codegen/{auth => cli}/AuthParser.java | 2 +- .../codegen/{ => cli}/CliOption.java | 2 +- .../codegen/{ => cli}/ClientOptInput.java | 6 +++--- .../{ => codegenerator}/CodegenConfig.java | 6 ++++-- .../CodegenConfigLoader.java | 2 +- .../{ => codegenerator}/CodegenConstants.java | 2 +- .../{ => codegenerator}/CodegenType.java | 2 +- .../codegen/{ => codegenerator}/Generator.java | 4 +++- .../{ => codegenerator}/GeneratorLanguage.java | 2 +- .../GeneratorNotFoundException.java | 2 +- .../{ => codegenerator}/VendorExtension.java | 2 +- .../codegen/config/CodegenConfigurator.java | 17 ++++++++--------- .../codegen/config/DynamicSettings.java | 4 ++-- .../{ => config}/SpecValidationException.java | 2 +- .../ProtoBufIndexComputationException.java | 9 --------- .../codegen/languages/AbstractJavaCodegen.java | 8 ++++---- .../AbstractJavaJAXRSServerCodegen.java | 8 +++----- .../languages/AbstractKotlinCodegen.java | 10 ++++------ .../languages/AbstractPythonCodegen.java | 9 +++------ .../codegen/languages/JMeterClientCodegen.java | 4 ++-- .../codegen/languages/JavaClientCodegen.java | 8 ++++---- .../languages/JavaJerseyServerCodegen.java | 4 ++-- .../codegen/languages/KotlinClientCodegen.java | 6 +++--- .../codegen/languages/PythonClientCodegen.java | 14 +++++++------- .../codegen/{ => model}/CodegenCallback.java | 4 +--- .../codegen/model/CodegenOperation.java | 1 - .../AbstractTemplatingEngineAdapter.java | 2 +- .../CommonTemplateContentLocator.java | 2 -- .../GeneratorTemplateContentLocator.java | 4 +--- .../templating/HandlebarsEngineAdapter.java | 2 -- .../templating/MustacheEngineAdapter.java | 2 -- .../{api => templating}/TemplateDefinition.java | 2 +- .../{api => templating}/TemplateFileType.java | 2 +- .../{ => templating}/TemplateManager.java | 8 +------- .../TemplatePathLocator.java | 2 +- .../{api => templating}/TemplateProcessor.java | 2 +- .../TemplatingEngineAdapter.java | 2 +- .../TemplatingEngineLoader.java | 4 +--- .../{api => templating}/TemplatingExecutor.java | 2 +- .../TemplatingGenerator.java | 2 +- .../templating/mustache/CamelCaseLambda.java | 2 +- .../templating/mustache/CaseFormatLambda.java | 2 +- .../mustache/JoinWithCommaLambda.java | 2 +- .../templating/mustache/LowercaseLambda.java | 2 +- .../mustache/OptionalParameterLambda.java | 2 +- .../mustache/RequiredParameterLambda.java | 2 +- .../codegen/utils/URLPathUtils.java | 2 +- ...matools.codegen.codegenerator.CodegenConfig} | 0 ....codegen.templating.TemplatingEngineAdapter} | 0 .../codegen/AbstractIntegrationTest.java | 2 ++ .../codegen/AbstractOptionsTest.java | 2 ++ .../codegen/DefaultCodegenTest.java | 1 + .../codegen/DefaultGeneratorTest.java | 4 +++- .../codegen/MockDefaultGenerator.java | 2 ++ .../codegen/SpecValidationExceptionTest.java | 1 + .../codegen/TemplateManagerTest.java | 3 ++- .../AbstractJavaCodegenExampleValuesTest.java | 2 +- .../options/PythonClientOptionsProvider.java | 2 +- .../codegen/python/PythonClientTest.java | 2 +- .../mustache/CamelCaseLambdaTest.java | 2 +- .../mustache/LowercaseLambdaTest.java | 2 +- .../mustache/PascalCaseLambdaTest.java | 2 +- 74 files changed, 142 insertions(+), 151 deletions(-) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{auth => cli}/AuthMethod.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{auth => cli}/AuthParser.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => cli}/CliOption.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => cli}/ClientOptInput.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => codegenerator}/CodegenConfig.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => codegenerator}/CodegenConfigLoader.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => codegenerator}/CodegenConstants.java (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => codegenerator}/CodegenType.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => codegenerator}/Generator.java (87%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => codegenerator}/GeneratorLanguage.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => codegenerator}/GeneratorNotFoundException.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => codegenerator}/VendorExtension.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => config}/SpecValidationException.java (98%) delete mode 100644 modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/exceptions/ProtoBufIndexComputationException.java rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => model}/CodegenCallback.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{api => templating}/AbstractTemplatingEngineAdapter.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{api => templating}/TemplateDefinition.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{api => templating}/TemplateFileType.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => templating}/TemplateManager.java (95%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{api => templating}/TemplatePathLocator.java (87%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{api => templating}/TemplateProcessor.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{api => templating}/TemplatingEngineAdapter.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => templating}/TemplatingEngineLoader.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{api => templating}/TemplatingExecutor.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{api => templating}/TemplatingGenerator.java (94%) rename modules/openapi-json-schema-generator/src/main/resources/META-INF/services/{org.openapijsonschematools.codegen.CodegenConfig => org.openapijsonschematools.codegen.codegenerator.CodegenConfig} (100%) rename modules/openapi-json-schema-generator/src/main/resources/META-INF/services/{org.openapijsonschematools.codegen.api.TemplatingEngineAdapter => org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter} (100%) diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java index 1c496f1ddd0..9679c105ae1 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java @@ -3,9 +3,9 @@ import io.airlift.airline.Command; import io.airlift.airline.Option; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.CodegenConfig; -import org.openapijsonschematools.codegen.CodegenConfigLoader; -import org.openapijsonschematools.codegen.CodegenConstants; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfigLoader; +import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java index e81eb6e9274..07c8c168caf 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java @@ -20,11 +20,11 @@ import io.airlift.airline.Command; import io.airlift.airline.Option; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.CliOption; -import org.openapijsonschematools.codegen.CodegenConfig; -import org.openapijsonschematools.codegen.CodegenConfigLoader; -import org.openapijsonschematools.codegen.GeneratorNotFoundException; -import org.openapijsonschematools.codegen.VendorExtension; +import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfigLoader; +import org.openapijsonschematools.codegen.codegenerator.GeneratorNotFoundException; +import org.openapijsonschematools.codegen.codegenerator.VendorExtension; import org.openapijsonschematools.codegen.meta.FeatureSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java index 2aa3646c770..442e24a03b7 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java @@ -29,11 +29,11 @@ import java.util.stream.Stream; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.ClientOptInput; -import org.openapijsonschematools.codegen.CodegenConstants; +import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.DefaultGenerator; -import org.openapijsonschematools.codegen.Generator; -import org.openapijsonschematools.codegen.GeneratorNotFoundException; +import org.openapijsonschematools.codegen.codegenerator.Generator; +import org.openapijsonschematools.codegen.codegenerator.GeneratorNotFoundException; import org.openapijsonschematools.codegen.config.CodegenConfigurator; import org.openapijsonschematools.codegen.config.CodegenConfiguratorUtils; import org.slf4j.Logger; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java index 759500d2356..3b7ff77c439 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java @@ -32,8 +32,8 @@ import io.airlift.airline.Option; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.ClientOptInput; -import org.openapijsonschematools.codegen.CodegenConfig; +import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import org.openapijsonschematools.codegen.DefaultGenerator; import org.openapijsonschematools.codegen.config.CodegenConfigurator; import org.openapijsonschematools.codegen.config.DynamicSettings; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java index e98aaf5879b..d08c79edbfb 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java @@ -6,9 +6,9 @@ import io.airlift.airline.Option; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.CodegenConfig; -import org.openapijsonschematools.codegen.CodegenConfigLoader; -import org.openapijsonschematools.codegen.CodegenType; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfigLoader; +import org.openapijsonschematools.codegen.codegenerator.CodegenType; import org.openapijsonschematools.codegen.meta.GeneratorMetadata; import org.openapijsonschematools.codegen.meta.Stability; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Meta.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Meta.java index e34b6e2b1bf..0d8b8b8aed6 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Meta.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Meta.java @@ -27,13 +27,13 @@ import io.airlift.airline.Command; import io.airlift.airline.Option; import org.apache.commons.io.FileUtils; -import org.openapijsonschematools.codegen.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import org.openapijsonschematools.codegen.SupportingFile; -import org.openapijsonschematools.codegen.TemplateManager; +import org.openapijsonschematools.codegen.templating.TemplateManager; import org.openapijsonschematools.codegen.templating.CommonTemplateContentLocator; import org.openapijsonschematools.codegen.templating.MustacheEngineAdapter; import org.openapijsonschematools.codegen.templating.TemplateManagerOptions; -import org.openapijsonschematools.codegen.api.TemplatePathLocator; +import org.openapijsonschematools.codegen.templating.TemplatePathLocator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateTest.java b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateTest.java index 71a3df0e6cd..24b9754f817 100644 --- a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateTest.java +++ b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateTest.java @@ -21,7 +21,7 @@ import org.apache.commons.lang3.ArrayUtils; import org.mockito.MockSettings; import org.openapijsonschematools.codegen.DefaultGenerator; -import org.openapijsonschematools.codegen.Generator; +import org.openapijsonschematools.codegen.codegenerator.Generator; import org.openapijsonschematools.codegen.config.CodegenConfigurator; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultCodegen.java index a8c7f5698ae..eecdb460642 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultCodegen.java @@ -33,6 +33,12 @@ import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; +import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; +import org.openapijsonschematools.codegen.codegenerator.CodegenType; +import org.openapijsonschematools.codegen.codegenerator.GeneratorLanguage; +import org.openapijsonschematools.codegen.codegenerator.VendorExtension; import org.openapijsonschematools.codegen.config.GlobalSettings; import org.openapijsonschematools.codegen.meta.features.ComponentsFeature; import org.openapijsonschematools.codegen.meta.features.DataTypeFeature; @@ -44,6 +50,7 @@ import org.openapijsonschematools.codegen.meta.features.SecurityFeature; import org.openapijsonschematools.codegen.meta.features.WireFormatFeature; import org.openapijsonschematools.codegen.model.ArrayListWithContext; +import org.openapijsonschematools.codegen.model.CodegenCallback; import org.openapijsonschematools.codegen.model.CodegenDiscriminator; import org.openapijsonschematools.codegen.model.CodegenEncoding; import org.openapijsonschematools.codegen.model.CodegenHeader; @@ -79,7 +86,7 @@ import org.openapijsonschematools.codegen.templating.mustache.UppercaseLambda; import org.openapijsonschematools.codegen.utils.ModelUtils; import org.openapijsonschematools.codegen.model.CodegenDiscriminator.MappedModel; -import org.openapijsonschematools.codegen.api.TemplatingEngineAdapter; +import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter; import org.openapijsonschematools.codegen.meta.FeatureSet; import org.openapijsonschematools.codegen.meta.GeneratorMetadata; import org.openapijsonschematools.codegen.meta.Stability; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGenerator.java index dc59a3902b2..c5c7c50c650 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGenerator.java @@ -32,6 +32,10 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.comparator.PathFileComparator; import org.apache.commons.lang3.StringUtils; +import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; +import org.openapijsonschematools.codegen.codegenerator.Generator; import org.openapijsonschematools.codegen.config.GlobalSettings; import org.openapijsonschematools.codegen.ignore.CodegenIgnoreProcessor; import org.openapijsonschematools.codegen.model.CodegenHeader; @@ -51,16 +55,17 @@ import org.openapijsonschematools.codegen.templating.CommonTemplateContentLocator; import org.openapijsonschematools.codegen.templating.GeneratorTemplateContentLocator; import org.openapijsonschematools.codegen.templating.MustacheEngineAdapter; +import org.openapijsonschematools.codegen.templating.TemplateManager; import org.openapijsonschematools.codegen.templating.TemplateManagerOptions; import org.openapijsonschematools.codegen.utils.ImplementationVersion; import org.openapijsonschematools.codegen.utils.ModelUtils; import org.openapijsonschematools.codegen.utils.OnceLogger; import org.openapijsonschematools.codegen.utils.URLPathUtils; -import org.openapijsonschematools.codegen.api.TemplateDefinition; -import org.openapijsonschematools.codegen.api.TemplatePathLocator; -import org.openapijsonschematools.codegen.api.TemplateProcessor; -import org.openapijsonschematools.codegen.api.TemplatingEngineAdapter; -import org.openapijsonschematools.codegen.api.TemplateFileType; +import org.openapijsonschematools.codegen.templating.TemplateDefinition; +import org.openapijsonschematools.codegen.templating.TemplatePathLocator; +import org.openapijsonschematools.codegen.templating.TemplateProcessor; +import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter; +import org.openapijsonschematools.codegen.templating.TemplateFileType; import org.openapijsonschematools.codegen.meta.GeneratorMetadata; import org.openapijsonschematools.codegen.meta.Stability; import org.slf4j.Logger; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DryRunTemplateManager.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DryRunTemplateManager.java index 820c5df06ad..5f16d59adf1 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DryRunTemplateManager.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DryRunTemplateManager.java @@ -1,7 +1,7 @@ package org.openapijsonschematools.codegen; import org.openapijsonschematools.codegen.templating.TemplateManagerOptions; -import org.openapijsonschematools.codegen.api.TemplateProcessor; +import org.openapijsonschematools.codegen.templating.TemplateProcessor; import java.io.File; import java.io.IOException; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/SupportingFile.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/SupportingFile.java index d861982962c..c0973764834 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/SupportingFile.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/SupportingFile.java @@ -17,8 +17,8 @@ package org.openapijsonschematools.codegen; -import org.openapijsonschematools.codegen.api.TemplateDefinition; -import org.openapijsonschematools.codegen.api.TemplateFileType; +import org.openapijsonschematools.codegen.templating.TemplateDefinition; +import org.openapijsonschematools.codegen.templating.TemplateFileType; import java.util.Objects; import java.util.StringJoiner; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/auth/AuthMethod.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/AuthMethod.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/auth/AuthMethod.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/AuthMethod.java index d90a47b8b17..4bd78f201d7 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/auth/AuthMethod.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/AuthMethod.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.auth; +package org.openapijsonschematools.codegen.cli; public interface AuthMethod { String getType(); diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/auth/AuthParser.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/AuthParser.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/auth/AuthParser.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/AuthParser.java index b6c856b8aae..1d12fb686e7 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/auth/AuthParser.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/AuthParser.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.auth; +package org.openapijsonschematools.codegen.cli; import io.swagger.v3.parser.core.models.AuthorizationValue; import org.slf4j.Logger; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CliOption.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/CliOption.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CliOption.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/CliOption.java index ed409d810cf..83bf9f4d7b0 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CliOption.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/CliOption.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.cli; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.parser.util.SchemaTypeUtil; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ClientOptInput.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/ClientOptInput.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ClientOptInput.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/ClientOptInput.java index 5503caa1416..d86fd593e44 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ClientOptInput.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/ClientOptInput.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.cli; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.parser.core.models.AuthorizationValue; -import org.openapijsonschematools.codegen.auth.AuthParser; -import org.openapijsonschematools.codegen.api.TemplateDefinition; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.templating.TemplateDefinition; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CodegenConfig.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConfig.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CodegenConfig.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConfig.java index f045f54fe52..de97a6a0333 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CodegenConfig.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.codegenerator; import com.samskivert.mustache.Mustache.Compiler; import io.swagger.v3.oas.models.OpenAPI; @@ -31,6 +31,8 @@ import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.servers.ServerVariable; +import org.openapijsonschematools.codegen.SupportingFile; +import org.openapijsonschematools.codegen.cli.CliOption; import org.openapijsonschematools.codegen.model.CodegenHeader; import org.openapijsonschematools.codegen.model.CodegenKey; import org.openapijsonschematools.codegen.model.CodegenOperation; @@ -43,7 +45,7 @@ import org.openapijsonschematools.codegen.model.CodegenSecurityRequirementValue; import org.openapijsonschematools.codegen.model.CodegenSecurityScheme; import org.openapijsonschematools.codegen.model.CodegenServer; -import org.openapijsonschematools.codegen.api.TemplatingEngineAdapter; +import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter; import org.openapijsonschematools.codegen.meta.FeatureSet; import org.openapijsonschematools.codegen.meta.GeneratorMetadata; import org.openapijsonschematools.codegen.model.CodegenTag; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CodegenConfigLoader.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConfigLoader.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CodegenConfigLoader.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConfigLoader.java index 3cd61577ae1..fc30c779667 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CodegenConfigLoader.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConfigLoader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.codegenerator; import java.util.ArrayList; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CodegenConstants.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConstants.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CodegenConstants.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConstants.java index 54ee6cd0aad..8bf0cb56b3d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CodegenConstants.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConstants.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.codegenerator; /** * A class for storing constants that are used throughout the project. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CodegenType.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenType.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CodegenType.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenType.java index b65bb2784cc..4e59bba6d81 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CodegenType.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenType.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.codegenerator; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/Generator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/Generator.java similarity index 87% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/Generator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/Generator.java index 47251601f01..2f78693ceed 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/Generator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/Generator.java @@ -15,7 +15,9 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.codegenerator; + +import org.openapijsonschematools.codegen.cli.ClientOptInput; import java.io.File; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/GeneratorLanguage.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorLanguage.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/GeneratorLanguage.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorLanguage.java index 533f222dc08..507b2684906 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/GeneratorLanguage.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorLanguage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.codegenerator; public enum GeneratorLanguage { /* diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/GeneratorNotFoundException.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorNotFoundException.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/GeneratorNotFoundException.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorNotFoundException.java index 839af8d37ab..2bbf39a13ae 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/GeneratorNotFoundException.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorNotFoundException.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.codegenerator; /** * Typed exception exposing issues with loading generators (e.g. by name). diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/VendorExtension.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/VendorExtension.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/VendorExtension.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/VendorExtension.java index 6d01ba12c8f..5c03c0ef88b 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/VendorExtension.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/VendorExtension.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.codegenerator; import java.util.Collections; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java index c95cb8a7df6..bcbc4a59496 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java @@ -30,15 +30,14 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; -import org.openapijsonschematools.codegen.ClientOptInput; -import org.openapijsonschematools.codegen.CodegenConfig; -import org.openapijsonschematools.codegen.CodegenConfigLoader; -import org.openapijsonschematools.codegen.CodegenConstants; -import org.openapijsonschematools.codegen.SpecValidationException; -import org.openapijsonschematools.codegen.TemplatingEngineLoader; -import org.openapijsonschematools.codegen.api.TemplateDefinition; -import org.openapijsonschematools.codegen.api.TemplatingEngineAdapter; -import org.openapijsonschematools.codegen.auth.AuthParser; +import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfigLoader; +import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; +import org.openapijsonschematools.codegen.templating.TemplatingEngineLoader; +import org.openapijsonschematools.codegen.templating.TemplateDefinition; +import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter; +import org.openapijsonschematools.codegen.cli.AuthParser; import org.openapijsonschematools.codegen.utils.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/DynamicSettings.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/DynamicSettings.java index a8fda1e8228..384c239d1a9 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/DynamicSettings.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/DynamicSettings.java @@ -6,8 +6,8 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.api.TemplateDefinition; -import org.openapijsonschematools.codegen.api.TemplateFileType; +import org.openapijsonschematools.codegen.templating.TemplateDefinition; +import org.openapijsonschematools.codegen.templating.TemplateFileType; import java.lang.reflect.Field; import java.util.*; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/SpecValidationException.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/SpecValidationException.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/SpecValidationException.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/SpecValidationException.java index 7282122712e..ee1cbf73ad7 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/SpecValidationException.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/SpecValidationException.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.config; import java.util.Optional; import java.util.Set; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/exceptions/ProtoBufIndexComputationException.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/exceptions/ProtoBufIndexComputationException.java deleted file mode 100644 index 8c2c47deef4..00000000000 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/exceptions/ProtoBufIndexComputationException.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.openapijsonschematools.codegen.exceptions; - -public class ProtoBufIndexComputationException extends Exception { - - public ProtoBufIndexComputationException(String reason) { - super(reason); - } - -} diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractJavaCodegen.java index d127217cd1f..4548d466a31 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractJavaCodegen.java @@ -27,14 +27,14 @@ import io.swagger.v3.oas.models.parameters.Parameter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.CliOption; -import org.openapijsonschematools.codegen.CodegenConfig; -import org.openapijsonschematools.codegen.CodegenConstants; +import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.meta.features.SchemaFeature; import org.openapijsonschematools.codegen.model.CodegenPatternInfo; import org.openapijsonschematools.codegen.model.CodegenSchema; import org.openapijsonschematools.codegen.DefaultCodegen; -import org.openapijsonschematools.codegen.VendorExtension; +import org.openapijsonschematools.codegen.codegenerator.VendorExtension; import org.openapijsonschematools.codegen.languages.features.DocumentationProviderFeatures; import org.openapijsonschematools.codegen.meta.features.ClientModificationFeature; import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractJavaJAXRSServerCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractJavaJAXRSServerCodegen.java index e2211b02073..4fdfb79dc62 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractJavaJAXRSServerCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractJavaJAXRSServerCodegen.java @@ -22,17 +22,15 @@ import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.CliOption; -import org.openapijsonschematools.codegen.CodegenConstants; +import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.model.CodegenOperation; -import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.CodegenType; +import org.openapijsonschematools.codegen.codegenerator.CodegenType; import org.openapijsonschematools.codegen.languages.features.BeanValidationFeatures; import org.openapijsonschematools.codegen.utils.URLPathUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; import java.net.URL; import java.util.*; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractKotlinCodegen.java index 283b0273555..e62d2cbd99d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractKotlinCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractKotlinCodegen.java @@ -17,18 +17,16 @@ package org.openapijsonschematools.codegen.languages; -import com.fasterxml.jackson.databind.node.ArrayNode; -import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.CliOption; -import org.openapijsonschematools.codegen.CodegenConfig; -import org.openapijsonschematools.codegen.CodegenConstants; +import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.model.CodegenPatternInfo; import org.openapijsonschematools.codegen.model.CodegenSchema; import org.openapijsonschematools.codegen.DefaultCodegen; -import org.openapijsonschematools.codegen.GeneratorLanguage; +import org.openapijsonschematools.codegen.codegenerator.GeneratorLanguage; import org.openapijsonschematools.codegen.utils.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractPythonCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractPythonCodegen.java index ddf06cdd3cc..cea91e59c42 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractPythonCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractPythonCodegen.java @@ -17,17 +17,14 @@ package org.openapijsonschematools.codegen.languages; import com.github.curiousoddman.rgxgen.RgxGen; -import io.swagger.v3.oas.models.examples.Example; import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; -import io.swagger.v3.oas.models.parameters.Parameter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.CodegenConfig; -import org.openapijsonschematools.codegen.CodegenConstants; -import org.openapijsonschematools.codegen.model.CodegenParameter; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.DefaultCodegen; -import org.openapijsonschematools.codegen.GeneratorLanguage; +import org.openapijsonschematools.codegen.codegenerator.GeneratorLanguage; import org.openapijsonschematools.codegen.utils.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JMeterClientCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JMeterClientCodegen.java index 7c9bcc7f092..525805cace0 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JMeterClientCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JMeterClientCodegen.java @@ -20,8 +20,8 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; -import org.openapijsonschematools.codegen.CodegenConfig; -import org.openapijsonschematools.codegen.CodegenType; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenType; import org.openapijsonschematools.codegen.DefaultCodegen; import org.openapijsonschematools.codegen.meta.features.ClientModificationFeature; import org.openapijsonschematools.codegen.meta.features.ParameterFeature; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaClientCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaClientCodegen.java index 3c69043c416..25c9704d292 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaClientCodegen.java @@ -18,12 +18,12 @@ package org.openapijsonschematools.codegen.languages; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.CliOption; -import org.openapijsonschematools.codegen.CodegenConstants; +import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.CodegenType; +import org.openapijsonschematools.codegen.codegenerator.CodegenType; import org.openapijsonschematools.codegen.SupportingFile; -import org.openapijsonschematools.codegen.VendorExtension; +import org.openapijsonschematools.codegen.codegenerator.VendorExtension; import org.openapijsonschematools.codegen.languages.features.BeanValidationFeatures; import org.openapijsonschematools.codegen.languages.features.GzipFeatures; import org.openapijsonschematools.codegen.languages.features.PerformBeanValidationFeatures; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaJerseyServerCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaJerseyServerCodegen.java index f3ddba23726..a46218282f2 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaJerseyServerCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaJerseyServerCodegen.java @@ -18,8 +18,8 @@ package org.openapijsonschematools.codegen.languages; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.CliOption; -import org.openapijsonschematools.codegen.CodegenConstants; +import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.model.CodegenSchema; import org.openapijsonschematools.codegen.SupportingFile; import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/KotlinClientCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/KotlinClientCodegen.java index 5b7ece1f7d6..0a43534db6d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/KotlinClientCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/KotlinClientCodegen.java @@ -25,11 +25,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.openapijsonschematools.codegen.CliOption; -import org.openapijsonschematools.codegen.CodegenConstants; +import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.meta.features.SchemaFeature; import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.CodegenType; +import org.openapijsonschematools.codegen.codegenerator.CodegenType; import org.openapijsonschematools.codegen.SupportingFile; import org.openapijsonschematools.codegen.meta.features.ClientModificationFeature; import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/PythonClientCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/PythonClientCodegen.java index 23a3c43ca27..24f0368dc90 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/PythonClientCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/PythonClientCodegen.java @@ -23,17 +23,17 @@ import io.swagger.v3.oas.models.OpenAPI; import org.apache.commons.io.FileUtils; -import org.openapijsonschematools.codegen.CliOption; -import org.openapijsonschematools.codegen.CodegenConstants; +import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.meta.features.ComponentsFeature; import org.openapijsonschematools.codegen.meta.features.OperationFeature; import org.openapijsonschematools.codegen.meta.features.SchemaFeature; import org.openapijsonschematools.codegen.model.CodegenDiscriminator; import org.openapijsonschematools.codegen.model.CodegenPatternInfo; import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.CodegenType; +import org.openapijsonschematools.codegen.codegenerator.CodegenType; import org.openapijsonschematools.codegen.SupportingFile; -import org.openapijsonschematools.codegen.TemplateManager; +import org.openapijsonschematools.codegen.templating.TemplateManager; import org.openapijsonschematools.codegen.meta.features.DataTypeFeature; import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; import org.openapijsonschematools.codegen.meta.features.GlobalFeature; @@ -45,7 +45,7 @@ import org.openapijsonschematools.codegen.templating.GeneratorTemplateContentLocator; import org.openapijsonschematools.codegen.templating.HandlebarsEngineAdapter; import org.openapijsonschematools.codegen.templating.TemplateManagerOptions; -import org.openapijsonschematools.codegen.api.TemplatePathLocator; +import org.openapijsonschematools.codegen.templating.TemplatePathLocator; import org.openapijsonschematools.codegen.config.GlobalSettings; import org.openapijsonschematools.codegen.ignore.CodegenIgnoreProcessor; import io.swagger.v3.oas.models.media.*; @@ -53,13 +53,13 @@ import io.swagger.v3.oas.models.security.SecurityScheme; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.model.CodegenDiscriminator.MappedModel; -import org.openapijsonschematools.codegen.api.TemplatingEngineAdapter; +import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter; import org.openapijsonschematools.codegen.meta.GeneratorMetadata; import org.openapijsonschematools.codegen.meta.Stability; import org.openapijsonschematools.codegen.utils.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.openapijsonschematools.codegen.api.TemplateProcessor; +import org.openapijsonschematools.codegen.templating.TemplateProcessor; import java.io.File; import java.io.IOException; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CodegenCallback.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenCallback.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CodegenCallback.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenCallback.java index a88c86f57b9..3d82ff9ca61 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/CodegenCallback.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenCallback.java @@ -15,9 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen; - -import org.openapijsonschematools.codegen.model.CodegenOperation; +package org.openapijsonschematools.codegen.model; import java.util.*; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenOperation.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenOperation.java index 855e07ea5b4..81ba27c9bd9 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenOperation.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenOperation.java @@ -19,7 +19,6 @@ import io.swagger.v3.oas.models.ExternalDocumentation; import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapijsonschematools.codegen.CodegenCallback; import java.util.*; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/AbstractTemplatingEngineAdapter.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/AbstractTemplatingEngineAdapter.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/AbstractTemplatingEngineAdapter.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/AbstractTemplatingEngineAdapter.java index 83081fe4799..4d0bb866460 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/AbstractTemplatingEngineAdapter.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/AbstractTemplatingEngineAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.api; +package org.openapijsonschematools.codegen.templating; import java.util.Locale; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/CommonTemplateContentLocator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/CommonTemplateContentLocator.java index 4be61ea8e0f..944a3f17000 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/CommonTemplateContentLocator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/CommonTemplateContentLocator.java @@ -1,8 +1,6 @@ package org.openapijsonschematools.codegen.templating; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.TemplateManager; -import org.openapijsonschematools.codegen.api.TemplatePathLocator; import java.io.File; import java.net.URL; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/GeneratorTemplateContentLocator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/GeneratorTemplateContentLocator.java index 01cbc2342fd..f81b2acc5a9 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/GeneratorTemplateContentLocator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/GeneratorTemplateContentLocator.java @@ -1,9 +1,7 @@ package org.openapijsonschematools.codegen.templating; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.CodegenConfig; -import org.openapijsonschematools.codegen.TemplateManager; -import org.openapijsonschematools.codegen.api.TemplatePathLocator; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import java.io.File; import java.nio.file.Paths; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/HandlebarsEngineAdapter.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/HandlebarsEngineAdapter.java index 0d51d07eefa..12c072fe56d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/HandlebarsEngineAdapter.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/HandlebarsEngineAdapter.java @@ -30,8 +30,6 @@ import com.github.jknack.handlebars.io.StringTemplateSource; import com.github.jknack.handlebars.io.TemplateLoader; import com.github.jknack.handlebars.io.TemplateSource; -import org.openapijsonschematools.codegen.api.AbstractTemplatingEngineAdapter; -import org.openapijsonschematools.codegen.api.TemplatingExecutor; import org.openapijsonschematools.codegen.templating.handlebars.CustomHelpers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/MustacheEngineAdapter.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/MustacheEngineAdapter.java index 02ea31e2bc0..745bd81bc10 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/MustacheEngineAdapter.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/MustacheEngineAdapter.java @@ -18,8 +18,6 @@ import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import org.openapijsonschematools.codegen.api.TemplatingEngineAdapter; -import org.openapijsonschematools.codegen.api.TemplatingExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplateDefinition.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateDefinition.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplateDefinition.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateDefinition.java index 745130322b9..5a39336f5a8 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplateDefinition.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateDefinition.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.api; +package org.openapijsonschematools.codegen.templating; import java.util.Objects; import java.util.StringJoiner; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplateFileType.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateFileType.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplateFileType.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateFileType.java index b94992b2565..b0b33b505b0 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplateFileType.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateFileType.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.api; +package org.openapijsonschematools.codegen.templating; import java.util.StringJoiner; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/TemplateManager.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateManager.java similarity index 95% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/TemplateManager.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateManager.java index 780b12627e0..2a9aedb488a 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/TemplateManager.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateManager.java @@ -1,13 +1,7 @@ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.templating; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.templating.TemplateManagerOptions; -import org.openapijsonschematools.codegen.templating.TemplateNotFoundException; -import org.openapijsonschematools.codegen.api.TemplatePathLocator; -import org.openapijsonschematools.codegen.api.TemplateProcessor; -import org.openapijsonschematools.codegen.api.TemplatingEngineAdapter; -import org.openapijsonschematools.codegen.api.TemplatingExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatePathLocator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatePathLocator.java similarity index 87% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatePathLocator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatePathLocator.java index 60021d55c51..3deaf597917 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatePathLocator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatePathLocator.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.api; +package org.openapijsonschematools.codegen.templating; /** * Provides means for searching for "actual" template location based on relative template file. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplateProcessor.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateProcessor.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplateProcessor.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateProcessor.java index 0c848ded59d..404efbcad80 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplateProcessor.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateProcessor.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.api; +package org.openapijsonschematools.codegen.templating; import java.io.File; import java.io.IOException; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatingEngineAdapter.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineAdapter.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatingEngineAdapter.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineAdapter.java index f7474949b10..732f3b4a00a 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatingEngineAdapter.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.api; +package org.openapijsonschematools.codegen.templating; import java.io.FileInputStream; import java.io.IOException; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/TemplatingEngineLoader.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineLoader.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/TemplatingEngineLoader.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineLoader.java index 5cff2c5e28f..4753bb5b4d1 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/TemplatingEngineLoader.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineLoader.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen; - -import org.openapijsonschematools.codegen.api.TemplatingEngineAdapter; +package org.openapijsonschematools.codegen.templating; import java.util.Locale; import java.util.ServiceLoader; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatingExecutor.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingExecutor.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatingExecutor.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingExecutor.java index a0ba2813c50..76e8286e9fd 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatingExecutor.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingExecutor.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.api; +package org.openapijsonschematools.codegen.templating; import java.nio.file.Path; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatingGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingGenerator.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatingGenerator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingGenerator.java index 03d71b88f8a..528c900dec2 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/api/TemplatingGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.api; +package org.openapijsonschematools.codegen.templating; // TODO: 6.0 Remove /** diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java index 439c9d79887..a59d8b6019e 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java @@ -19,7 +19,7 @@ import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import org.openapijsonschematools.codegen.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import java.io.IOException; import java.io.Writer; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CaseFormatLambda.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CaseFormatLambda.java index 0a9a3f91485..9cb9e2d5b69 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CaseFormatLambda.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CaseFormatLambda.java @@ -3,7 +3,7 @@ import com.google.common.base.CaseFormat; import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import org.openapijsonschematools.codegen.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import java.io.IOException; import java.io.Writer; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/JoinWithCommaLambda.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/JoinWithCommaLambda.java index 37e6e218f6f..a33551159f0 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/JoinWithCommaLambda.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/JoinWithCommaLambda.java @@ -19,7 +19,7 @@ import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import org.openapijsonschematools.codegen.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import java.io.IOException; import java.io.Writer; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambda.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambda.java index b30643fe92d..c1a1d126929 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambda.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambda.java @@ -19,7 +19,7 @@ import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import org.openapijsonschematools.codegen.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import java.io.IOException; import java.io.Writer; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/OptionalParameterLambda.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/OptionalParameterLambda.java index 0a7f980b6cf..e8d46d612fb 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/OptionalParameterLambda.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/OptionalParameterLambda.java @@ -19,7 +19,7 @@ import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import org.openapijsonschematools.codegen.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import java.io.IOException; import java.io.Writer; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/RequiredParameterLambda.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/RequiredParameterLambda.java index f736ed3c652..31f3a6b944d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/RequiredParameterLambda.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/RequiredParameterLambda.java @@ -19,7 +19,7 @@ import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import org.openapijsonschematools.codegen.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import java.io.IOException; import java.io.Writer; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/URLPathUtils.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/URLPathUtils.java index 59f67e28086..a5d7b211ad7 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/URLPathUtils.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/URLPathUtils.java @@ -22,7 +22,7 @@ import io.swagger.v3.oas.models.servers.ServerVariable; import io.swagger.v3.oas.models.servers.ServerVariables; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.CodegenConfig b/modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.codegenerator.CodegenConfig similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.CodegenConfig rename to modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.codegenerator.CodegenConfig diff --git a/modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.api.TemplatingEngineAdapter b/modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.api.TemplatingEngineAdapter rename to modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java index 5e9f086e1ce..e5a126185e0 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java @@ -18,6 +18,8 @@ package org.openapijsonschematools.codegen; import io.swagger.v3.oas.models.OpenAPI; +import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import org.openapijsonschematools.codegen.testutils.AssertFile; import org.openapijsonschematools.codegen.testutils.IntegrationTestPathsConfig; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractOptionsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractOptionsTest.java index ddf8bf0cbf0..6d1905e2e05 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractOptionsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractOptionsTest.java @@ -20,6 +20,8 @@ import com.google.common.base.Function; import org.apache.commons.lang3.StringUtils; import org.mockito.MockSettings; +import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import org.openapijsonschematools.codegen.options.OptionsProvider; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultCodegenTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultCodegenTest.java index 3582d1fa514..5ace3c0f691 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultCodegenTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultCodegenTest.java @@ -39,6 +39,7 @@ import io.swagger.v3.oas.models.responses.ApiResponses; import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.parser.core.models.ParseOptions; +import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.model.CodegenDiscriminator; import org.openapijsonschematools.codegen.model.CodegenEncoding; import org.openapijsonschematools.codegen.model.CodegenHeader; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorTest.java index 5a36df943d0..b044c45c339 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorTest.java @@ -11,10 +11,12 @@ import io.swagger.v3.oas.models.parameters.RequestBody; import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.responses.ApiResponses; +import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.config.CodegenConfigurator; import org.openapijsonschematools.codegen.config.GlobalSettings; import org.openapijsonschematools.codegen.model.CodegenKey; -import org.openapijsonschematools.codegen.model.CodegenOperation; import org.openapijsonschematools.codegen.model.CodegenPathItem; import org.openapijsonschematools.codegen.model.CodegenRequestBody; import org.openapijsonschematools.codegen.model.CodegenResponse; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGenerator.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGenerator.java index 8395454aec6..78007b7ab6b 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGenerator.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGenerator.java @@ -15,6 +15,8 @@ */ package org.openapijsonschematools.codegen; +import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.codegenerator.Generator; import org.openapijsonschematools.codegen.templating.TemplateManagerOptions; import java.io.File; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/SpecValidationExceptionTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/SpecValidationExceptionTest.java index 9d1f4d7959b..3d82418ca3e 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/SpecValidationExceptionTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/SpecValidationExceptionTest.java @@ -1,5 +1,6 @@ package org.openapijsonschematools.codegen; +import org.openapijsonschematools.codegen.config.SpecValidationException; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TemplateManagerTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TemplateManagerTest.java index 562702e672d..b71e0f3cd77 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TemplateManagerTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TemplateManagerTest.java @@ -2,8 +2,9 @@ import org.openapijsonschematools.codegen.templating.HandlebarsEngineAdapter; import org.openapijsonschematools.codegen.templating.MustacheEngineAdapter; +import org.openapijsonschematools.codegen.templating.TemplateManager; import org.openapijsonschematools.codegen.templating.TemplateManagerOptions; -import org.openapijsonschematools.codegen.api.TemplatePathLocator; +import org.openapijsonschematools.codegen.templating.TemplatePathLocator; import org.testng.annotations.Test; import java.io.File; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/AbstractJavaCodegenExampleValuesTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/AbstractJavaCodegenExampleValuesTest.java index e9f4d1787e2..36891e02ad8 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/AbstractJavaCodegenExampleValuesTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/AbstractJavaCodegenExampleValuesTest.java @@ -21,7 +21,7 @@ import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; import org.openapijsonschematools.codegen.model.CodegenParameter; -import org.openapijsonschematools.codegen.CodegenType; +import org.openapijsonschematools.codegen.codegenerator.CodegenType; import org.openapijsonschematools.codegen.languages.AbstractJavaCodegen; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java index 66b3711926b..7bd9dca2390 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java @@ -18,7 +18,7 @@ package org.openapijsonschematools.codegen.options; import com.google.common.collect.ImmutableMap; -import org.openapijsonschematools.codegen.CodegenConstants; +import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.languages.PythonClientCodegen; import java.util.Map; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/python/PythonClientTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/python/PythonClientTest.java index 6c26c8784db..e7ced2d8e94 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/python/PythonClientTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/python/PythonClientTest.java @@ -20,7 +20,7 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.media.*; -import org.openapijsonschematools.codegen.ClientOptInput; +import org.openapijsonschematools.codegen.cli.ClientOptInput; import org.openapijsonschematools.codegen.model.CodegenSchema; import org.openapijsonschematools.codegen.DefaultGenerator; import org.openapijsonschematools.codegen.TestUtils; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambdaTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambdaTest.java index 839d4c201ab..2ca3d6c0ead 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambdaTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambdaTest.java @@ -10,7 +10,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.openapijsonschematools.codegen.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambdaTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambdaTest.java index fe037db3630..79cadc0ee51 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambdaTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambdaTest.java @@ -10,7 +10,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.openapijsonschematools.codegen.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/PascalCaseLambdaTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/PascalCaseLambdaTest.java index d0c78a10ce1..2a91fecc8e7 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/PascalCaseLambdaTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/PascalCaseLambdaTest.java @@ -10,7 +10,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.openapijsonschematools.codegen.CodegenConfig; +import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; From 6fbbb34be9ff4f5a897524c2087afd5e6df7cd13 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Wed, 19 Jul 2023 00:42:26 -0700 Subject: [PATCH 03/43] More refactoring --- .../java/org/openapijsonschematools/codegen/cmd/Meta.java | 2 +- .../org/openapijsonschematools/codegen/cmd/Validate.java | 4 ++-- .../openapijsonschematools/codegen/DefaultCodegen.java | 3 ++- .../openapijsonschematools/codegen/DefaultGenerator.java | 3 ++- .../codegen/codegenerator/CodegenConfig.java | 2 +- .../codegen/languages/JavaClientCodegen.java | 2 +- .../codegen/languages/JavaJerseyServerCodegen.java | 2 +- .../codegen/languages/KotlinClientCodegen.java | 2 +- .../codegen/languages/PythonClientCodegen.java | 2 +- .../codegen/{ => templating}/SupportingFile.java | 5 +---- .../codegen/{serializer => utils}/OpenAPISerializer.java | 2 +- .../codegen/{serializer => utils}/SerializerUtils.java | 2 +- .../codegen/validation/Validated.java | 4 ++++ .../codegen/validation/ValidationResult.java | 5 +++++ .../codegen/validation/{ => common}/GenericValidator.java | 5 ++++- .../codegen/validation/{ => common}/Invalid.java | 4 +++- .../codegen/validation/{ => common}/Severity.java | 2 +- .../codegen/validation/{ => common}/Valid.java | 4 +++- .../codegen/validation/{ => common}/ValidationRule.java | 2 +- .../codegen/validation/{ => common}/Validator.java | 4 +++- .../{validations => validation}/oas/OpenApiEvaluator.java | 8 ++++---- .../oas/OpenApiOperationValidations.java | 6 +++--- .../oas/OpenApiParameterValidations.java | 6 +++--- .../oas/OpenApiSchemaValidations.java | 6 +++--- .../oas/OpenApiSecuritySchemeValidations.java | 6 +++--- .../{validations => validation}/oas/OperationWrapper.java | 2 +- .../{validations => validation}/oas/ParameterWrapper.java | 2 +- .../oas/RuleConfiguration.java | 2 +- .../{validations => validation}/oas/SchemaWrapper.java | 2 +- .../oas/SecuritySchemeWrapper.java | 2 +- .../oas/ValidationConstants.java | 2 +- .../codegen/serializer/SerializerUtilsTest.java | 1 + .../codegen/validation/GenericValidatorTest.java | 4 ++++ .../codegen/validation/ValidatedTest.java | 1 + .../codegen/validation/ValidationRuleTest.java | 1 + .../validations/oas/OpenApiOperationValidationsTest.java | 5 ++++- .../validations/oas/OpenApiParameterValidationsTest.java | 6 +++++- .../codegen/validations/oas/OpenApiSchemaTypeTest.java | 4 +++- .../validations/oas/OpenApiSchemaValidationsTest.java | 5 ++++- .../oas/OpenApiSecuritySchemeValidationsTest.java | 6 +++++- 40 files changed, 89 insertions(+), 49 deletions(-) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => templating}/SupportingFile.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{serializer => utils}/OpenAPISerializer.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{serializer => utils}/SerializerUtils.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{ => common}/GenericValidator.java (91%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{ => common}/Invalid.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{ => common}/Severity.java (95%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{ => common}/Valid.java (92%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{ => common}/ValidationRule.java (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{ => common}/Validator.java (90%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{validations => validation}/oas/OpenApiEvaluator.java (95%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{validations => validation}/oas/OpenApiOperationValidations.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{validations => validation}/oas/OpenApiParameterValidations.java (90%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{validations => validation}/oas/OpenApiSchemaValidations.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{validations => validation}/oas/OpenApiSecuritySchemeValidations.java (90%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{validations => validation}/oas/OperationWrapper.java (95%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{validations => validation}/oas/ParameterWrapper.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{validations => validation}/oas/RuleConfiguration.java (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{validations => validation}/oas/SchemaWrapper.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{validations => validation}/oas/SecuritySchemeWrapper.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{validations => validation}/oas/ValidationConstants.java (86%) diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Meta.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Meta.java index 0d8b8b8aed6..f0aad292e8e 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Meta.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Meta.java @@ -28,7 +28,7 @@ import io.airlift.airline.Option; import org.apache.commons.io.FileUtils; import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; -import org.openapijsonschematools.codegen.SupportingFile; +import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.templating.TemplateManager; import org.openapijsonschematools.codegen.templating.CommonTemplateContentLocator; import org.openapijsonschematools.codegen.templating.MustacheEngineAdapter; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Validate.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Validate.java index e1fa4caf294..243890f8253 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Validate.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Validate.java @@ -25,8 +25,8 @@ import io.swagger.v3.parser.core.models.ParseOptions; import io.swagger.v3.parser.core.models.SwaggerParseResult; import org.apache.commons.text.WordUtils; -import org.openapijsonschematools.codegen.validations.oas.OpenApiEvaluator; -import org.openapijsonschematools.codegen.validations.oas.RuleConfiguration; +import org.openapijsonschematools.codegen.validation.oas.OpenApiEvaluator; +import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; import org.openapijsonschematools.codegen.validation.ValidationResult; import java.util.HashSet; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultCodegen.java index eecdb460642..60eab8de240 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultCodegen.java @@ -76,7 +76,8 @@ import org.openapijsonschematools.codegen.model.LinkedHashMapWithContext; import org.openapijsonschematools.codegen.model.PairCacheKey; import org.openapijsonschematools.codegen.model.SchemaTestCase; -import org.openapijsonschematools.codegen.serializer.SerializerUtils; +import org.openapijsonschematools.codegen.templating.SupportingFile; +import org.openapijsonschematools.codegen.utils.SerializerUtils; import org.openapijsonschematools.codegen.templating.MustacheEngineAdapter; import org.openapijsonschematools.codegen.templating.mustache.CamelCaseLambda; import org.openapijsonschematools.codegen.templating.mustache.IndentedLambda; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGenerator.java index c5c7c50c650..657b3342046 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGenerator.java @@ -51,7 +51,8 @@ import org.openapijsonschematools.codegen.model.CodegenSecurityScheme; import org.openapijsonschematools.codegen.model.CodegenServer; import org.openapijsonschematools.codegen.model.CodegenTag; -import org.openapijsonschematools.codegen.serializer.SerializerUtils; +import org.openapijsonschematools.codegen.templating.SupportingFile; +import org.openapijsonschematools.codegen.utils.SerializerUtils; import org.openapijsonschematools.codegen.templating.CommonTemplateContentLocator; import org.openapijsonschematools.codegen.templating.GeneratorTemplateContentLocator; import org.openapijsonschematools.codegen.templating.MustacheEngineAdapter; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConfig.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConfig.java index de97a6a0333..68ee1a3327c 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConfig.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConfig.java @@ -31,7 +31,7 @@ import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.servers.ServerVariable; -import org.openapijsonschematools.codegen.SupportingFile; +import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.cli.CliOption; import org.openapijsonschematools.codegen.model.CodegenHeader; import org.openapijsonschematools.codegen.model.CodegenKey; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaClientCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaClientCodegen.java index 25c9704d292..ec01981496a 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaClientCodegen.java @@ -22,7 +22,7 @@ import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.model.CodegenSchema; import org.openapijsonschematools.codegen.codegenerator.CodegenType; -import org.openapijsonschematools.codegen.SupportingFile; +import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.codegenerator.VendorExtension; import org.openapijsonschematools.codegen.languages.features.BeanValidationFeatures; import org.openapijsonschematools.codegen.languages.features.GzipFeatures; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaJerseyServerCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaJerseyServerCodegen.java index a46218282f2..1612d90b626 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaJerseyServerCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaJerseyServerCodegen.java @@ -21,7 +21,7 @@ import org.openapijsonschematools.codegen.cli.CliOption; import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.SupportingFile; +import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; import java.util.HashMap; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/KotlinClientCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/KotlinClientCodegen.java index 0a43534db6d..61194407a68 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/KotlinClientCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/KotlinClientCodegen.java @@ -30,7 +30,7 @@ import org.openapijsonschematools.codegen.meta.features.SchemaFeature; import org.openapijsonschematools.codegen.model.CodegenSchema; import org.openapijsonschematools.codegen.codegenerator.CodegenType; -import org.openapijsonschematools.codegen.SupportingFile; +import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.meta.features.ClientModificationFeature; import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; import org.openapijsonschematools.codegen.meta.features.ParameterFeature; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/PythonClientCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/PythonClientCodegen.java index 24f0368dc90..38298084772 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/PythonClientCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/PythonClientCodegen.java @@ -32,7 +32,7 @@ import org.openapijsonschematools.codegen.model.CodegenPatternInfo; import org.openapijsonschematools.codegen.model.CodegenSchema; import org.openapijsonschematools.codegen.codegenerator.CodegenType; -import org.openapijsonschematools.codegen.SupportingFile; +import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.templating.TemplateManager; import org.openapijsonschematools.codegen.meta.features.DataTypeFeature; import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/SupportingFile.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/SupportingFile.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/SupportingFile.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/SupportingFile.java index c0973764834..df57a0029cc 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/SupportingFile.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/SupportingFile.java @@ -15,10 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen; - -import org.openapijsonschematools.codegen.templating.TemplateDefinition; -import org.openapijsonschematools.codegen.templating.TemplateFileType; +package org.openapijsonschematools.codegen.templating; import java.util.Objects; import java.util.StringJoiner; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/serializer/OpenAPISerializer.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/OpenAPISerializer.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/serializer/OpenAPISerializer.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/OpenAPISerializer.java index 6de9a1009f2..699a0dc6df8 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/serializer/OpenAPISerializer.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/OpenAPISerializer.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.serializer; +package org.openapijsonschematools.codegen.utils; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/serializer/SerializerUtils.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/SerializerUtils.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/serializer/SerializerUtils.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/SerializerUtils.java index eae4727738a..39d9347a941 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/serializer/SerializerUtils.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/SerializerUtils.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.serializer; +package org.openapijsonschematools.codegen.utils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.MapperFeature; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java index d98f68d4611..9b4b2588a0f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java @@ -16,6 +16,10 @@ package org.openapijsonschematools.codegen.validation; +import org.openapijsonschematools.codegen.validation.common.Invalid; +import org.openapijsonschematools.codegen.validation.common.Valid; +import org.openapijsonschematools.codegen.validation.common.ValidationRule; + /** * Provides details about the state of a completed validation. */ diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java index 45b98a857bf..34bfecd96bc 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java @@ -16,6 +16,11 @@ package org.openapijsonschematools.codegen.validation; +import org.openapijsonschematools.codegen.validation.common.Invalid; +import org.openapijsonschematools.codegen.validation.common.Severity; +import org.openapijsonschematools.codegen.validation.common.Valid; +import org.openapijsonschematools.codegen.validation.common.ValidationRule; + import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/GenericValidator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/GenericValidator.java similarity index 91% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/GenericValidator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/GenericValidator.java index 64f922fc26e..3798e7e2651 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/GenericValidator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/GenericValidator.java @@ -14,7 +14,10 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation; +package org.openapijsonschematools.codegen.validation.common; + +import org.openapijsonschematools.codegen.validation.Validated; +import org.openapijsonschematools.codegen.validation.ValidationResult; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Invalid.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Invalid.java index f1469a03ba1..01225cdbd81 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Invalid.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation; +package org.openapijsonschematools.codegen.validation.common; + +import org.openapijsonschematools.codegen.validation.Validated; /** * Represents a {@link Validated} state which is "Invalid" to some degree of {@link Severity}. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Severity.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Severity.java similarity index 95% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Severity.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Severity.java index 9be63d0f536..3f40bf10e79 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Severity.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Severity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation; +package org.openapijsonschematools.codegen.validation.common; /** * Defines different levels of severity to be used during validation. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Valid.java similarity index 92% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Valid.java index 0803dcb62ac..daee6deffa9 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Valid.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation; +package org.openapijsonschematools.codegen.validation.common; + +import org.openapijsonschematools.codegen.validation.Validated; /** * Represents a {@link Validated} state which is "valid" according to the defined rule. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/ValidationRule.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/ValidationRule.java index 1cebb01ee30..a3c428a45c9 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/ValidationRule.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation; +package org.openapijsonschematools.codegen.validation.common; import java.util.function.Function; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Validator.java similarity index 90% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Validator.java index 6dd15ec88dc..f10d76de271 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Validator.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation; +package org.openapijsonschematools.codegen.validation.common; + +import org.openapijsonschematools.codegen.validation.ValidationResult; /** * Defines a contract allowing some input to be validated. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/OpenApiEvaluator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiEvaluator.java similarity index 95% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/OpenApiEvaluator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiEvaluator.java index e95c59bb672..e2f94925631 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/OpenApiEvaluator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiEvaluator.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validations.oas; +package org.openapijsonschematools.codegen.validation.oas; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; @@ -8,11 +8,11 @@ import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.tags.Tag; import org.openapijsonschematools.codegen.utils.ModelUtils; -import org.openapijsonschematools.codegen.validation.Severity; +import org.openapijsonschematools.codegen.validation.common.Severity; import org.openapijsonschematools.codegen.validation.Validated; import org.openapijsonschematools.codegen.validation.ValidationResult; -import org.openapijsonschematools.codegen.validation.ValidationRule; -import org.openapijsonschematools.codegen.validation.Validator; +import org.openapijsonschematools.codegen.validation.common.ValidationRule; +import org.openapijsonschematools.codegen.validation.common.Validator; import java.util.*; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/OpenApiOperationValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidations.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/OpenApiOperationValidations.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidations.java index c68be46d049..f99d5d0cee8 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/OpenApiOperationValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidations.java @@ -1,10 +1,10 @@ -package org.openapijsonschematools.codegen.validations.oas; +package org.openapijsonschematools.codegen.validation.oas; import io.swagger.v3.oas.models.PathItem; import io.swagger.v3.oas.models.parameters.RequestBody; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.validation.GenericValidator; -import org.openapijsonschematools.codegen.validation.ValidationRule; +import org.openapijsonschematools.codegen.validation.common.GenericValidator; +import org.openapijsonschematools.codegen.validation.common.ValidationRule; import java.util.ArrayList; import java.util.Locale; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/OpenApiParameterValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidations.java similarity index 90% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/OpenApiParameterValidations.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidations.java index 63cd574e842..feceeefde49 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/OpenApiParameterValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidations.java @@ -1,10 +1,10 @@ -package org.openapijsonschematools.codegen.validations.oas; +package org.openapijsonschematools.codegen.validation.oas; import io.swagger.v3.oas.models.parameters.HeaderParameter; import io.swagger.v3.oas.models.parameters.Parameter; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.validation.GenericValidator; -import org.openapijsonschematools.codegen.validation.ValidationRule; +import org.openapijsonschematools.codegen.validation.common.GenericValidator; +import org.openapijsonschematools.codegen.validation.common.ValidationRule; import java.util.ArrayList; import java.util.Locale; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaValidations.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java index 9f359dd015f..9e6e842d9ca 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java @@ -1,12 +1,12 @@ -package org.openapijsonschematools.codegen.validations.oas; +package org.openapijsonschematools.codegen.validation.oas; import io.swagger.v3.oas.models.media.ComposedSchema; import io.swagger.v3.oas.models.media.Schema; import org.openapijsonschematools.codegen.utils.ModelUtils; import org.openapijsonschematools.codegen.utils.SemVer; -import org.openapijsonschematools.codegen.validation.GenericValidator; -import org.openapijsonschematools.codegen.validation.ValidationRule; +import org.openapijsonschematools.codegen.validation.common.GenericValidator; +import org.openapijsonschematools.codegen.validation.common.ValidationRule; import java.util.ArrayList; import java.util.Locale; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSecuritySchemeValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidations.java similarity index 90% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSecuritySchemeValidations.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidations.java index eebf322268d..8ca33aea6f8 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSecuritySchemeValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidations.java @@ -1,9 +1,9 @@ -package org.openapijsonschematools.codegen.validations.oas; +package org.openapijsonschematools.codegen.validation.oas; import io.swagger.v3.oas.models.security.SecurityScheme; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.validation.GenericValidator; -import org.openapijsonschematools.codegen.validation.ValidationRule; +import org.openapijsonschematools.codegen.validation.common.GenericValidator; +import org.openapijsonschematools.codegen.validation.common.ValidationRule; import java.util.ArrayList; import java.util.Locale; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/OperationWrapper.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OperationWrapper.java similarity index 95% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/OperationWrapper.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OperationWrapper.java index 79dbb08b42f..d4f0b698017 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/OperationWrapper.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OperationWrapper.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validations.oas; +package org.openapijsonschematools.codegen.validation.oas; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/ParameterWrapper.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ParameterWrapper.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/ParameterWrapper.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ParameterWrapper.java index 0b6416b4518..2e3aa615897 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/ParameterWrapper.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ParameterWrapper.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validations.oas; +package org.openapijsonschematools.codegen.validation.oas; import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.OpenAPI; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/RuleConfiguration.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/RuleConfiguration.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/RuleConfiguration.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/RuleConfiguration.java index a1e09b89935..089a767f3c8 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/RuleConfiguration.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/RuleConfiguration.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validations.oas; +package org.openapijsonschematools.codegen.validation.oas; /** * Allows for configuration of validation rules which will be applied to a specification. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/SchemaWrapper.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SchemaWrapper.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/SchemaWrapper.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SchemaWrapper.java index 27664ec8f68..0a17f3c6388 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/SchemaWrapper.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SchemaWrapper.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validations.oas; +package org.openapijsonschematools.codegen.validation.oas; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.OpenAPI; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/SecuritySchemeWrapper.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SecuritySchemeWrapper.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/SecuritySchemeWrapper.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SecuritySchemeWrapper.java index 8684eb18916..19ab305ad6b 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/SecuritySchemeWrapper.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SecuritySchemeWrapper.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validations.oas; +package org.openapijsonschematools.codegen.validation.oas; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.security.SecurityScheme; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/ValidationConstants.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ValidationConstants.java similarity index 86% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/ValidationConstants.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ValidationConstants.java index 790b1bf0d1d..ff1e067248f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validations/oas/ValidationConstants.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ValidationConstants.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validations.oas; +package org.openapijsonschematools.codegen.validation.oas; final class ValidationConstants { static String ApacheNginxUnderscoreDescription = "Apache and Nginx may fail on headers keys with underscore!"; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/serializer/SerializerUtilsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/serializer/SerializerUtilsTest.java index d368b7a6092..9fd323aa6e6 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/serializer/SerializerUtilsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/serializer/SerializerUtilsTest.java @@ -9,6 +9,7 @@ import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.tags.Tag; +import org.openapijsonschematools.codegen.utils.SerializerUtils; import org.testng.annotations.Test; import java.util.Arrays; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java index 75120247608..3fc6a456b54 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java @@ -16,6 +16,10 @@ package org.openapijsonschematools.codegen.validation; +import org.openapijsonschematools.codegen.validation.common.GenericValidator; +import org.openapijsonschematools.codegen.validation.common.Invalid; +import org.openapijsonschematools.codegen.validation.common.Valid; +import org.openapijsonschematools.codegen.validation.common.ValidationRule; import org.testng.annotations.Test; import static org.testng.Assert.*; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java index ddc780c3e2c..32a05596f68 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java @@ -16,6 +16,7 @@ package org.openapijsonschematools.codegen.validation; +import org.openapijsonschematools.codegen.validation.common.ValidationRule; import org.testng.annotations.Test; import static org.testng.Assert.*; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java index d6149067cc0..4a7050411db 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java @@ -16,6 +16,7 @@ package org.openapijsonschematools.codegen.validation; +import org.openapijsonschematools.codegen.validation.common.ValidationRule; import org.testng.annotations.Test; import static org.testng.Assert.*; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiOperationValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiOperationValidationsTest.java index 5132baffa85..17ba8953f66 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiOperationValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiOperationValidationsTest.java @@ -6,8 +6,11 @@ import io.swagger.v3.oas.models.media.MediaType; import io.swagger.v3.oas.models.parameters.RequestBody; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.validation.Invalid; +import org.openapijsonschematools.codegen.validation.common.Invalid; import org.openapijsonschematools.codegen.validation.ValidationResult; +import org.openapijsonschematools.codegen.validation.oas.oas.OpenApiOperationValidations; +import org.openapijsonschematools.codegen.validation.oas.OperationWrapper; +import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiParameterValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiParameterValidationsTest.java index 3e4444d6345..a23d917bd43 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiParameterValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiParameterValidationsTest.java @@ -1,8 +1,12 @@ package org.openapijsonschematools.codegen.validations.oas; import io.swagger.v3.oas.models.parameters.Parameter; -import org.openapijsonschematools.codegen.validation.Invalid; +import org.openapijsonschematools.codegen.validation.common.Invalid; import org.openapijsonschematools.codegen.validation.ValidationResult; +import org.openapijsonschematools.codegen.validation.oas.oas.OpenApiParameterValidations; +import org.openapijsonschematools.codegen.validation.oas.ParameterWrapper; +import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; +import org.openapijsonschematools.codegen.validation.oas.oas.ValidationConstants; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaTypeTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaTypeTest.java index 3abd28a70bf..229102a2f9c 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaTypeTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaTypeTest.java @@ -2,8 +2,10 @@ import io.swagger.v3.oas.models.OpenAPI; import org.openapijsonschematools.codegen.TestUtils; -import org.openapijsonschematools.codegen.validation.Invalid; +import org.openapijsonschematools.codegen.validation.common.Invalid; import org.openapijsonschematools.codegen.validation.ValidationResult; +import org.openapijsonschematools.codegen.validation.oas.OpenApiEvaluator; +import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaValidationsTest.java index 3ca85b51b47..7a3a7bf7058 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaValidationsTest.java @@ -1,8 +1,11 @@ package org.openapijsonschematools.codegen.validations.oas; import io.swagger.v3.oas.models.media.*; -import org.openapijsonschematools.codegen.validation.Invalid; +import org.openapijsonschematools.codegen.validation.common.Invalid; import org.openapijsonschematools.codegen.validation.ValidationResult; +import org.openapijsonschematools.codegen.validation.oas.oas.OpenApiSchemaValidations; +import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; +import org.openapijsonschematools.codegen.validation.oas.SchemaWrapper; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSecuritySchemeValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSecuritySchemeValidationsTest.java index 5da0decc216..383a66ff7b7 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSecuritySchemeValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSecuritySchemeValidationsTest.java @@ -1,8 +1,12 @@ package org.openapijsonschematools.codegen.validations.oas; import io.swagger.v3.oas.models.security.SecurityScheme; -import org.openapijsonschematools.codegen.validation.Invalid; +import org.openapijsonschematools.codegen.validation.common.Invalid; import org.openapijsonschematools.codegen.validation.ValidationResult; +import org.openapijsonschematools.codegen.validation.oas.oas.OpenApiSecuritySchemeValidations; +import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; +import org.openapijsonschematools.codegen.validation.oas.SecuritySchemeWrapper; +import org.openapijsonschematools.codegen.validation.oas.oas.ValidationConstants; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; From 1b6a8a1f2807245150a6e9fc576f1d1208b6f581 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 10:17:50 -0700 Subject: [PATCH 04/43] Renames Generator as GeneratorRunner, CodegenConfig renamed to Generator --- .../codegen/OpenAPIGenerator.java | 4 +- .../codegen/cmd/AuthorTemplate.java | 10 +- .../codegen/cmd/BuildInfo.java | 2 +- .../codegen/cmd/ConfigHelp.java | 30 +- .../codegen/cmd/Generate.java | 28 +- .../codegen/cmd/GenerateBatch.java | 16 +- .../codegen/cmd/HelpCommand.java | 2 +- .../codegen/cmd/ListGenerators.java | 26 +- .../codegen/cmd/Meta.java | 16 +- .../codegen/cmd/AuthorTemplateTest.java | 2 +- .../codegen/cmd/GenerateTest.java | 16 +- ...rator.java => DefaultGeneratorRunner.java} | 342 +++++++++--------- .../codegen/cli/ClientOptInput.java | 14 +- ...ConfigLoader.java => GeneratorLoader.java} | 20 +- .../{Generator.java => GeneratorRunner.java} | 4 +- .../{CodegenType.java => GeneratorType.java} | 8 +- .../codegen/config/CodegenConfigurator.java | 12 +- .../AbstractJavaGenerator.java} | 14 +- .../AbstractJavaJAXRSServerGenerator.java} | 16 +- .../AbstractKotlinGenerator.java} | 16 +- .../AbstractPythonGenerator.java} | 10 +- .../DefaultGenerator.java} | 21 +- .../Generator.java} | 10 +- .../JMeterClientGenerator.java} | 20 +- .../JavaClientGenerator.java} | 20 +- .../JavaJerseyServerGenerator.java} | 6 +- .../KotlinClientGenerator.java} | 16 +- .../PythonClientGenerator.java} | 14 +- .../BeanValidationExtendedFeatures.java | 2 +- .../features/BeanValidationFeatures.java | 2 +- .../features/CXFExtServerFeatures.java | 2 +- .../features/CXFFeatures.java | 2 +- .../features/CXFServerFeatures.java | 2 +- .../DocumentationProviderFeatures.java | 2 +- .../features/GzipFeatures.java | 2 +- .../features/GzipTestFeatures.java | 2 +- .../features/JbossFeature.java | 2 +- .../features/LoggingFeatures.java | 2 +- .../features/LoggingTestFeatures.java | 2 +- .../features/OptionalFeatures.java | 2 +- .../PerformBeanValidationFeatures.java | 2 +- .../features/SpringFeatures.java | 2 +- .../features/SwaggerFeatures.java | 2 +- .../features/SwaggerUIFeatures.java | 2 +- .../features/UseGenericResponseFeatures.java | 2 +- .../codegen/model/CodegenDiscriminator.java | 2 +- .../GeneratorTemplateContentLocator.java | 16 +- .../templating/MustacheEngineAdapter.java | 2 +- .../templating/TemplatingEngineAdapter.java | 2 +- .../templating/mustache/CamelCaseLambda.java | 6 +- .../templating/mustache/CaseFormatLambda.java | 6 +- .../mustache/JoinWithCommaLambda.java | 6 +- .../templating/mustache/LowercaseLambda.java | 6 +- .../mustache/OptionalParameterLambda.java | 6 +- .../mustache/RequiredParameterLambda.java | 6 +- .../codegen/utils/URLPathUtils.java | 6 +- .../codegen/validation/Validated.java | 4 +- .../codegen/validation/common/Invalid.java | 4 +- .../codegen/validation/common/Valid.java | 3 +- .../validation/common/ValidationRule.java | 2 +- .../oas/OpenApiOperationValidations.java | 4 +- .../oas/OpenApiParameterValidations.java | 4 +- .../oas/OpenApiSchemaValidations.java | 4 +- .../oas/OpenApiSecuritySchemeValidations.java | 4 +- .../validation/oas/OperationWrapper.java | 2 +- .../validation/oas/ParameterWrapper.java | 2 +- .../codegen/validation/oas/SchemaWrapper.java | 2 +- .../validation/oas/SecuritySchemeWrapper.java | 2 +- .../validation/oas/ValidationConstants.java | 4 +- ...atools.codegen.codegenerator.CodegenConfig | 5 - ...onschematools.codegen.generators.Generator | 5 + .../codegen/AbstractIntegrationTest.java | 16 +- .../codegen/AbstractOptionsTest.java | 4 +- ...t.java => DefaultGeneratorTestRunner.java} | 59 +-- ...t.java => ExampleGeneratorTestRunner.java} | 2 +- ...r.java => MockDefaultGeneratorRunner.java} | 19 +- .../codegen/TestUtils.java | 12 +- .../DefaultGeneratorTest.java} | 260 ++++++------- .../DocumentationProviderFeaturesTest.java | 2 +- .../AbstractJavaCodegenExampleValuesTest.java | 10 +- .../options/PythonClientOptionsProvider.java | 10 +- .../codegen/python/PythonClientTest.java | 26 +- .../mustache/CamelCaseLambdaTest.java | 4 +- .../mustache/LowercaseLambdaTest.java | 4 +- .../mustache/PascalCaseLambdaTest.java | 4 +- .../oas/OpenApiOperationValidationsTest.java | 2 +- .../oas/OpenApiParameterValidationsTest.java | 4 +- .../oas/OpenApiSchemaValidationsTest.java | 2 +- .../OpenApiSecuritySchemeValidationsTest.java | 4 +- 89 files changed, 653 insertions(+), 655 deletions(-) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{DefaultGenerator.java => DefaultGeneratorRunner.java} (84%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/{CodegenConfigLoader.java => GeneratorLoader.java} (71%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/{Generator.java => GeneratorRunner.java} (91%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/{CodegenType.java => GeneratorType.java} (85%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages/AbstractJavaCodegen.java => generators/AbstractJavaGenerator.java} (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages/AbstractJavaJAXRSServerCodegen.java => generators/AbstractJavaJAXRSServerGenerator.java} (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages/AbstractKotlinCodegen.java => generators/AbstractKotlinGenerator.java} (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages/AbstractPythonCodegen.java => generators/AbstractPythonGenerator.java} (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{DefaultCodegen.java => generators/DefaultGenerator.java} (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{codegenerator/CodegenConfig.java => generators/Generator.java} (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages/JMeterClientCodegen.java => generators/JMeterClientGenerator.java} (91%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages/JavaClientCodegen.java => generators/JavaClientGenerator.java} (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages/JavaJerseyServerCodegen.java => generators/JavaJerseyServerGenerator.java} (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages/KotlinClientCodegen.java => generators/KotlinClientGenerator.java} (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages/PythonClientCodegen.java => generators/PythonClientGenerator.java} (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages => generators}/features/BeanValidationExtendedFeatures.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages => generators}/features/BeanValidationFeatures.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages => generators}/features/CXFExtServerFeatures.java (89%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages => generators}/features/CXFFeatures.java (92%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages => generators}/features/CXFServerFeatures.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages => generators}/features/DocumentationProviderFeatures.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages => generators}/features/GzipFeatures.java (92%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages => generators}/features/GzipTestFeatures.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages => generators}/features/JbossFeature.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages => generators}/features/LoggingFeatures.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages => generators}/features/LoggingTestFeatures.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages => generators}/features/OptionalFeatures.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages => generators}/features/PerformBeanValidationFeatures.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages => generators}/features/SpringFeatures.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages => generators}/features/SwaggerFeatures.java (92%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages => generators}/features/SwaggerUIFeatures.java (92%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{languages => generators}/features/UseGenericResponseFeatures.java (93%) delete mode 100644 modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.codegenerator.CodegenConfig create mode 100644 modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.generators.Generator rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{DefaultGeneratorTest.java => DefaultGeneratorTestRunner.java} (94%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{ExampleGeneratorTest.java => ExampleGeneratorTestRunner.java} (99%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{MockDefaultGenerator.java => MockDefaultGeneratorRunner.java} (86%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{DefaultCodegenTest.java => generators/DefaultGeneratorTest.java} (95%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{languages => generators}/features/DocumentationProviderFeaturesTest.java (96%) diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java index d40877ce816..4393c8878ef 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java @@ -39,7 +39,7 @@ /** * User: lanwen Date: 24.03.15 Time: 17:56 *

- * Command line interface for OpenAPI JSON Schema Generator use `openapi-generator-cli.jar help` for more info + * Command line interface for OpenAPI JSON Schema GeneratorRunner use `openapi-generator-cli.jar help` for more info */ public class OpenAPIGenerator { @@ -50,7 +50,7 @@ public static void main(String[] args) { .withDescription( String.format( Locale.ROOT, - "OpenAPI JSON Schema Generator CLI %s (%s).", + "OpenAPI JSON Schema GeneratorRunner CLI %s (%s).", buildInfo.getVersion(), buildInfo.getSha())) .withDefaultCommand(HelpCommand.class) diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java index 9679c105ae1..82515082374 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java @@ -3,8 +3,8 @@ import io.airlift.airline.Command; import io.airlift.airline.Option; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfigLoader; +import org.openapijsonschematools.codegen.generators.Generator; +import org.openapijsonschematools.codegen.codegenerator.GeneratorLoader; import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,8 +25,8 @@ public class AuthorTemplate extends OpenApiGeneratorCommand { private final Logger LOGGER = LoggerFactory.getLogger(AuthorTemplate.class); - @Option(name = {"-g", "--generator-name"}, title = "generator name", - description = "generator to use (see list command for list)", + @Option(name = {"-g", "--generatorRunner-name"}, title = "generatorRunner name", + description = "generatorRunner to use (see list command for list)", required = true) private String generatorName; @@ -44,7 +44,7 @@ public class AuthorTemplate extends OpenApiGeneratorCommand { @Override void execute() { - CodegenConfig config = CodegenConfigLoader.forName(generatorName); + Generator config = GeneratorLoader.forName(generatorName); String templateDirectory = config.templateDir(); log("Requesting '{}' from embedded resource directory '{}'", generatorName, templateDirectory); diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/BuildInfo.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/BuildInfo.java index c47581b81bd..3f7d56a70ee 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/BuildInfo.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/BuildInfo.java @@ -31,7 +31,7 @@ public class BuildInfo { } } catch (IOException ignored) { } - try (InputStream is = BuildInfo.class.getResourceAsStream("/openapi-json-schema-generator-git.properties")) { + try (InputStream is = BuildInfo.class.getResourceAsStream("/openapi-json-schema-generatorRunner-git.properties")) { if (is != null) { Properties gitProps = new Properties(); gitProps.load(is); diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java index 07c8c168caf..56d028c1231 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java @@ -21,8 +21,8 @@ import io.airlift.airline.Option; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfigLoader; +import org.openapijsonschematools.codegen.generators.Generator; +import org.openapijsonschematools.codegen.codegenerator.GeneratorLoader; import org.openapijsonschematools.codegen.codegenerator.GeneratorNotFoundException; import org.openapijsonschematools.codegen.codegenerator.VendorExtension; import org.openapijsonschematools.codegen.meta.FeatureSet; @@ -123,7 +123,7 @@ public void execute() { try { StringBuilder sb = new StringBuilder(); - CodegenConfig config = CodegenConfigLoader.forName(generatorName); + Generator config = GeneratorLoader.forName(generatorName); String desiredFormat = StringUtils.defaultIfBlank(format, FORMAT_TEXT); @@ -168,7 +168,7 @@ public void execute() { } } - private void generateMdConfigOptions(StringBuilder sb, CodegenConfig config) { + private void generateMdConfigOptions(StringBuilder sb, Generator config) { sb.append(newline); sb.append("| Option | Description | Values | Default |").append(newline); sb.append("| ------ | ----------- | ------ | ------- |").append(newline); @@ -209,7 +209,7 @@ private void generateMdConfigOptions(StringBuilder sb, CodegenConfig config) { }); } - private void generateMdSupportedVendorExtensions(StringBuilder sb, CodegenConfig config) { + private void generateMdSupportedVendorExtensions(StringBuilder sb, Generator config) { List supportedVendorExtensions = config.getSupportedVendorExtensions(); if (supportedVendorExtensions.isEmpty()) { return; @@ -230,7 +230,7 @@ private void generateMdSupportedVendorExtensions(StringBuilder sb, CodegenConfig sb.append(newline); } - private void generateMdInstantiationTypes(StringBuilder sb, CodegenConfig config) { + private void generateMdInstantiationTypes(StringBuilder sb, Generator config) { sb.append(newline).append("## INSTANTIATION TYPES").append(newline).append(newline); sb.append("| Type/Alias | Instantiated By |").append(newline); @@ -248,7 +248,7 @@ private void generateMdInstantiationTypes(StringBuilder sb, CodegenConfig config sb.append(newline); } - private void generateMdLanguageSpecificPrimitives(StringBuilder sb, CodegenConfig config) { + private void generateMdLanguageSpecificPrimitives(StringBuilder sb, Generator config) { sb.append(newline).append("## LANGUAGE PRIMITIVES").append(newline).append(newline); sb.append("

    ").append(newline); @@ -259,7 +259,7 @@ private void generateMdLanguageSpecificPrimitives(StringBuilder sb, CodegenConfi sb.append("
").append(newline); } - private void generateMdReservedWords(StringBuilder sb, CodegenConfig config) { + private void generateMdReservedWords(StringBuilder sb, Generator config) { sb.append(newline).append("## RESERVED WORDS").append(newline).append(newline); sb.append("
    ").append(newline); @@ -270,7 +270,7 @@ private void generateMdReservedWords(StringBuilder sb, CodegenConfig config) { sb.append("
").append(newline); } - private void generateMdFeatureSets(StringBuilder sb, CodegenConfig config) { + private void generateMdFeatureSets(StringBuilder sb, Generator config) { sb.append(newline).append("## FEATURE SET").append(newline).append(newline); List flattened = config.getGeneratorMetadata().getFeatureSet().flatten(); @@ -296,7 +296,7 @@ private void generateMdFeatureSets(StringBuilder sb, CodegenConfig config) { }); } - private void generateMdConfigOptionsHeader(StringBuilder sb, CodegenConfig config) { + private void generateMdConfigOptionsHeader(StringBuilder sb, Generator config) { if (Boolean.TRUE.equals(markdownHeader)) { sb.append("## CONFIG OPTIONS").append(newline); sb.append("These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details."); @@ -311,7 +311,7 @@ private void generateMdConfigOptionsHeader(StringBuilder sb, CodegenConfig confi } } - private void generateMdMetadata(StringBuilder sb, CodegenConfig config) { + private void generateMdMetadata(StringBuilder sb, Generator config) { sb.append("## METADATA").append(newline).append(newline); sb.append("| Property | Value | Notes |").append(newline); @@ -331,10 +331,10 @@ private void generateMdMetadata(StringBuilder sb, CodegenConfig config) { sb.append(newline); } - private void generateMarkdownHelp(StringBuilder sb, CodegenConfig config) { + private void generateMarkdownHelp(StringBuilder sb, Generator config) { if (Boolean.TRUE.equals(markdownHeader)) { sb.append("---").append(newline); - sb.append("title: Documentation for the " + generatorName + " Generator").append(newline); + sb.append("title: Documentation for the " + generatorName + " generator").append(newline); sb.append("---").append(newline); sb.append(newline); } @@ -367,7 +367,7 @@ private void generateMarkdownHelp(StringBuilder sb, CodegenConfig config) { } } - private void generateYamlSample(StringBuilder sb, CodegenConfig config) { + private void generateYamlSample(StringBuilder sb, Generator config) { for (CliOption langCliOption : config.cliOptions()) { @@ -396,7 +396,7 @@ private void generateYamlSample(StringBuilder sb, CodegenConfig config) { } @SuppressWarnings({"java:S1117"}) - private void generatePlainTextHelp(StringBuilder sb, CodegenConfig config) { + private void generatePlainTextHelp(StringBuilder sb, Generator config) { sb.append(newline).append("CONFIG OPTIONS"); if (Boolean.TRUE.equals(namedHeader)) { sb.append(" for ").append(generatorName).append(newline); diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java index 442e24a03b7..35c9f91905c 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java @@ -31,8 +31,8 @@ import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.ClientOptInput; import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; -import org.openapijsonschematools.codegen.DefaultGenerator; -import org.openapijsonschematools.codegen.codegenerator.Generator; +import org.openapijsonschematools.codegen.DefaultGeneratorRunner; +import org.openapijsonschematools.codegen.codegenerator.GeneratorRunner; import org.openapijsonschematools.codegen.codegenerator.GeneratorNotFoundException; import org.openapijsonschematools.codegen.config.CodegenConfigurator; import org.openapijsonschematools.codegen.config.CodegenConfiguratorUtils; @@ -40,17 +40,17 @@ import org.slf4j.LoggerFactory; @SuppressWarnings({"java:S106"}) -@Command(name = "generate", description = "Generate code with the specified generator.") +@Command(name = "generate", description = "Generate code with the specified generatorRunner.") public class Generate extends OpenApiGeneratorCommand { CodegenConfigurator configurator; - Generator generator; + GeneratorRunner generatorRunner; @Option(name = {"-v", "--verbose"}, description = "verbose mode") private Boolean verbose; - @Option(name = {"-g", "--generator-name"}, title = "generator name", - description = "generator to use (see list command for list)") + @Option(name = {"-g", "--generatorRunner-name"}, title = "generatorRunner name", + description = "generatorRunner to use (see list command for list)") private String generatorName; @Option(name = {"-o", "--output"}, title = "output directory", @@ -89,7 +89,7 @@ public class Generate extends OpenApiGeneratorCommand { description = "Path to configuration file. It can be JSON or YAML. " + "If file is JSON, the content should have the format {\"optionKey\":\"optionValue\", \"optionKey1\":\"optionValue1\"...}. " + "If file is YAML, the content should have the format optionKey: optionValue. " - + "Supported options can be different for each language. Run config-help -g {generator name} command for language-specific config options.") + + "Supported options can be different for each language. Run config-help -g {generatorRunner name} command for language-specific config options.") private String configFile; @Option(name = {"-s", "--skip-overwrite"}, title = "skip overwrite", @@ -261,7 +261,7 @@ public class Generate extends OpenApiGeneratorCommand { @Option(name = {"--log-to-stderr"}, title = "Log to STDERR", description = "write all log messages (not just errors) to STDOUT." - + " Useful for piping the JSON output of debug options (e.g. `--global-property debugOperations`) to an external parser directly while testing a generator.") + + " Useful for piping the JSON output of debug options (e.g. `--global-property debugOperations`) to an external parser directly while testing a generatorRunner.") private Boolean logToStderr; @Option(name = {"--enable-post-process-file"}, title = "enable post-processing of files (in generators supporting it)", description = CodegenConstants.ENABLE_POST_PROCESS_FILE_DESC) @@ -327,7 +327,7 @@ public void execute() { configurator.setInputSpec(spec); } - // Generator name should not be validated here, as it's validated in toClientOptInput + // GeneratorRunner name should not be validated here, as it's validated in toClientOptInput if (isNotEmpty(generatorName)) { configurator.setGeneratorName(generatorName); } @@ -454,15 +454,15 @@ public void execute() { final ClientOptInput clientOptInput = configurator.toClientOptInput(); // this null check allows us to inject for unit testing. - if (generator == null) { - generator = new DefaultGenerator(isDryRun); + if (generatorRunner == null) { + generatorRunner = new DefaultGeneratorRunner(isDryRun); } - generator.opts(clientOptInput); - generator.generate(); + generatorRunner.opts(clientOptInput); + generatorRunner.generate(); } catch (GeneratorNotFoundException e) { System.err.println(e.getMessage()); - System.err.println("[error] Check the spelling of the generator's name and try again."); + System.err.println("[error] Check the spelling of the generatorRunner's name and try again."); System.exit(1); } } diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java index 3b7ff77c439..adabac2aeef 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java @@ -33,8 +33,8 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.ClientOptInput; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; -import org.openapijsonschematools.codegen.DefaultGenerator; +import org.openapijsonschematools.codegen.generators.Generator; +import org.openapijsonschematools.codegen.DefaultGeneratorRunner; import org.openapijsonschematools.codegen.config.CodegenConfigurator; import org.openapijsonschematools.codegen.config.DynamicSettings; import org.openapijsonschematools.codegen.config.GlobalSettings; @@ -69,7 +69,7 @@ public class GenerateBatch extends OpenApiGeneratorCommand { @Option(name = {"-r", "--threads"}, description = "thread count") private Integer threads; - @Arguments(description = "Generator configuration files.", required = true) + @Arguments(description = "GeneratorRunner configuration files.", required = true) private List configs; @Option(name = {"--fail-fast"}, description = "fail fast on any errors") @@ -209,7 +209,7 @@ public void run() { GlobalSettings.reset(); ClientOptInput opts = configurator.toClientOptInput(); - CodegenConfig config = opts.getConfig(); + Generator config = opts.getConfig(); name = config.getName(); Path target = Paths.get(config.getOutputDir()); @@ -222,7 +222,7 @@ public void run() { System.out.printf(Locale.ROOT, "[%s] Generating %s (outputs to %s)…%n", Thread.currentThread().getName(), name, updated.toString()); - DefaultGenerator defaultGenerator = new DefaultGenerator(); + DefaultGeneratorRunner defaultGenerator = new DefaultGeneratorRunner(); defaultGenerator.opts(opts); defaultGenerator.generate(); @@ -247,7 +247,7 @@ public void run() { private void cleanPreviousFiles(final String name, Path outDir) throws IOException { System.out.printf(Locale.ROOT, "[%s] Cleaning previous contents for %s in %s…%n", Thread.currentThread().getName(), name, outDir.toString()); - Path filesMeta = Paths.get(outDir.toAbsolutePath().toString(), ".openapi-generator", "FILES"); + Path filesMeta = Paths.get(outDir.toAbsolutePath().toString(), ".openapi-generatorRunner", "FILES"); if (filesMeta.toFile().exists()) { FileUtils.readLines(filesMeta.toFile(), StandardCharsets.UTF_8).forEach(relativePath -> { if (!StringUtils.startsWith(relativePath, ".")) { @@ -257,11 +257,11 @@ private void cleanPreviousFiles(final String name, Path outDir) throws IOExcepti try { Files.delete(file); } catch (Throwable e) { - System.out.printf(Locale.ROOT, "[%s] Generator %s failed to clean file %s…%n", Thread.currentThread().getName(), name, file); + System.out.printf(Locale.ROOT, "[%s] GeneratorRunner %s failed to clean file %s…%n", Thread.currentThread().getName(), name, file); } } } else { - System.out.printf(Locale.ROOT, "[%s] Generator %s skip cleaning special filename %s…%n", Thread.currentThread().getName(), name, relativePath); + System.out.printf(Locale.ROOT, "[%s] GeneratorRunner %s skip cleaning special filename %s…%n", Thread.currentThread().getName(), name, relativePath); } }); } diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/HelpCommand.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/HelpCommand.java index dd3e1bf05d0..f690f9a463a 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/HelpCommand.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/HelpCommand.java @@ -5,7 +5,7 @@ import javax.inject.Inject; -@Command(name = "help", description = "Display help information about openapi-generator") +@Command(name = "help", description = "Display help information about openapi-generatorRunner") public class HelpCommand extends OpenApiGeneratorCommand { @Inject diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java index d08c79edbfb..357a70dd954 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java @@ -6,9 +6,9 @@ import io.airlift.airline.Option; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfigLoader; -import org.openapijsonschematools.codegen.codegenerator.CodegenType; +import org.openapijsonschematools.codegen.generators.Generator; +import org.openapijsonschematools.codegen.codegenerator.GeneratorLoader; +import org.openapijsonschematools.codegen.codegenerator.GeneratorType; import org.openapijsonschematools.codegen.meta.GeneratorMetadata; import org.openapijsonschematools.codegen.meta.Stability; @@ -36,7 +36,7 @@ public class ListGenerators extends OpenApiGeneratorCommand { @Override public void execute() { - List generators = new ArrayList<>(); + List generators = new ArrayList<>(); List stabilities = Arrays.asList(Stability.values()); if (!StringUtils.isEmpty(include)) { @@ -48,10 +48,10 @@ public void execute() { } } - for (CodegenConfig codegenConfig : CodegenConfigLoader.getAll()) { - GeneratorMetadata meta = codegenConfig.getGeneratorMetadata(); + for (Generator generator : GeneratorLoader.getAll()) { + GeneratorMetadata meta = generator.getGeneratorMetadata(); if (meta != null && stabilities.contains(meta.getStability())) { - generators.add(codegenConfig); + generators.add(generator); } } @@ -59,21 +59,21 @@ public void execute() { if (shortened) { for (int i = 0; i < generators.size(); i++) { - CodegenConfig generator = generators.get(i); + Generator generator = generators.get(i); if (i != 0) { sb.append(","); } sb.append(generator.getName()); } } else { - CodegenType[] types = CodegenType.values(); + GeneratorType[] types = GeneratorType.values(); sb.append("The following generators are available:"); sb.append(System.lineSeparator()); sb.append(System.lineSeparator()); - for (CodegenType type : types) { + for (GeneratorType type : types) { appendForType(sb, type, type.name(), generators); } appendForType(sb, null, "UNSPECIFIED", generators); @@ -82,10 +82,10 @@ public void execute() { System.out.printf(Locale.ROOT, "%s%n", sb.toString()); } - private void appendForType(StringBuilder sb, CodegenType type, String typeName, List generators) { - List list = generators.stream() + private void appendForType(StringBuilder sb, GeneratorType type, String typeName, List generators) { + List list = generators.stream() .filter(g -> Objects.equal(type, g.getTag())) - .sorted(Comparator.comparing(CodegenConfig::getName)) + .sorted(Comparator.comparing(Generator::getName)) .collect(Collectors.toList()); if(!list.isEmpty()) { diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Meta.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Meta.java index f0aad292e8e..3ad034f0d01 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Meta.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Meta.java @@ -27,7 +27,7 @@ import io.airlift.airline.Command; import io.airlift.airline.Option; import org.apache.commons.io.FileUtils; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.generators.Generator; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.templating.TemplateManager; import org.openapijsonschematools.codegen.templating.CommonTemplateContentLocator; @@ -49,7 +49,7 @@ * User: lanwen Date: 24.03.15 Time: 20:22 */ -@Command(name = "meta", description = "MetaGenerator. Generator for creating a new template set " +@Command(name = "meta", description = "MetaGenerator. GeneratorRunner for creating a new template set " + "and configuration for Codegen. The output will be based on the language you " + "specify, and includes default templates to include.") public class Meta extends OpenApiGeneratorCommand { @@ -64,7 +64,7 @@ public class Meta extends OpenApiGeneratorCommand { private String outputFolder = ""; @Option(name = {"-n", "--name"}, title = "name", - description = "the human-readable name of the generator") + description = "the human-readable name of the generatorRunner") private String name = "default"; @Option(name = {"-p", "--package"}, title = "package", @@ -72,12 +72,12 @@ public class Meta extends OpenApiGeneratorCommand { private String targetPackage = "org.openapijsonschematools.codegen"; @Option(name = {"-t", "--type"}, title = "type", - description = "the type of generator that is created", + description = "the type of generatorRunner that is created", allowedValues = {"CLIENT", "SERVER", "DOCUMENTATION", "CONFIG", "OTHER"}) private String type = "OTHER"; @Option(name = {"-l", "--language"}, title = "language", - description = "the implementation language for the generator class", + description = "the implementation language for the generatorRunner class", allowedValues = {"java", "kotlin"} ) private String language = "java"; @@ -87,7 +87,7 @@ public void execute() { final File targetDir = new File(outputFolder); LOGGER.info("writing to folder [{}]", targetDir.getAbsolutePath()); - String mainClass = CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, name) + "Generator"; + String mainClass = CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, name) + "GeneratorRunner"; String kebabName = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, name); List supportingFiles = "kotlin".equals(language) ? @@ -102,7 +102,7 @@ public void execute() { new SupportingFile("api.template", "src/main/resources" + File.separator + name,"api.mustache"), new SupportingFile("model.template", "src/main/resources" + File.separator + name,"model.mustache"), new SupportingFile("myFile.template", String.join(File.separator, "src", "main", "resources", name), "myFile.mustache"), - new SupportingFile("services.mustache", "src/main/resources/META-INF/services", CodegenConfig.class.getCanonicalName())) + new SupportingFile("services.mustache", "src/main/resources/META-INF/services", Generator.class.getCanonicalName())) : ImmutableList.of( new SupportingFile("pom.mustache", "", "pom.xml"), new SupportingFile("generatorClass.mustache", on(File.separator).join("src/main/java", asPath(targetPackage)), mainClass.concat(".java")), @@ -111,7 +111,7 @@ public void execute() { new SupportingFile("api.template", "src/main/resources" + File.separator + name,"api.mustache"), new SupportingFile("model.template", "src/main/resources" + File.separator + name,"model.mustache"), new SupportingFile("myFile.template", String.join(File.separator, "src", "main", "resources", name), "myFile.mustache"), - new SupportingFile("services.mustache", "src/main/resources/META-INF/services", CodegenConfig.class.getCanonicalName())); + new SupportingFile("services.mustache", "src/main/resources/META-INF/services", Generator.class.getCanonicalName())); String currentVersion = buildInfo.getVersion(); diff --git a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/AuthorTemplateTest.java b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/AuthorTemplateTest.java index bf7a200fe19..86d18441caf 100644 --- a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/AuthorTemplateTest.java +++ b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/AuthorTemplateTest.java @@ -58,7 +58,7 @@ public void smokeTestAuthorTemplateCommand(){ } private Cli.CliBuilder createBuilder(){ - Cli.CliBuilder builder = new Cli.CliBuilder<>("openapi-generator-cli"); + Cli.CliBuilder builder = new Cli.CliBuilder<>("openapi-generatorRunner-cli"); builder.withGroup("author") .withDescription("Utilities for authoring generators or customizing templates.") diff --git a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateTest.java b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateTest.java index 24b9754f817..d36aa23dbbe 100644 --- a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateTest.java +++ b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateTest.java @@ -20,8 +20,8 @@ import io.airlift.airline.Cli; import org.apache.commons.lang3.ArrayUtils; import org.mockito.MockSettings; -import org.openapijsonschematools.codegen.DefaultGenerator; -import org.openapijsonschematools.codegen.codegenerator.Generator; +import org.openapijsonschematools.codegen.DefaultGeneratorRunner; +import org.openapijsonschematools.codegen.codegenerator.GeneratorRunner; import org.openapijsonschematools.codegen.config.CodegenConfigurator; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -41,7 +41,7 @@ public class GenerateTest { protected MockSettings mockSettings = withSettings().useConstructor().defaultAnswer(CALLS_REAL_METHODS); - private Generator generator; + private GeneratorRunner generatorRunner; private CodegenConfigurator configurator; private Path outputDirectory; @@ -53,8 +53,8 @@ public void afterEachTest() { @BeforeMethod public void beforeEachTest() throws IOException { outputDirectory = Files.createTempDirectory("GenerateTest"); - generator = mock(DefaultGenerator.class); - when(generator.generate()).thenReturn(new ArrayList<>()); + generatorRunner = mock(DefaultGeneratorRunner.class); + when(generatorRunner.generate()).thenReturn(new ArrayList<>()); configurator = mock(CodegenConfigurator.class, mockSettings); } @@ -108,13 +108,13 @@ private void setupAndRunTest(String specFlag, final String spec, String langFlag String[] argsToUse = ArrayUtils.addAll(commonArgs, additionalParameters); Cli.CliBuilder builder = - Cli.builder("openapi-generator-cli") + Cli.builder("openapi-generatorRunner-cli") .withCommands(Generate.class); Generate generate = (Generate) builder.build().parse(argsToUse); generate.configurator = configurator; - generate.generator = generator; + generate.generatorRunner = generatorRunner; try { generate.run(); @@ -298,7 +298,7 @@ public void testPackageName() { @Test public void testRequiredArgs_LongArgs() { - setupAndRunTest("--input-spec", "src/test/resources/swagger.yaml", "--generator-name", "java", "--output", + setupAndRunTest("--input-spec", "src/test/resources/swagger.yaml", "--generatorRunner-name", "java", "--output", "src/main/java", false, null); // on top of those in setupAndRunTest: diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGeneratorRunner.java similarity index 84% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGenerator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGeneratorRunner.java index 657b3342046..5249ef43d4b 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGeneratorRunner.java @@ -33,9 +33,9 @@ import org.apache.commons.io.comparator.PathFileComparator; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.ClientOptInput; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.generators.Generator; import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; -import org.openapijsonschematools.codegen.codegenerator.Generator; +import org.openapijsonschematools.codegen.codegenerator.GeneratorRunner; import org.openapijsonschematools.codegen.config.GlobalSettings; import org.openapijsonschematools.codegen.ignore.CodegenIgnoreProcessor; import org.openapijsonschematools.codegen.model.CodegenHeader; @@ -84,13 +84,13 @@ import static org.apache.commons.lang3.StringUtils.removeStart; @SuppressWarnings("rawtypes") -public class DefaultGenerator implements Generator { +public class DefaultGeneratorRunner implements GeneratorRunner { private static final String METADATA_DIR = ".openapi-generator"; - protected final Logger LOGGER = LoggerFactory.getLogger(DefaultGenerator.class); + protected final Logger LOGGER = LoggerFactory.getLogger(DefaultGeneratorRunner.class); private final boolean dryRun; - protected CodegenConfig config; + public Generator generator; protected ClientOptInput opts; - protected OpenAPI openAPI; + public OpenAPI openAPI; protected CodegenIgnoreProcessor ignoreProcessor; private Boolean generateApis = null; private Boolean generateModels = null; @@ -107,40 +107,40 @@ public class DefaultGenerator implements Generator { private List userDefinedTemplates = new ArrayList<>(); - public DefaultGenerator() { + public DefaultGeneratorRunner() { this(false); } - public DefaultGenerator(Boolean dryRun) { + public DefaultGeneratorRunner(Boolean dryRun) { this.dryRun = Boolean.TRUE.equals(dryRun); LOGGER.info("Generating with dryRun={}", this.dryRun); } @SuppressWarnings("deprecation") @Override - public Generator opts(ClientOptInput opts) { + public GeneratorRunner opts(ClientOptInput opts) { this.opts = opts; this.openAPI = opts.getOpenAPI(); - this.config = opts.getConfig(); + this.generator = opts.getConfig(); List userFiles = opts.getUserDefinedTemplates(); if (userFiles != null) { this.userDefinedTemplates = Collections.unmodifiableList(userFiles); } - TemplateManagerOptions templateManagerOptions = new TemplateManagerOptions(this.config.isEnableMinimalUpdate(), this.config.isSkipOverwrite()); + TemplateManagerOptions templateManagerOptions = new TemplateManagerOptions(this.generator.isEnableMinimalUpdate(), this.generator.isSkipOverwrite()); if (this.dryRun) { this.templateProcessor = new DryRunTemplateManager(templateManagerOptions); } else { - TemplatingEngineAdapter templatingEngine = this.config.getTemplatingEngine(); + TemplatingEngineAdapter templatingEngine = this.generator.getTemplatingEngine(); if (templatingEngine instanceof MustacheEngineAdapter) { MustacheEngineAdapter mustacheEngineAdapter = (MustacheEngineAdapter) templatingEngine; - mustacheEngineAdapter.setCompiler(this.config.processCompiler(mustacheEngineAdapter.getCompiler())); + mustacheEngineAdapter.setCompiler(this.generator.processCompiler(mustacheEngineAdapter.getCompiler())); } TemplatePathLocator commonTemplateLocator = new CommonTemplateContentLocator(); - TemplatePathLocator generatorTemplateLocator = new GeneratorTemplateContentLocator(this.config); + TemplatePathLocator generatorTemplateLocator = new GeneratorTemplateContentLocator(this.generator); this.templateProcessor = new TemplateManager( templateManagerOptions, templatingEngine, @@ -148,7 +148,7 @@ public Generator opts(ClientOptInput opts) { ); } - String ignoreFileLocation = this.config.getIgnoreFilePathOverride(); + String ignoreFileLocation = this.generator.getIgnoreFilePathOverride(); if (ignoreFileLocation != null) { final File ignoreFile = new File(ignoreFileLocation); if (ignoreFile.exists() && ignoreFile.canRead()) { @@ -159,7 +159,7 @@ public Generator opts(ClientOptInput opts) { } if (this.ignoreProcessor == null) { - this.ignoreProcessor = new CodegenIgnoreProcessor(this.config.getOutputDir()); + this.ignoreProcessor = new CodegenIgnoreProcessor(this.generator.getOutputDir()); } return this; @@ -167,7 +167,7 @@ public Generator opts(ClientOptInput opts) { /** * Retrieves an instance to the configured template processor, available after user-defined options are - * applied via {@link DefaultGenerator#opts(ClientOptInput)}. + * applied via {@link DefaultGeneratorRunner#opts(ClientOptInput)}. * * @return A configured {@link TemplateProcessor}, or null. */ @@ -209,7 +209,7 @@ private Boolean getGeneratorPropertyDefaultSwitch(final String key, final Boolea return defaultValue; } - void configureGeneratorProperties() { + public void configureGeneratorProperties() { // allows generating only models by specifying a CSV of models to generate, or empty for all // NOTE: Boolean.TRUE is required below rather than `true` because of JVM boxing constraints and type inference. generateApis = GlobalSettings.getProperty(CodegenConstants.APIS) != null ? Boolean.TRUE : getGeneratorPropertyDefaultSwitch(CodegenConstants.APIS, null); @@ -238,17 +238,17 @@ void configureGeneratorProperties() { generateApiDocumentation = GlobalSettings.getProperty(CodegenConstants.API_DOCS) != null ? Boolean.valueOf(GlobalSettings.getProperty(CodegenConstants.API_DOCS)) : getGeneratorPropertyDefaultSwitch(CodegenConstants.API_DOCS, true); // Additional properties added for tests to exclude references in project related files - config.additionalProperties().put(CodegenConstants.GENERATE_API_TESTS, generateApiTests); - config.additionalProperties().put(CodegenConstants.GENERATE_MODEL_TESTS, generateModelTests); + generator.additionalProperties().put(CodegenConstants.GENERATE_API_TESTS, generateApiTests); + generator.additionalProperties().put(CodegenConstants.GENERATE_MODEL_TESTS, generateModelTests); - config.additionalProperties().put(CodegenConstants.GENERATE_API_DOCS, generateApiDocumentation); - config.additionalProperties().put(CodegenConstants.GENERATE_MODEL_DOCS, generateModelDocumentation); + generator.additionalProperties().put(CodegenConstants.GENERATE_API_DOCS, generateApiDocumentation); + generator.additionalProperties().put(CodegenConstants.GENERATE_MODEL_DOCS, generateModelDocumentation); - config.additionalProperties().put(CodegenConstants.GENERATE_APIS, generateApis); - config.additionalProperties().put(CodegenConstants.GENERATE_MODELS, generateModels); + generator.additionalProperties().put(CodegenConstants.GENERATE_APIS, generateApis); + generator.additionalProperties().put(CodegenConstants.GENERATE_MODELS, generateModels); if (!generateApiTests && !generateModelTests) { - config.additionalProperties().put(CodegenConstants.EXCLUDE_TESTS, true); + generator.additionalProperties().put(CodegenConstants.EXCLUDE_TESTS, true); } if (GlobalSettings.getProperty("debugOpenAPI") != null) { @@ -260,26 +260,26 @@ void configureGeneratorProperties() { System.out.println(SerializerUtils.toJsonString(openAPI)); } - config.processOpts(); - config.preprocessOpenAPI(openAPI); + generator.processOpts(); + generator.preprocessOpenAPI(openAPI); // set OpenAPI to make these available to all methods - config.setOpenAPI(openAPI); + generator.setOpenAPI(openAPI); - config.additionalProperties().put("generatorVersion", ImplementationVersion.read()); - config.additionalProperties().put("generatedDate", ZonedDateTime.now().toString()); - config.additionalProperties().put("generatedYear", String.valueOf(ZonedDateTime.now().getYear())); - config.additionalProperties().put("generatorClass", config.getClass().getSimpleName()); - config.additionalProperties().put("inputSpec", config.getInputSpec()); + generator.additionalProperties().put("generatorVersion", ImplementationVersion.read()); + generator.additionalProperties().put("generatedDate", ZonedDateTime.now().toString()); + generator.additionalProperties().put("generatedYear", String.valueOf(ZonedDateTime.now().getYear())); + generator.additionalProperties().put("generatorClass", generator.getClass().getSimpleName()); + generator.additionalProperties().put("inputSpec", generator.getInputSpec()); if (openAPI.getExtensions() != null) { - config.vendorExtensions().putAll(openAPI.getExtensions()); + generator.vendorExtensions().putAll(openAPI.getExtensions()); } // TODO: Allow user to define _which_ servers object in the array to target. // Configures contextPath/basePath according to api document's servers - URL url = URLPathUtils.getServerURL(openAPI, config.serverVariableOverrides()); - contextPath = removeTrailingSlash(config.escapeText(url.getPath())); // for backward compatibility + URL url = URLPathUtils.getServerURL(openAPI, generator.serverVariableOverrides()); + contextPath = removeTrailingSlash(generator.escapeText(url.getPath())); // for backward compatibility } private void configureOpenAPIInfo() { @@ -288,68 +288,68 @@ private void configureOpenAPIInfo() { return; } if (info.getTitle() != null) { - config.additionalProperties().put("appName", config.escapeText(info.getTitle())); + generator.additionalProperties().put("appName", generator.escapeText(info.getTitle())); } if (info.getVersion() != null) { - config.additionalProperties().put("appVersion", config.escapeText(info.getVersion())); + generator.additionalProperties().put("appVersion", generator.escapeText(info.getVersion())); } else { LOGGER.error("Missing required field info version. Default appVersion set to 1.0.0"); - config.additionalProperties().put("appVersion", "1.0.0"); + generator.additionalProperties().put("appVersion", "1.0.0"); } if (StringUtils.isEmpty(info.getDescription())) { // set a default description if none if provided - config.additionalProperties().put("appDescription", + generator.additionalProperties().put("appDescription", "No description provided (generated by Openapi JSON Schema Generator https://github.com/openapi-json-schema-tools/openapi-json-schema-generator)"); - config.additionalProperties().put("appDescriptionWithNewLines", config.additionalProperties().get("appDescription")); - config.additionalProperties().put("unescapedAppDescription", "No description provided (generated by Openapi JSON Schema Generator https://github.com/openapi-json-schema-tools/openapi-json-schema-generator)"); + generator.additionalProperties().put("appDescriptionWithNewLines", generator.additionalProperties().get("appDescription")); + generator.additionalProperties().put("unescapedAppDescription", "No description provided (generated by Openapi JSON Schema Generator https://github.com/openapi-json-schema-tools/openapi-json-schema-generator)"); } else { - config.additionalProperties().put("appDescription", config.escapeText(info.getDescription())); - config.additionalProperties().put("appDescriptionWithNewLines", config.escapeTextWhileAllowingNewLines(info.getDescription())); - config.additionalProperties().put("unescapedAppDescription", info.getDescription()); + generator.additionalProperties().put("appDescription", generator.escapeText(info.getDescription())); + generator.additionalProperties().put("appDescriptionWithNewLines", generator.escapeTextWhileAllowingNewLines(info.getDescription())); + generator.additionalProperties().put("unescapedAppDescription", info.getDescription()); } if (info.getContact() != null) { Contact contact = info.getContact(); if (contact.getEmail() != null) { - config.additionalProperties().put("infoEmail", config.escapeText(contact.getEmail())); + generator.additionalProperties().put("infoEmail", generator.escapeText(contact.getEmail())); } if (contact.getName() != null) { - config.additionalProperties().put("infoName", config.escapeText(contact.getName())); + generator.additionalProperties().put("infoName", generator.escapeText(contact.getName())); } if (contact.getUrl() != null) { - config.additionalProperties().put("infoUrl", config.escapeText(contact.getUrl())); + generator.additionalProperties().put("infoUrl", generator.escapeText(contact.getUrl())); } } if (info.getLicense() != null) { License license = info.getLicense(); if (license.getName() != null) { - config.additionalProperties().put("licenseInfo", config.escapeText(license.getName())); + generator.additionalProperties().put("licenseInfo", generator.escapeText(license.getName())); } if (license.getUrl() != null) { - config.additionalProperties().put("licenseUrl", config.escapeText(license.getUrl())); + generator.additionalProperties().put("licenseUrl", generator.escapeText(license.getUrl())); } } if (info.getVersion() != null) { - config.additionalProperties().put("version", config.escapeText(info.getVersion())); + generator.additionalProperties().put("version", generator.escapeText(info.getVersion())); } else { LOGGER.error("Missing required field info version. Default version set to 1.0.0"); - config.additionalProperties().put("version", "1.0.0"); + generator.additionalProperties().put("version", "1.0.0"); } if (info.getTermsOfService() != null) { - config.additionalProperties().put("termsOfService", config.escapeText(info.getTermsOfService())); + generator.additionalProperties().put("termsOfService", generator.escapeText(info.getTermsOfService())); } } private void generateSchemaTests(List files, Map modelData, String modelName) throws IOException { // to generate model test files - for (Map.Entry configModelTestTemplateFilesEntry : config.modelTestTemplateFiles().entrySet()) { + for (Map.Entry configModelTestTemplateFilesEntry : generator.modelTestTemplateFiles().entrySet()) { String templateName = configModelTestTemplateFilesEntry.getKey(); String suffix = configModelTestTemplateFilesEntry.getValue(); - String filename = config.modelTestFileFolder() + File.separator + config.toModelTestFilename(modelName) + suffix; + String filename = generator.modelTestFileFolder() + File.separator + generator.toModelTestFilename(modelName) + suffix; if (generateModelTests) { // do not overwrite test file that already exists (regardless of config's skipOverwrite setting) @@ -357,11 +357,11 @@ private void generateSchemaTests(List files, Map modelData if (modelTestFile.exists()) { this.templateProcessor.skip(modelTestFile.toPath(), "Test files never overwrite an existing file of the same name."); } else { - File written = processTemplateToFile(modelData, templateName, filename, generateModelTests, CodegenConstants.MODEL_TESTS, config.modelTestFileFolder()); + File written = processTemplateToFile(modelData, templateName, filename, generateModelTests, CodegenConstants.MODEL_TESTS, generator.modelTestFileFolder()); if (written != null) { files.add(written); - if (config.isEnablePostProcessFile() && !dryRun) { - config.postProcessFile(written, "model-test"); + if (generator.isEnablePostProcessFile() && !dryRun) { + generator.postProcessFile(written, "model-test"); } } } @@ -379,10 +379,10 @@ private void generateSchemaDocumentation(List files, Map m private void generateSchema(List files, CodegenSchema schema, String jsonPath) { Map schemaData = new HashMap<>(); - schemaData.put("packageName", config.packageName()); + schemaData.put("packageName", generator.packageName()); schemaData.put("schema", schema); schemaData.put("identifierPieces", Collections.unmodifiableList(new ArrayList<>())); - schemaData.putAll(config.additionalProperties()); + schemaData.putAll(generator.additionalProperties()); generateXs(files, jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.SCHEMA, CodegenConstants.MODELS, schemaData, generateModels); } @@ -392,13 +392,13 @@ public String requestBodyFileFolder() { } private String packageFilename(List pathSegments) { - String prefix = config.getOutputDir() + File.separatorChar + config.packagePath() + File.separatorChar; + String prefix = generator.getOutputDir() + File.separatorChar + generator.packagePath() + File.separatorChar; String suffix = pathSegments.stream().collect(Collectors.joining(File.separator)); return prefix + suffix; } private String filenameFromRoot(List pathSegments) { - String prefix = config.getOutputDir() + File.separatorChar; + String prefix = generator.getOutputDir() + File.separatorChar; String suffix = pathSegments.stream().collect(Collectors.joining(File.separator)); return prefix + suffix; } @@ -408,8 +408,8 @@ private void generateFile(Map templateData, String templateName, File written = processTemplateToFile(templateData, templateName, outputFilename, shouldGenerate, skippedByOption); if (written != null) { files.add(written); - if (config.isEnablePostProcessFile() && !dryRun) { - config.postProcessFile(written, skippedByOption); + if (generator.isEnablePostProcessFile() && !dryRun) { + generator.postProcessFile(written, skippedByOption); } } } catch (IOException e) { @@ -426,8 +426,8 @@ private void generateFiles(List> processTemplateToFileInfos, boolea File written = processTemplateToFile(templateData, templateName, outputFilename, shouldGenerate, skippedByOption); if (written != null) { files.add(written); - if (config.isEnablePostProcessFile() && !dryRun) { - config.postProcessFile(written, skippedByOption); + if (generator.isEnablePostProcessFile() && !dryRun) { + generator.postProcessFile(written, skippedByOption); } } } catch (IOException e) { @@ -472,8 +472,8 @@ private void generatePathItem(List files, CodegenKey pathKey, CodegenPathI endpointInfo.put("pathItem", pathItem); endpointInfo.put("servers", servers); endpointInfo.put("security", security); - endpointInfo.put("packageName", config.packageName()); - endpointInfo.put("apiPackage", config.apiPackage()); + endpointInfo.put("packageName", generator.packageName()); + endpointInfo.put("apiPackage", generator.apiPackage()); endpointInfo.put("headerSize", "#"); endpointInfo.put("complexTypePrefix", "../../components/schema/"); endpointInfo.put("identifierPieces", Collections.unmodifiableList(new ArrayList<>())); @@ -521,17 +521,17 @@ private void generatePathItem(List files, CodegenKey pathKey, CodegenPathI } } - Set endpointTestTemplateFiles = config.pathEndpointTestTemplateFiles(); + Set endpointTestTemplateFiles = generator.pathEndpointTestTemplateFiles(); if (endpointTestTemplateFiles != null && !endpointTestTemplateFiles.isEmpty()) { String outputFilename = filenameFromRoot(Arrays.asList("test", "test_paths", "__init__.py")); generateFile(new HashMap<>(), "__init__test_paths.hbs", outputFilename, files, true, CodegenConstants.API_TESTS); - for (String templateFile: config.pathEndpointTestTemplateFiles()) { + for (String templateFile: generator.pathEndpointTestTemplateFiles()) { Map endpointTestMap = new HashMap<>(); endpointTestMap.put("operation", operation); endpointTestMap.put("httpMethod", httpMethod); endpointTestMap.put("path", pathKey); - endpointTestMap.put("packageName", config.packageName()); + endpointTestMap.put("packageName", generator.packageName()); outputFilename = filenameFromRoot(Arrays.asList("test", "test_paths", "test_" + pathKey.snakeCase, "test_" + httpMethod.original + ".py")); generateFile(endpointTestMap, templateFile, outputFilename, files, true, CodegenConstants.API_TESTS); } @@ -579,7 +579,7 @@ private void generateContent(List files, LinkedHashMap contentTypeTemplateInfo = config.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.CONTENT_TYPE); + Map contentTypeTemplateInfo = generator.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.CONTENT_TYPE); if (contentTypeTemplateInfo == null || contentTypeTemplateInfo.isEmpty()) { continue; } @@ -587,15 +587,15 @@ private void generateContent(List files, LinkedHashMap contentTypeEntry: contentTypeTemplateInfo.entrySet()) { String templateFile = contentTypeEntry.getKey(); String outputFile = contentTypeEntry.getValue(); - String outputFilepath = config.getFilepath(contentTypeJsonPath) + File.separatorChar + outputFile; + String outputFilepath = generator.getFilepath(contentTypeJsonPath) + File.separatorChar + outputFile; HashMap contentTypeTemplateData = new HashMap<>(); contentTypeTemplateData.put("schema", schema); try { File written = processTemplateToFile(contentTypeTemplateData, templateFile, outputFilepath, true, CodegenConstants.CONTENT); if (written != null) { files.add(written); - if (config.isEnablePostProcessFile() && !dryRun) { - config.postProcessFile(written, "content"); + if (generator.isEnablePostProcessFile() && !dryRun) { + generator.postProcessFile(written, "content"); } } } catch (IOException e) { @@ -605,20 +605,20 @@ private void generateContent(List files, LinkedHashMap contentTemplateInfo = config.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.CONTENT); + Map contentTemplateInfo = generator.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.CONTENT); if (schemaExists && contentTemplateInfo != null && !contentTemplateInfo.isEmpty()) { for (Map.Entry contentEntry: contentTemplateInfo.entrySet()) { String contentTemplateFile = contentEntry.getKey(); String outputFile = contentEntry.getValue(); - String outputFilepath = config.getFilepath(contentJsonPath) + File.separatorChar + outputFile; + String outputFilepath = generator.getFilepath(contentJsonPath) + File.separatorChar + outputFile; HashMap contentTemplateData = new HashMap<>(); contentTemplateData.put("content", content); try { File written = processTemplateToFile(contentTemplateData, contentTemplateFile, outputFilepath, true, CodegenConstants.CONTENT); if (written != null) { files.add(written); - if (config.isEnablePostProcessFile() && !dryRun) { - config.postProcessFile(written, "content"); + if (generator.isEnablePostProcessFile() && !dryRun) { + generator.postProcessFile(written, "content"); } } } catch (IOException e) { @@ -630,7 +630,7 @@ private void generateContent(List files, LinkedHashMap files, CodegenResponse response, String jsonPath) { Map templateData = new HashMap<>(); - templateData.put("packageName", config.packageName()); + templateData.put("packageName", generator.packageName()); templateData.put("response", response); generateXs(files, jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.RESPONSE, CodegenConstants.RESPONSES, templateData, true); @@ -664,12 +664,12 @@ private TreeMap generateResponses(List files) { String componentName = responseEntry.getKey(); ApiResponse apiResponse = responseEntry.getValue(); String sourceJsonPath = responsesJsonPath + "/" + componentName; - CodegenResponse response = config.fromResponse(apiResponse, sourceJsonPath); + CodegenResponse response = generator.fromResponse(apiResponse, sourceJsonPath); responses.put(componentName, response); generateResponse(files, response, sourceJsonPath); Map templateData = new HashMap<>(); - templateData.put("packageName", config.packageName()); + templateData.put("packageName", generator.packageName()); templateData.put("complexTypePrefix", "../../components/schema/"); templateData.put("headerSize", "#"); templateData.put("identifierPieces", Collections.unmodifiableList(new ArrayList<>())); @@ -682,7 +682,7 @@ private TreeMap generateResponses(List files) { private void generateRequestBody(List files, CodegenRequestBody requestBody, String jsonPath) { Map templateData = new HashMap<>(); - templateData.put("packageName", config.packageName()); + templateData.put("packageName", generator.packageName()); templateData.put("requestBody", requestBody); generateXs(files, jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.REQUEST_BODY, CodegenConstants.REQUEST_BODIES, templateData, true); @@ -695,7 +695,7 @@ private void generateRequestBody(List files, CodegenRequestBody requestBod private void generateSecurityScheme(List files, CodegenSecurityScheme securityScheme, String jsonPath) { Map templateData = new HashMap<>(); - templateData.put("packageName", config.packageName()); + templateData.put("packageName", generator.packageName()); templateData.put("securityScheme", securityScheme); generateXs(files, jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.SECURITY_SCHEME, CodegenConstants.SECURITY_SCHEMES, templateData, true); } @@ -713,14 +713,14 @@ private TreeMap generateSecuritySchemes(List templateData = new HashMap<>(); - templateData.put("packageName", config.packageName()); + templateData.put("packageName", generator.packageName()); templateData.put("securityScheme", securityScheme); templateData.put("headerSize", "#"); templateData.put("identifierPieces", Collections.unmodifiableList(new ArrayList<>())); @@ -746,14 +746,14 @@ private TreeMap generateRequestBodies(List fil String componentName = entry.getKey(); RequestBody specRequestBody = entry.getValue(); String sourceJsonPath = requestBodiesJsonPath + "/" + componentName; - CodegenRequestBody requestBody = config.fromRequestBody(specRequestBody, sourceJsonPath); + CodegenRequestBody requestBody = generator.fromRequestBody(specRequestBody, sourceJsonPath); requestBodies.put(componentName, requestBody); generateRequestBody(files, requestBody, sourceJsonPath); // doc generation Map templateData = new HashMap<>(); - templateData.put("packageName", config.packageName()); + templateData.put("packageName", generator.packageName()); templateData.put("requestBody", requestBody); templateData.put("headerSize", "#"); templateData.put("identifierPieces", Collections.unmodifiableList(new ArrayList<>())); @@ -768,7 +768,7 @@ private TreeMap generateRequestBodies(List fil private void generateParameter(List files, CodegenParameter parameter, String jsonPath) { Map templateData = new HashMap<>(); - templateData.put("packageName", config.packageName()); + templateData.put("packageName", generator.packageName()); templateData.put("parameter", parameter); generateXs(files, jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.PARAMETER, CodegenConstants.PARAMETERS, templateData, true); @@ -797,12 +797,12 @@ private TreeMap generateParameters(List files) { String componentName = entry.getKey(); Parameter specParameter = entry.getValue(); String parameterJsonPath = parametersJsonPath + "/" + componentName; - CodegenParameter parameter = config.fromParameter(specParameter, parameterJsonPath); + CodegenParameter parameter = generator.fromParameter(specParameter, parameterJsonPath); parameters.put(componentName, parameter); generateParameter(files, parameter, parameterJsonPath); Map templateData = new HashMap<>(); - templateData.put("packageName", config.packageName()); + templateData.put("packageName", generator.packageName()); templateData.put("parameter", parameter); templateData.put("headerSize", "#"); templateData.put("identifierPieces", Collections.unmodifiableList(new ArrayList<>())); @@ -815,7 +815,7 @@ private TreeMap generateParameters(List files) { private void generateHeader(List files, CodegenHeader header, String jsonPath) { Map headertTemplateData = new HashMap<>(); - headertTemplateData.put("packageName", config.packageName()); + headertTemplateData.put("packageName", generator.packageName()); headertTemplateData.put("header", header); // header @@ -834,18 +834,18 @@ private void generateHeader(List files, CodegenHeader header, String jsonP } private void generateXDocs(List files, String jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE type, String skippedByOption, Map templateInfo, boolean shouldGenerate) { - Map templateFileToOutputFile = config.jsonPathDocTemplateFiles().get(type); + Map templateFileToOutputFile = generator.jsonPathDocTemplateFiles().get(type); if (templateFileToOutputFile == null || templateFileToOutputFile.isEmpty()) { return; } for (Map.Entry entry : templateFileToOutputFile.entrySet()) { String templateFile = entry.getKey(); String suffix = entry.getValue(); - String filename = config.getDocsFilepath(jsonPath) + suffix; + String filename = generator.getDocsFilepath(jsonPath) + suffix; HashMap templateData = new HashMap<>(); - templateData.put("packageName", config.packageName()); - templateData.put("modelPackage", config.modelPackage()); + templateData.put("packageName", generator.packageName()); + templateData.put("modelPackage", generator.modelPackage()); if (templateInfo != null && !templateInfo.isEmpty()) { templateData.putAll(templateInfo); } @@ -853,8 +853,8 @@ private void generateXDocs(List files, String jsonPath, CodegenConstants.J File written = processTemplateToFile(templateData, templateFile, filename, shouldGenerate, skippedByOption); if (written != null) { files.add(written); - if (config.isEnablePostProcessFile() && !dryRun) { - config.postProcessFile(written, skippedByOption); + if (generator.isEnablePostProcessFile() && !dryRun) { + generator.postProcessFile(written, skippedByOption); } } } catch (Exception e) { @@ -864,18 +864,18 @@ private void generateXDocs(List files, String jsonPath, CodegenConstants.J } private void generateXs(List files, String jsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE type, String skippedByOption, Map templateInfo, boolean shouldGenerate) { - Map templateFileToOutputFile = config.jsonPathTemplateFiles().get(type); + Map templateFileToOutputFile = generator.jsonPathTemplateFiles().get(type); if (templateFileToOutputFile == null || templateFileToOutputFile.isEmpty()) { return; } for (Map.Entry entry : templateFileToOutputFile.entrySet()) { String templateFile = entry.getKey(); String suffix = entry.getValue(); - String filename = config.getFilepath(jsonPath) + suffix; + String filename = generator.getFilepath(jsonPath) + suffix; HashMap templateData = new HashMap<>(); - templateData.put("packageName", config.packageName()); - templateData.put("modelPackage", config.modelPackage()); + templateData.put("packageName", generator.packageName()); + templateData.put("modelPackage", generator.modelPackage()); if (templateInfo != null && !templateInfo.isEmpty()) { templateData.putAll(templateInfo); } @@ -883,8 +883,8 @@ private void generateXs(List files, String jsonPath, CodegenConstants.JSON File written = processTemplateToFile(templateData, templateFile, filename, shouldGenerate, skippedByOption); if (written != null) { files.add(written); - if (config.isEnablePostProcessFile() && !dryRun) { - config.postProcessFile(written, skippedByOption); + if (generator.isEnablePostProcessFile() && !dryRun) { + generator.postProcessFile(written, skippedByOption); } } } catch (Exception e) { @@ -906,14 +906,14 @@ private TreeMap generateHeaders(List files) { String componentName = entry.getKey(); Header specHeader = entry.getValue(); String sourceJsonPath = headersJsonPath + "/" + componentName; - CodegenHeader header = config.fromHeader(specHeader, sourceJsonPath); + CodegenHeader header = generator.fromHeader(specHeader, sourceJsonPath); headers.put(componentName, header); generateHeader(files, header, sourceJsonPath); // documentation Map templateData = new HashMap<>(); - templateData.put("packageName", config.packageName()); + templateData.put("packageName", generator.packageName()); templateData.put("header", header); templateData.put("headerSize", "#"); templateData.put("complexTypePrefix", "../../components/schema/"); @@ -964,7 +964,7 @@ protected TreeMap generateSchemas(List files) { Schema specSchema = specSchemas.get(componentName); String sourceJsonPath = "#/components/schemas/" + componentName; - CodegenSchema codegenSchema = config.fromSchema(specSchema, sourceJsonPath, sourceJsonPath); + CodegenSchema codegenSchema = generator.fromSchema(specSchema, sourceJsonPath, sourceJsonPath); schemas.put(componentName, codegenSchema); } catch (Exception e) { @@ -985,9 +985,9 @@ protected TreeMap generateSchemas(List files) { // to generate model test files Map schemaData = new HashMap<>(); - schemaData.put("packageName", config.packageName()); + schemaData.put("packageName", generator.packageName()); schemaData.put("schema", schema); - schemaData.putAll(config.additionalProperties()); + schemaData.putAll(generator.additionalProperties()); schemaData.put("complexTypePrefix", ""); if (generateModelTests) { generateSchemaTests(files, schemaData, componentName); @@ -1025,23 +1025,23 @@ void generateApis(List files, TreeMap paths) allowListedTags = new HashSet<>(Arrays.asList(apiNames.split(","))); } String jsonPath = "#/apis"; - Map apiPathsTemplates = config.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_PATHS); + Map apiPathsTemplates = generator.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_PATHS); if (apiPathsTemplates != null) { for (Map.Entry apiPathEntry: apiPathsTemplates.entrySet()) { String templateFile = apiPathEntry.getKey(); String apiFileName = apiPathEntry.getValue(); String thisJsonPath = jsonPath + "/paths"; Map apiData = new HashMap<>(); - String packageName = config.packageName(); + String packageName = generator.packageName(); apiData.put("packageName", packageName); - String outputFile = config.getFilepath(thisJsonPath) + apiFileName; + String outputFile = generator.getFilepath(thisJsonPath) + apiFileName; generateFile(apiData, templateFile, outputFile, files, true, CodegenConstants.APIS); } } HashMap>> tagToPathToOperations = new HashMap<>(); HashMap>> tagToOperationIdToPathToOperation = new HashMap<>(); - Map apiPathTemplates = config.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_PATH); + Map apiPathTemplates = generator.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_PATH); for(Map.Entry entry: paths.entrySet()) { CodegenKey path = entry.getKey(); CodegenPathItem pathItem = entry.getValue(); @@ -1051,12 +1051,12 @@ void generateApis(List files, TreeMap paths) String templateFile = apiPathEntry.getKey(); String suffix = apiPathEntry.getValue(); Map apiData = new HashMap<>(); - String packageName = config.packageName(); + String packageName = generator.packageName(); apiData.put("packageName", packageName); apiData.put("path", path); apiData.put("pathItem", pathItem); String thisJsonPath = jsonPath + "/paths/" + ModelUtils.encodeSlashes(path.original); - String outputFile = config.getFilepath(thisJsonPath) + suffix; + String outputFile = generator.getFilepath(thisJsonPath) + suffix; generateFile(apiData, templateFile, outputFile, files, true, CodegenConstants.APIS); } } @@ -1087,49 +1087,49 @@ void generateApis(List files, TreeMap paths) } // files in the apiPackage root folder - Map apiRootTemplates = config.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_ROOT_FOLDER); + Map apiRootTemplates = generator.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_ROOT_FOLDER); if (apiRootTemplates != null) { for (Map.Entry entry: apiRootTemplates.entrySet()) { String templateFile = entry.getKey(); String fileName = entry.getValue(); Map apiData = new HashMap<>(); - String packageName = config.packageName(); + String packageName = generator.packageName(); apiData.put("packageName", packageName); apiData.put("apiClassname", "Api"); apiData.put("tagToPathToOperations", tagToPathToOperations); apiData.put("paths", paths); - String outputFile = config.getFilepath(jsonPath) + fileName; + String outputFile = generator.getFilepath(jsonPath) + fileName; generateFile(apiData, templateFile, outputFile, files, true, CodegenConstants.APIS); } } - Map apiTagsTemplates = config.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_TAGS); + Map apiTagsTemplates = generator.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_TAGS); if (apiTagsTemplates != null) { for (Map.Entry apiPathEntry: apiTagsTemplates.entrySet()) { String templateFile = apiPathEntry.getKey(); String fileName = apiPathEntry.getValue(); Map apiData = new HashMap<>(); - String packageName = config.packageName(); + String packageName = generator.packageName(); apiData.put("packageName", packageName); String thisJsonPath = jsonPath + "/tags"; - String outputFile = config.getFilepath(thisJsonPath) + fileName; + String outputFile = generator.getFilepath(thisJsonPath) + fileName; generateFile(apiData, templateFile, outputFile, files, true, CodegenConstants.APIS); } } - Map apiTagTemplates = config.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_TAG); - Map apiDocTagTemplates = config.jsonPathDocTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_TAG); + Map apiTagTemplates = generator.jsonPathTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_TAG); + Map apiDocTagTemplates = generator.jsonPathDocTemplateFiles().get(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_TAG); for(Map.Entry>> entry: tagToPathToOperations.entrySet()) { CodegenTag tag = entry.getKey(); HashMap> pathToOperations = entry.getValue(); Map apiData = new HashMap<>(); - String packageName = config.packageName(); + String packageName = generator.packageName(); apiData.put("packageName", packageName); apiData.put("tag", tag); apiData.put("pathToOperations", pathToOperations); - apiData.put("apiPackage", config.apiPackage()); + apiData.put("apiPackage", generator.apiPackage()); class OperationIdComparator implements Comparator{ @Override @@ -1147,7 +1147,7 @@ public int compare(CodegenKey e1, CodegenKey e2) { String templateFile = apiPathEntry.getKey(); String fileName = apiPathEntry.getValue(); String thisJsonPath = jsonPath + "/tags/" + tag.name; - String outputFile = config.getFilepath(thisJsonPath) + fileName; + String outputFile = generator.getFilepath(thisJsonPath) + fileName; generateFile(apiData, templateFile, outputFile, files, true, CodegenConstants.APIS); } } @@ -1157,7 +1157,7 @@ public int compare(CodegenKey e1, CodegenKey e2) { String templateFile = apiPathEntry.getKey(); String fileName = apiPathEntry.getValue(); String thisJsonPath = jsonPath + "/tags/" + tag.name; - String outputFile = config.getDocsFilepath(thisJsonPath) + fileName; + String outputFile = generator.getDocsFilepath(thisJsonPath) + fileName; generateFile(apiData, templateFile, outputFile, files, true, CodegenConstants.APIS); } } @@ -1176,9 +1176,9 @@ private void generateSupportingFiles(List files, Map bundl supportingFilesToGenerate = new HashSet<>(Arrays.asList(supportingFiles.split(","))); } - for (SupportingFile support : config.supportingFiles()) { + for (SupportingFile support : generator.supportingFiles()) { try { - String outputFolder = config.outputFolder(); + String outputFolder = generator.outputFolder(); if (StringUtils.isNotEmpty(support.getFolder())) { outputFolder += File.separator + support.getFolder(); } @@ -1200,8 +1200,8 @@ private void generateSupportingFiles(List files, Map bundl File written = processTemplateToFile(bundle, support.getTemplateFile(), outputFilename, shouldGenerate, CodegenConstants.SUPPORTING_FILES); if (written != null) { files.add(written); - if (config.isEnablePostProcessFile() && !dryRun) { - config.postProcessFile(written, "supporting-file"); + if (generator.isEnablePostProcessFile() && !dryRun) { + generator.postProcessFile(written, "supporting-file"); } } } catch (Exception e) { @@ -1212,7 +1212,7 @@ private void generateSupportingFiles(List files, Map bundl // Consider .openapi-generator-ignore a supporting file // Output .openapi-generator-ignore if it doesn't exist and wasn't explicitly created by a generator final String openapiGeneratorIgnore = ".openapi-generator-ignore"; - String ignoreFileNameTarget = config.outputFolder() + File.separator + openapiGeneratorIgnore; + String ignoreFileNameTarget = generator.outputFolder() + File.separator + openapiGeneratorIgnore; File ignoreFile = new File(ignoreFileNameTarget); if (generateMetadata) { try { @@ -1223,8 +1223,8 @@ private void generateSupportingFiles(List files, Map bundl File written = processTemplateToFile(bundle, openapiGeneratorIgnore, ignoreFileNameTarget, shouldGenerate, CodegenConstants.SUPPORTING_FILES); if (written != null) { files.add(written); - if (config.isEnablePostProcessFile() && !dryRun) { - config.postProcessFile(written, "openapi-generator-ignore"); + if (generator.isEnablePostProcessFile() && !dryRun) { + generator.postProcessFile(written, "openapi-generator-ignore"); } } } catch (Exception e) { @@ -1248,10 +1248,10 @@ Map buildSupportFileBundle( TreeMap paths, List> security) { - Map bundle = new HashMap<>(config.additionalProperties()); - bundle.put("apiPackage", config.apiPackage()); + Map bundle = new HashMap<>(generator.additionalProperties()); + bundle.put("apiPackage", generator.apiPackage()); - URL url = URLPathUtils.getServerURL(openAPI, config.serverVariableOverrides()); + URL url = URLPathUtils.getServerURL(openAPI, generator.serverVariableOverrides()); boolean hasServers = false; if (servers != null) { hasServers = true; @@ -1276,7 +1276,7 @@ Map buildSupportFileBundle( } bundle.put("openAPI", openAPI); - bundle.put("scheme", URLPathUtils.getScheme(url, config)); + bundle.put("scheme", URLPathUtils.getScheme(url, generator)); bundle.put("contextPath", contextPath); bundle.put("requestBodies", requestBodies); bundle.put("responses", responses); @@ -1288,9 +1288,9 @@ Map buildSupportFileBundle( bundle.put("hasServers", hasServers); // also true if there are no root servers but there are pathItem/operation servers bundle.put("paths", paths); bundle.put("security", security); - bundle.put("apiFolder", config.apiPackage().replace('.', File.separatorChar)); - bundle.put("modelPackage", config.modelPackage()); - bundle.put("library", config.getLibrary()); + bundle.put("apiFolder", generator.apiPackage().replace('.', File.separatorChar)); + bundle.put("modelPackage", generator.modelPackage()); + bundle.put("library", generator.getLibrary()); if (securitySchemes == null) { bundle.put("hasHttpSignatureSecurityScheme", false); } else { @@ -1300,14 +1300,14 @@ Map buildSupportFileBundle( } } } - bundle.put("generatorLanguageVersion", config.generatorLanguageVersion()); + bundle.put("generatorLanguageVersion", generator.generatorLanguageVersion()); // todo verify support and operation bundles have access to the common variables if (openAPI.getExternalDocs() != null) { bundle.put("externalDocs", openAPI.getExternalDocs()); } - config.postProcessSupportingFileData(bundle); + generator.postProcessSupportingFileData(bundle); if (GlobalSettings.getProperty("debugSupportingFiles") != null) { LOGGER.info("############ Supporting file info ############"); @@ -1325,7 +1325,7 @@ private void generateServers(List files, List servers, Stri int i = 0; for (CodegenServer server: servers) { Map templateData = new HashMap<>(); - templateData.put("packageName", config.packageName()); + templateData.put("packageName", generator.packageName()); templateData.put("server", server); String serverJsonPath = jsonPath + "/" + i; generateXs(files, serverJsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.SERVER, CodegenConstants.SERVERS, templateData, true); @@ -1349,7 +1349,7 @@ private TreeMap getTags() { TreeMap tags = new TreeMap<>(); for(Tag specTag: specTags) { String name = specTag.getName(); - CodegenTag tag = config.fromTag(name, specTag.getDescription()); + CodegenTag tag = generator.fromTag(name, specTag.getDescription()); tags.put(name, tag); } return tags; @@ -1368,7 +1368,7 @@ private void generateSecurity(List files, List securityRequirementObject: security) { Map templateData = new HashMap<>(); - templateData.put("packageName", config.packageName()); + templateData.put("packageName", generator.packageName()); templateData.put("securityRequirementObject", securityRequirementObject); String serverJsonPath = jsonPath + "/" + i; generateXs(files, serverJsonPath, CodegenConstants.JSON_PATH_LOCATION_TYPE.SECURITY, CodegenConstants.SECURITY, templateData, true); @@ -1382,20 +1382,20 @@ public List generate() { throw new RuntimeException("Issues with the OpenAPI input. Possible causes: invalid/missing spec, malformed JSON/YAML files, etc."); } - if (config == null) { + if (generator == null) { throw new RuntimeException("missing config!"); } - if (config.getGeneratorMetadata() == null) { - LOGGER.warn("Generator '{}' is missing generator metadata!", config.getName()); + if (generator.getGeneratorMetadata() == null) { + LOGGER.warn("Generator '{}' is missing generator metadata!", generator.getName()); } else { - GeneratorMetadata generatorMetadata = config.getGeneratorMetadata(); + GeneratorMetadata generatorMetadata = generator.getGeneratorMetadata(); if (StringUtils.isNotEmpty(generatorMetadata.getGenerationMessage())) { LOGGER.info(generatorMetadata.getGenerationMessage()); } Stability stability = generatorMetadata.getStability(); - String stabilityMessage = String.format(Locale.ROOT, "Generator '%s' is considered %s.", config.getName(), stability.value()); + String stabilityMessage = String.format(Locale.ROOT, "Generator '%s' is considered %s.", generator.getName(), stability.value()); if (stability == Stability.DEPRECATED) { LOGGER.warn(stabilityMessage); } else { @@ -1406,7 +1406,7 @@ public List generate() { configureGeneratorProperties(); configureOpenAPIInfo(); - config.processOpenAPI(openAPI); + generator.processOpenAPI(openAPI); processUserDefinedTemplates(); @@ -1426,7 +1426,7 @@ public List generate() { // components.securitySchemes TreeMap securitySchemes = generateSecuritySchemes(files); // security - List> security = config.fromSecurity(openAPI.getSecurity(), "#/security"); + List> security = generator.fromSecurity(openAPI.getSecurity(), "#/security"); generateSecurity(files, security, "#/security"); boolean schemasExist = (schemas != null && !schemas.isEmpty()); @@ -1440,9 +1440,9 @@ public List generate() { // servers String serversJsonPath = "#/servers"; - List servers = config.fromServers(openAPI.getServers(), serversJsonPath); + List servers = generator.fromServers(openAPI.getServers(), serversJsonPath); // paths - TreeMap paths = config.fromPaths(openAPI.getPaths()); + TreeMap paths = generator.fromPaths(openAPI.getPaths()); generatePaths(files, paths, servers, security); generateServers(files, servers, serversJsonPath); // apis @@ -1497,7 +1497,7 @@ public List generate() { } // post-process - config.postProcess(); + generator.postProcess(); // reset GlobalSettings, so that the running thread can be reused for another generator-run GlobalSettings.reset(); @@ -1508,7 +1508,7 @@ public List generate() { private void processUserDefinedTemplates() { // TODO: initial behavior is "merge" user defined with built-in templates. consider offering user a "replace" option. if (userDefinedTemplates != null && !userDefinedTemplates.isEmpty()) { - Map supportingFilesMap = config.supportingFiles().stream() + Map supportingFilesMap = generator.supportingFiles().stream() .collect(Collectors.toMap(TemplateDefinition::getTemplateFile, Function.identity(), (oldValue, newValue) -> oldValue)); // TemplateFileType.SupportingFiles @@ -1522,13 +1522,13 @@ private void processUserDefinedTemplates() { ); if (supportingFilesMap.containsKey(userDefinedTemplate.getTemplateFile())) { SupportingFile f = supportingFilesMap.get(userDefinedTemplate.getTemplateFile()); - config.supportingFiles().remove(f); + generator.supportingFiles().remove(f); if (!f.isCanOverwrite()) { newFile.doNotOverwrite(); } } - config.supportingFiles().add(newFile); + generator.supportingFiles().add(newFile); }); // Others, excluding TemplateFileType.SupportingFiles @@ -1550,26 +1550,26 @@ private void processUserDefinedTemplates() { switch (userDefinedTemplate.getTemplateType()) { case API: - Map apiTemplateFiles = config.jsonPathTemplateFiles().getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_ROOT_FOLDER, new HashMap<>()); + Map apiTemplateFiles = generator.jsonPathTemplateFiles().getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_ROOT_FOLDER, new HashMap<>()); apiTemplateFiles.put(templateFile, templateExt); break; case Model: - Map schemaTemplateToSuffix = config.jsonPathTemplateFiles().getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.SCHEMA, new HashMap<>()); + Map schemaTemplateToSuffix = generator.jsonPathTemplateFiles().getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.SCHEMA, new HashMap<>()); schemaTemplateToSuffix.put(templateFile, templateExt); break; case APIDocs: - Map apiDocTemplateToSuffix = config.jsonPathDocTemplateFiles().getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_ROOT_FOLDER, new HashMap<>()); + Map apiDocTemplateToSuffix = generator.jsonPathDocTemplateFiles().getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.API_ROOT_FOLDER, new HashMap<>()); apiDocTemplateToSuffix.put(templateFile, templateExt); break; case ModelDocs: - Map schemaDocTemplateToSuffix = config.jsonPathDocTemplateFiles().getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.SCHEMA, new HashMap<>()); + Map schemaDocTemplateToSuffix = generator.jsonPathDocTemplateFiles().getOrDefault(CodegenConstants.JSON_PATH_LOCATION_TYPE.SCHEMA, new HashMap<>()); schemaDocTemplateToSuffix.put(templateFile, templateExt); break; case APITests: - config.apiTestTemplateFiles().put(templateFile, templateExt); + generator.apiTestTemplateFiles().put(templateFile, templateExt); break; case ModelTests: - config.modelTestTemplateFiles().put(templateFile, templateExt); + generator.modelTestTemplateFiles().put(templateFile, templateExt); break; case SupportingFiles: // excluded by filter @@ -1580,7 +1580,7 @@ private void processUserDefinedTemplates() { } protected File processTemplateToFile(Map templateData, String templateName, String outputFilename, boolean shouldGenerate, String skippedByOption) throws IOException { - return processTemplateToFile(templateData, templateName, outputFilename, shouldGenerate, skippedByOption, this.config.getOutputDir()); + return processTemplateToFile(templateData, templateName, outputFilename, shouldGenerate, skippedByOption, this.generator.getOutputDir()); } private File processTemplateToFile(Map templateData, String templateName, String outputFilename, boolean shouldGenerate, String skippedByOption, String intendedOutputDir) throws IOException { @@ -1614,15 +1614,15 @@ private static String generateParameterId(Parameter parameter) { * @param files The list tracking generated files */ private void generateVersionMetadata(List files) { - String versionMetadata = config.outputFolder() + File.separator + METADATA_DIR + File.separator + config.getVersionMetadataFilename(); + String versionMetadata = generator.outputFolder() + File.separator + METADATA_DIR + File.separator + generator.getVersionMetadataFilename(); if (generateMetadata) { File versionMetadataFile = new File(versionMetadata); try { File written = this.templateProcessor.writeToFile(versionMetadata, ImplementationVersion.read().getBytes(StandardCharsets.UTF_8)); if (written != null) { files.add(versionMetadataFile); - if (config.isEnablePostProcessFile() && !dryRun) { - config.postProcessFile(written, "openapi-generator-version"); + if (generator.isEnablePostProcessFile() && !dryRun) { + generator.postProcessFile(written, "openapi-generator-version"); } } } catch (IOException e) { @@ -1649,7 +1649,7 @@ private void generateFilesMetadata(List files) { if (generateMetadata) { try { StringBuilder sb = new StringBuilder(); - Path outDir = absPath(new File(this.config.getOutputDir())); + Path outDir = absPath(new File(this.generator.getOutputDir())); List filesToSort = new ArrayList<>(); @@ -1682,7 +1682,7 @@ private void generateFilesMetadata(List files) { } }); - String targetFile = config.outputFolder() + File.separator + METADATA_DIR + File.separator + config.getFilesMetadataFilename(); + String targetFile = generator.outputFolder() + File.separator + METADATA_DIR + File.separator + generator.getFilesMetadataFilename(); File filesFile = this.templateProcessor.writeToFile(targetFile, sb.toString().getBytes(StandardCharsets.UTF_8)); if (filesFile != null) { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/ClientOptInput.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/ClientOptInput.java index d86fd593e44..a6c1d29ac90 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/ClientOptInput.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/ClientOptInput.java @@ -20,13 +20,13 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.parser.core.models.AuthorizationValue; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.generators.Generator; import org.openapijsonschematools.codegen.templating.TemplateDefinition; import java.util.List; public class ClientOptInput { - private CodegenConfig config; + private Generator config; private OpenAPI openAPI; private List auths; private List userDefinedTemplates; @@ -36,8 +36,8 @@ public ClientOptInput openAPI(OpenAPI openAPI) { return this; } - public ClientOptInput config(CodegenConfig codegenConfig) { - this.setConfig(codegenConfig); + public ClientOptInput config(Generator generator) { + this.setConfig(generator); return this; } @@ -68,7 +68,7 @@ public List getAuthorizationValues() { } @Deprecated - public CodegenConfig getConfig() { + public Generator getConfig() { return config; } @@ -80,11 +80,11 @@ public List getUserDefinedTemplates() { /** * Sets the generator/config instance * - * @deprecated use {@link #config(CodegenConfig)} instead + * @deprecated use {@link #config(Generator)} instead * @param config codegen config */ @Deprecated - public void setConfig(CodegenConfig config) { + public void setConfig(Generator config) { this.config = config; // TODO: ClientOptInputs needs to be retired if (this.openAPI != null) { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConfigLoader.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorLoader.java similarity index 71% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConfigLoader.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorLoader.java index fc30c779667..bcce01d70fa 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConfigLoader.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorLoader.java @@ -17,23 +17,25 @@ package org.openapijsonschematools.codegen.codegenerator; +import org.openapijsonschematools.codegen.generators.Generator; + import java.util.ArrayList; import java.util.List; import java.util.ServiceLoader; -public class CodegenConfigLoader { +public class GeneratorLoader { /** * Tries to load config class with SPI first, then with class name directly from classpath * * @param name name of config, or full qualified class name in classpath * @return config class */ - public static CodegenConfig forName(String name) { - ServiceLoader loader = ServiceLoader.load(CodegenConfig.class, CodegenConfig.class.getClassLoader()); + public static Generator forName(String name) { + ServiceLoader loader = ServiceLoader.load(Generator.class, Generator.class.getClassLoader()); StringBuilder availableConfigs = new StringBuilder(); - for (CodegenConfig config : loader) { + for (Generator config : loader) { if (config.getName().equals(name)) { return config; } @@ -43,16 +45,16 @@ public static CodegenConfig forName(String name) { // else try to load directly try { - return (CodegenConfig) Class.forName(name).getDeclaredConstructor().newInstance(); + return (Generator) Class.forName(name).getDeclaredConstructor().newInstance(); } catch (Exception e) { throw new GeneratorNotFoundException("Can't load config class with name '".concat(name) + "'\nAvailable:\n" + availableConfigs, e); } } - public static List getAll() { - ServiceLoader loader = ServiceLoader.load(CodegenConfig.class, CodegenConfig.class.getClassLoader()); - List output = new ArrayList(); - for (CodegenConfig aLoader : loader) { + public static List getAll() { + ServiceLoader loader = ServiceLoader.load(Generator.class, Generator.class.getClassLoader()); + List output = new ArrayList(); + for (Generator aLoader : loader) { output.add(aLoader); } return output; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/Generator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorRunner.java similarity index 91% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/Generator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorRunner.java index 2f78693ceed..6ce87fb9b2c 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/Generator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorRunner.java @@ -22,8 +22,8 @@ import java.io.File; import java.util.List; -public interface Generator { - Generator opts(ClientOptInput opts); +public interface GeneratorRunner { + GeneratorRunner opts(ClientOptInput opts); String requestBodyFileFolder(); diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenType.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorType.java similarity index 85% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenType.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorType.java index 4e59bba6d81..364d6745277 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenType.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorType.java @@ -24,19 +24,19 @@ import java.util.Locale; import java.util.Map; -public enum CodegenType { +public enum GeneratorType { CLIENT, SERVER, DOCUMENTATION, SCHEMA, CONFIG, OTHER; - private static Map names = new HashMap(); + private static Map names = new HashMap(); @JsonCreator - public static CodegenType forValue(String value) { + public static GeneratorType forValue(String value) { return names.get(value.toLowerCase(Locale.ROOT)); } @JsonValue public String toValue() { - for (Map.Entry entry : names.entrySet()) { + for (Map.Entry entry : names.entrySet()) { if (entry.getValue() == this) { return entry.getKey(); } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java index bcbc4a59496..d9714c746e3 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java @@ -31,8 +31,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.openapijsonschematools.codegen.cli.ClientOptInput; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfigLoader; +import org.openapijsonschematools.codegen.generators.Generator; +import org.openapijsonschematools.codegen.codegenerator.GeneratorLoader; import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.templating.TemplatingEngineLoader; import org.openapijsonschematools.codegen.templating.TemplateDefinition; @@ -529,7 +529,7 @@ public Context toContext() { Validate.notEmpty(inputSpec, "input spec must be specified"); GeneratorSettings generatorSettings = generatorSettingsBuilder.build(); - CodegenConfig config = CodegenConfigLoader.forName(generatorSettings.getGeneratorName()); + Generator config = GeneratorLoader.forName(generatorSettings.getGeneratorName()); if (isEmpty(templatingEngineName)) { // if templatingEngineName is empty check the config for a default String defaultTemplatingEngine = config.defaultTemplatingEngine(); @@ -632,13 +632,13 @@ public ClientOptInput toClientOptInput() { // We load the config via generatorSettings.getGeneratorName() because this is guaranteed to be set // regardless of entrypoint (CLI sets properties on this type, config deserialization sets on generatorSettings). - CodegenConfig config = CodegenConfigLoader.forName(generatorSettings.getGeneratorName()); + Generator config = GeneratorLoader.forName(generatorSettings.getGeneratorName()); if (isNotEmpty(generatorSettings.getLibrary())) { config.setLibrary(generatorSettings.getLibrary()); } - // TODO: Work toward CodegenConfig having a "WorkflowSettings" property, or better a "Workflow" object which itself has a "WorkflowSettings" property. + // TODO: Work toward Generator having a "WorkflowSettings" property, or better a "Workflow" object which itself has a "WorkflowSettings" property. config.setInputSpec(workflowSettings.getInputSpec()); config.setOutputDir(workflowSettings.getOutputDir()); config.setSkipOverwrite(workflowSettings.isSkipOverwrite()); @@ -652,7 +652,7 @@ public ClientOptInput toClientOptInput() { TemplatingEngineAdapter templatingEngine = TemplatingEngineLoader.byIdentifier(workflowSettings.getTemplatingEngineName()); config.setTemplatingEngine(templatingEngine); - // TODO: Work toward CodegenConfig having a "GeneratorSettings" property. + // TODO: Work toward Generator having a "GeneratorSettings" property. config.instantiationTypes().putAll(generatorSettings.getInstantiationTypes()); config.typeMapping().putAll(generatorSettings.getTypeMappings()); config.schemaMapping().putAll(generatorSettings.getSchemaMappings()); diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractJavaCodegen.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java index 4548d466a31..061b14d3fc1 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages; +package org.openapijsonschematools.codegen.generators; import com.google.common.base.Strings; import com.google.common.collect.Sets; @@ -28,14 +28,12 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.meta.features.SchemaFeature; import org.openapijsonschematools.codegen.model.CodegenPatternInfo; import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.DefaultCodegen; import org.openapijsonschematools.codegen.codegenerator.VendorExtension; -import org.openapijsonschematools.codegen.languages.features.DocumentationProviderFeatures; +import org.openapijsonschematools.codegen.generators.features.DocumentationProviderFeatures; import org.openapijsonschematools.codegen.meta.features.ClientModificationFeature; import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; import org.openapijsonschematools.codegen.meta.features.SecurityFeature; @@ -51,10 +49,10 @@ import static org.openapijsonschematools.codegen.utils.StringUtils.*; -public abstract class AbstractJavaCodegen extends DefaultCodegen implements CodegenConfig, +public abstract class AbstractJavaGenerator extends DefaultGenerator implements Generator, DocumentationProviderFeatures { - private final Logger LOGGER = LoggerFactory.getLogger(AbstractJavaCodegen.class); + private final Logger LOGGER = LoggerFactory.getLogger(AbstractJavaGenerator.class); private static final String ARTIFACT_VERSION_DEFAULT_VALUE = "1.0.0"; public static final String FULL_JAVA_UTIL = "fullJavaUtil"; @@ -126,7 +124,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code private Map schemaKeyToModelNameCache = new HashMap<>(); - public AbstractJavaCodegen() { + public AbstractJavaGenerator() { super(); modifyFeatureSet(features -> features @@ -817,7 +815,7 @@ public String toModelFilename(String name, String jsonPath) { /** * Return the example value of the parameter. Overrides the * getParameterExampleValue(Parameter) method in - * DefaultCodegen to always call setParameterExampleValue(CodegenParameter) + * DefaultGenerator to always call setParameterExampleValue(CodegenParameter) * in this class, which adds single quotes around strings from the * x-example property. * diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractJavaJAXRSServerCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractJavaJAXRSServerCodegen.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java index 4fdfb79dc62..50dbda64b66 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractJavaJAXRSServerCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages; +package org.openapijsonschematools.codegen.generators; import com.google.common.annotations.VisibleForTesting; import io.swagger.v3.oas.models.OpenAPI; @@ -24,9 +24,9 @@ import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; +import org.openapijsonschematools.codegen.codegenerator.GeneratorType; import org.openapijsonschematools.codegen.model.CodegenOperation; -import org.openapijsonschematools.codegen.codegenerator.CodegenType; -import org.openapijsonschematools.codegen.languages.features.BeanValidationFeatures; +import org.openapijsonschematools.codegen.generators.features.BeanValidationFeatures; import org.openapijsonschematools.codegen.utils.URLPathUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +34,7 @@ import java.net.URL; import java.util.*; -public abstract class AbstractJavaJAXRSServerCodegen extends AbstractJavaCodegen implements BeanValidationFeatures { +public abstract class AbstractJavaJAXRSServerGenerator extends AbstractJavaGenerator implements BeanValidationFeatures { public static final String SERVER_PORT = "serverPort"; public static final String USE_TAGS = "useTags"; @@ -51,9 +51,9 @@ public abstract class AbstractJavaJAXRSServerCodegen extends AbstractJavaCodegen protected boolean useBeanValidation = true; protected boolean useTags = false; - private final Logger LOGGER = LoggerFactory.getLogger(AbstractJavaJAXRSServerCodegen.class); + private final Logger LOGGER = LoggerFactory.getLogger(AbstractJavaJAXRSServerGenerator.class); - public AbstractJavaJAXRSServerCodegen() { + public AbstractJavaJAXRSServerGenerator() { super(); sourceFolder = "src/gen/java"; @@ -88,8 +88,8 @@ public AbstractJavaJAXRSServerCodegen() { // =============== @Override - public CodegenType getTag() { - return CodegenType.SERVER; + public GeneratorType getTag() { + return GeneratorType.SERVER; } @Override diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractKotlinCodegen.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java index e62d2cbd99d..acfd60b5624 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractKotlinCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java @@ -15,17 +15,15 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages; +package org.openapijsonschematools.codegen.generators; import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.model.CodegenPatternInfo; import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.DefaultCodegen; import org.openapijsonschematools.codegen.codegenerator.GeneratorLanguage; import org.openapijsonschematools.codegen.utils.ModelUtils; import org.slf4j.Logger; @@ -38,7 +36,7 @@ import static org.openapijsonschematools.codegen.utils.StringUtils.*; -public abstract class AbstractKotlinCodegen extends DefaultCodegen implements CodegenConfig { +public abstract class AbstractKotlinGenerator extends DefaultGenerator implements Generator { public static final String SERIALIZATION_LIBRARY_DESC = "What serialization library to use: 'moshi' (default), or 'gson' or 'jackson'"; @@ -47,7 +45,7 @@ public enum SERIALIZATION_LIBRARY_TYPE {moshi, gson, jackson, kotlinx_serializat public static final String MODEL_MUTABLE = "modelMutable"; public static final String MODEL_MUTABLE_DESC = "Create mutable models"; - private final Logger LOGGER = LoggerFactory.getLogger(AbstractKotlinCodegen.class); + private final Logger LOGGER = LoggerFactory.getLogger(AbstractKotlinGenerator.class); protected String artifactId; protected String artifactVersion = "1.0.0"; @@ -75,7 +73,7 @@ public enum SERIALIZATION_LIBRARY_TYPE {moshi, gson, jackson, kotlinx_serializat private Map schemaKeyToModelNameCache = new HashMap<>(); - public AbstractKotlinCodegen() { + public AbstractKotlinGenerator() { super(); supportsInheritance = true; @@ -310,7 +308,7 @@ public void setEnumPropertyNaming(final String enumPropertyNamingType) { * Sets the serialization engine for Kotlin * * @param enumSerializationLibrary The string representation of the serialization library as defined by - * {@link AbstractKotlinCodegen.SERIALIZATION_LIBRARY_TYPE} + * {@link AbstractKotlinGenerator.SERIALIZATION_LIBRARY_TYPE} */ public void setSerializationLibrary(final String enumSerializationLibrary) { try { @@ -573,7 +571,7 @@ public String toApiName(String name) { */ @Override public String toModelImport(String name) { - // toModelImport is called while processing operations, but DefaultCodegen doesn't + // toModelImport is called while processing operations, but DefaultGenerator doesn't // define imports correctly with fully qualified primitives and models as defined in this generator. if (needToImport(name)) { return super.toModelImport(name); @@ -650,7 +648,7 @@ public String toModelFilename(String name, String jsonPath) { } /** - * Sanitize against Kotlin specific naming conventions, which may differ from those required by {@link DefaultCodegen#sanitizeName}. + * Sanitize against Kotlin specific naming conventions, which may differ from those required by {@link DefaultGenerator#sanitizeName}. * * @param name string to be sanitize * @return sanitized string diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractPythonCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractPythonGenerator.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractPythonCodegen.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractPythonGenerator.java index cea91e59c42..c3bcba9ed32 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/AbstractPythonCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractPythonGenerator.java @@ -14,16 +14,14 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages; +package org.openapijsonschematools.codegen.generators; import com.github.curiousoddman.rgxgen.RgxGen; import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; -import org.openapijsonschematools.codegen.DefaultCodegen; import org.openapijsonschematools.codegen.codegenerator.GeneratorLanguage; import org.openapijsonschematools.codegen.utils.ModelUtils; import org.slf4j.Logger; @@ -39,13 +37,13 @@ import static org.openapijsonschematools.codegen.utils.StringUtils.camelize; import static org.openapijsonschematools.codegen.utils.StringUtils.underscore; -public abstract class AbstractPythonCodegen extends DefaultCodegen implements CodegenConfig { - private final Logger LOGGER = LoggerFactory.getLogger(AbstractPythonCodegen.class); +public abstract class AbstractPythonGenerator extends DefaultGenerator implements Generator { + private final Logger LOGGER = LoggerFactory.getLogger(AbstractPythonGenerator.class); protected String packageVersion = "1.0.0"; protected String projectName; // for setup.py, e.g. petstore-api - public AbstractPythonCodegen() { + public AbstractPythonGenerator() { super(); packageName = "openapi_client"; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultCodegen.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java index 60eab8de240..4e4b4e9c59d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.generators; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; @@ -34,9 +34,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; -import org.openapijsonschematools.codegen.codegenerator.CodegenType; +import org.openapijsonschematools.codegen.codegenerator.GeneratorType; import org.openapijsonschematools.codegen.codegenerator.GeneratorLanguage; import org.openapijsonschematools.codegen.codegenerator.VendorExtension; import org.openapijsonschematools.codegen.config.GlobalSettings; @@ -121,8 +120,8 @@ import io.swagger.v3.oas.models.servers.ServerVariable; @SuppressWarnings("rawtypes") -public class DefaultCodegen implements CodegenConfig { - private final Logger LOGGER = LoggerFactory.getLogger(DefaultCodegen.class); +public class DefaultGenerator implements Generator { + private final Logger LOGGER = LoggerFactory.getLogger(DefaultGenerator.class); public static FeatureSet DefaultFeatureSet; @@ -1227,16 +1226,16 @@ public String toApiImport(String name) { * also add some language specified CLI options, if any. * returns string presentation of the example path (it's a constructor) */ - public DefaultCodegen() { - CodegenType codegenType = getTag(); - if (codegenType == null) { - codegenType = CodegenType.OTHER; + public DefaultGenerator() { + GeneratorType generatorType = getTag(); + if (generatorType == null) { + generatorType = GeneratorType.OTHER; } generatorMetadata = GeneratorMetadata.newBuilder() .stability(Stability.STABLE) .featureSet(DefaultFeatureSet) - .generationMessage(String.format(Locale.ROOT, "OpenAPI JSON Schema Generator: %s (%s)", getName(), codegenType.toValue())) + .generationMessage(String.format(Locale.ROOT, "OpenAPI JSON Schema Generator: %s (%s)", getName(), generatorType.toValue())) .build(); defaultIncludes = new HashSet<>( @@ -4272,7 +4271,7 @@ public static Set getProducesInfo(final OpenAPI openAPI, final Operation } @Override - public CodegenType getTag() { + public GeneratorType getTag() { return null; } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConfig.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConfig.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java index 68ee1a3327c..ca1022db0da 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConfig.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.codegenerator; +package org.openapijsonschematools.codegen.generators; import com.samskivert.mustache.Mustache.Compiler; import io.swagger.v3.oas.models.OpenAPI; @@ -31,6 +31,10 @@ import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.servers.ServerVariable; +import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; +import org.openapijsonschematools.codegen.codegenerator.GeneratorLanguage; +import org.openapijsonschematools.codegen.codegenerator.GeneratorType; +import org.openapijsonschematools.codegen.codegenerator.VendorExtension; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.cli.CliOption; import org.openapijsonschematools.codegen.model.CodegenHeader; @@ -57,14 +61,14 @@ import java.util.Set; import java.util.TreeMap; -public interface CodegenConfig { +public interface Generator { String getFilesMetadataFilename(); String getVersionMetadataFilename(); GeneratorMetadata getGeneratorMetadata(); - CodegenType getTag(); + GeneratorType getTag(); String getName(); diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JMeterClientCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java similarity index 91% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JMeterClientCodegen.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java index 525805cace0..16df3b0fe5d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JMeterClientCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java @@ -15,14 +15,12 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages; +package org.openapijsonschematools.codegen.generators; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; -import org.openapijsonschematools.codegen.codegenerator.CodegenType; -import org.openapijsonschematools.codegen.DefaultCodegen; +import org.openapijsonschematools.codegen.codegenerator.GeneratorType; import org.openapijsonschematools.codegen.meta.features.ClientModificationFeature; import org.openapijsonschematools.codegen.meta.features.ParameterFeature; import org.openapijsonschematools.codegen.meta.features.SchemaFeature; @@ -35,7 +33,7 @@ import java.util.HashSet; import java.util.Map; -public class JMeterClientCodegen extends DefaultCodegen implements CodegenConfig { +public class JMeterClientGenerator extends DefaultGenerator implements Generator { // source folder where to write the files protected String sourceFolder = ""; @@ -44,12 +42,12 @@ public class JMeterClientCodegen extends DefaultCodegen implements CodegenConfig /** * Configures the type of generator. * - * @return the CodegenType for this generator - * @see CodegenType + * @return the GeneratorType for this generator + * @see GeneratorType */ @Override - public CodegenType getTag() { - return CodegenType.CLIENT; + public GeneratorType getTag() { + return GeneratorType.CLIENT; } /** @@ -74,7 +72,7 @@ public String getHelp() { return "Generates a JMeter .jmx file."; } - public JMeterClientCodegen() { + public JMeterClientGenerator() { super(); modifyFeatureSet(features -> features @@ -96,7 +94,7 @@ public JMeterClientCodegen() { ); // set the output folder here - outputFolder = "generated-code/JMeterClientCodegen"; + outputFolder = "generated-code/JMeterClientGenerator"; /* * Api classes. You can write classes for each Api file with the apiTemplateFiles map. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaClientCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaClientCodegen.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index ec01981496a..07b90d9b34b 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages; +package org.openapijsonschematools.codegen.generators; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; +import org.openapijsonschematools.codegen.codegenerator.GeneratorType; import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.codegenerator.CodegenType; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.codegenerator.VendorExtension; -import org.openapijsonschematools.codegen.languages.features.BeanValidationFeatures; -import org.openapijsonschematools.codegen.languages.features.GzipFeatures; -import org.openapijsonschematools.codegen.languages.features.PerformBeanValidationFeatures; +import org.openapijsonschematools.codegen.generators.features.BeanValidationFeatures; +import org.openapijsonschematools.codegen.generators.features.GzipFeatures; +import org.openapijsonschematools.codegen.generators.features.PerformBeanValidationFeatures; import org.openapijsonschematools.codegen.templating.mustache.CaseFormatLambda; import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; import org.openapijsonschematools.codegen.utils.ProcessUtils; @@ -41,12 +41,12 @@ import static java.util.Collections.sort; import static org.openapijsonschematools.codegen.utils.StringUtils.camelize; -public class JavaClientCodegen extends AbstractJavaCodegen +public class JavaClientGenerator extends AbstractJavaGenerator implements BeanValidationFeatures, PerformBeanValidationFeatures, GzipFeatures { static final String MEDIA_TYPE = "mediaType"; - private final Logger LOGGER = LoggerFactory.getLogger(JavaClientCodegen.class); + private final Logger LOGGER = LoggerFactory.getLogger(JavaClientGenerator.class); public static final String USE_RX_JAVA2 = "useRxJava2"; public static final String USE_RX_JAVA3 = "useRxJava3"; @@ -131,7 +131,7 @@ public MpRestClientVersion(String rootPackage, String pomTemplate) { } } - public JavaClientCodegen() { + public JavaClientGenerator() { super(); // TODO: Move GlobalFeature.ParameterizedServer to library: jersey after moving featureSet to generatorMetadata @@ -223,8 +223,8 @@ private void initMpRestClientVersionToRootPackage() { } @Override - public CodegenType getTag() { - return CodegenType.CLIENT; + public GeneratorType getTag() { + return GeneratorType.CLIENT; } @Override diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaJerseyServerCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaJerseyServerCodegen.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java index 1612d90b626..9c0aa2958d7 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/JavaJerseyServerCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages; +package org.openapijsonschematools.codegen.generators; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; @@ -27,7 +27,7 @@ import java.util.HashMap; import java.util.Map; -public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen { +public class JavaJerseyServerGenerator extends AbstractJavaJAXRSServerGenerator { protected static final String LIBRARY_JERSEY1 = "jersey1"; protected static final String LIBRARY_JERSEY2 = "jersey2"; @@ -37,7 +37,7 @@ public class JavaJerseyServerCodegen extends AbstractJavaJAXRSServerCodegen { */ public static final String DEFAULT_JERSEY_LIBRARY = LIBRARY_JERSEY2; - public JavaJerseyServerCodegen() { + public JavaJerseyServerGenerator() { super(); modifyFeatureSet(features -> features.includeDocumentationFeatures(DocumentationFeature.Readme)); diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/KotlinClientCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/KotlinClientCodegen.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java index 61194407a68..4fe452f474e 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/KotlinClientCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages; +package org.openapijsonschematools.codegen.generators; import java.io.File; import java.util.HashMap; @@ -29,7 +29,7 @@ import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.meta.features.SchemaFeature; import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.codegenerator.CodegenType; +import org.openapijsonschematools.codegen.codegenerator.GeneratorType; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.meta.features.ClientModificationFeature; import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; @@ -42,9 +42,9 @@ import static java.util.Collections.sort; -public class KotlinClientCodegen extends AbstractKotlinCodegen { +public class KotlinClientGenerator extends AbstractKotlinGenerator { - private final Logger LOGGER = LoggerFactory.getLogger(KotlinClientCodegen.class); + private final Logger LOGGER = LoggerFactory.getLogger(KotlinClientGenerator.class); protected static final String JVM = "jvm"; protected static final String JVM_KTOR = "jvm-ktor"; @@ -129,9 +129,9 @@ public enum CollectionType { } /** - * Constructs an instance of `KotlinClientCodegen`. + * Constructs an instance of `KotlinClientGenerator`. */ - public KotlinClientCodegen() { + public KotlinClientGenerator() { super(); /* @@ -246,8 +246,8 @@ public KotlinClientCodegen() { cliOptions.add(CliOption.newBoolean(SUPPORT_ANDROID_API_LEVEL_25_AND_BELLOW, "[WARNING] This flag will generate code that has a known security vulnerability. It uses `kotlin.io.createTempFile` instead of `java.nio.file.Files.createTempFile` in order to support Android API level 25 and bellow. For more info, please check the following links https://github.com/OpenAPITools/openapi-generator/security/advisories/GHSA-23x4-m842-fmwf, https://github.com/OpenAPITools/openapi-generator/pull/9284")); } - public CodegenType getTag() { - return CodegenType.CLIENT; + public GeneratorType getTag() { + return GeneratorType.CLIENT; } public String getName() { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/PythonClientCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/PythonClientCodegen.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java index 38298084772..f8dc8dd10b8 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/PythonClientCodegen.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages; +package org.openapijsonschematools.codegen.generators; import com.github.curiousoddman.rgxgen.RgxGen; import com.github.curiousoddman.rgxgen.config.RgxGenOption; @@ -25,13 +25,13 @@ import org.apache.commons.io.FileUtils; import org.openapijsonschematools.codegen.cli.CliOption; import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; +import org.openapijsonschematools.codegen.codegenerator.GeneratorType; import org.openapijsonschematools.codegen.meta.features.ComponentsFeature; import org.openapijsonschematools.codegen.meta.features.OperationFeature; import org.openapijsonschematools.codegen.meta.features.SchemaFeature; import org.openapijsonschematools.codegen.model.CodegenDiscriminator; import org.openapijsonschematools.codegen.model.CodegenPatternInfo; import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.codegenerator.CodegenType; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.templating.TemplateManager; import org.openapijsonschematools.codegen.meta.features.DataTypeFeature; @@ -74,8 +74,8 @@ import static org.openapijsonschematools.codegen.utils.StringUtils.underscore; @SuppressWarnings("rawtypes") -public class PythonClientCodegen extends AbstractPythonCodegen { - private final Logger LOGGER = LoggerFactory.getLogger(PythonClientCodegen.class); +public class PythonClientGenerator extends AbstractPythonGenerator { + private final Logger LOGGER = LoggerFactory.getLogger(PythonClientGenerator.class); public static final String PACKAGE_URL = "packageUrl"; public static final String DEFAULT_LIBRARY = "urllib3"; @@ -105,7 +105,7 @@ public class PythonClientCodegen extends AbstractPythonCodegen { private boolean nonCompliantUseDiscrIfCompositionFails = false; private final HashMap modelNameCache = new HashMap<>(); - public PythonClientCodegen() { + public PythonClientGenerator() { super(); loadDeepObjectIntoItems = false; importBaseType = false; @@ -1760,8 +1760,8 @@ public CodegenPatternInfo getPatternInfo(String pattern) { } @Override - public CodegenType getTag() { - return CodegenType.CLIENT; + public GeneratorType getTag() { + return GeneratorType.CLIENT; } @Override diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/BeanValidationExtendedFeatures.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/BeanValidationExtendedFeatures.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/BeanValidationExtendedFeatures.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/BeanValidationExtendedFeatures.java index ce4007954c2..b59993eaa98 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/BeanValidationExtendedFeatures.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/BeanValidationExtendedFeatures.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages.features; +package org.openapijsonschematools.codegen.generators.features; public interface BeanValidationExtendedFeatures { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/BeanValidationFeatures.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/BeanValidationFeatures.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/BeanValidationFeatures.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/BeanValidationFeatures.java index 8a3abc60786..d1a7ce28091 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/BeanValidationFeatures.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/BeanValidationFeatures.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages.features; +package org.openapijsonschematools.codegen.generators.features; public interface BeanValidationFeatures { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/CXFExtServerFeatures.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/CXFExtServerFeatures.java similarity index 89% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/CXFExtServerFeatures.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/CXFExtServerFeatures.java index 84c4a6ddd48..1405b0b2d94 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/CXFExtServerFeatures.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/CXFExtServerFeatures.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.languages.features; +package org.openapijsonschematools.codegen.generators.features; import java.io.File; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/CXFFeatures.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/CXFFeatures.java similarity index 92% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/CXFFeatures.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/CXFFeatures.java index ceaef2a387e..504cc7645a4 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/CXFFeatures.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/CXFFeatures.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages.features; +package org.openapijsonschematools.codegen.generators.features; /** * Features supported by CXF 3 (client + server) diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/CXFServerFeatures.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/CXFServerFeatures.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/CXFServerFeatures.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/CXFServerFeatures.java index c54f33988e9..4917819aa6d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/CXFServerFeatures.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/CXFServerFeatures.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages.features; +package org.openapijsonschematools.codegen.generators.features; /** * Features supported by CXF 3 server diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/DocumentationProviderFeatures.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/DocumentationProviderFeatures.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/DocumentationProviderFeatures.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/DocumentationProviderFeatures.java index 9912e9ebd02..2ec3d8d0ce8 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/DocumentationProviderFeatures.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/DocumentationProviderFeatures.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.languages.features; +package org.openapijsonschematools.codegen.generators.features; import java.util.ArrayList; import java.util.Arrays; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/GzipFeatures.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/GzipFeatures.java similarity index 92% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/GzipFeatures.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/GzipFeatures.java index 8a277192067..cd72fba5e4d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/GzipFeatures.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/GzipFeatures.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages.features; +package org.openapijsonschematools.codegen.generators.features; public interface GzipFeatures { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/GzipTestFeatures.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/GzipTestFeatures.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/GzipTestFeatures.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/GzipTestFeatures.java index 1c47c1b2659..9a7b2809a1c 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/GzipTestFeatures.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/GzipTestFeatures.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages.features; +package org.openapijsonschematools.codegen.generators.features; public interface GzipTestFeatures { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/JbossFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/JbossFeature.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/JbossFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/JbossFeature.java index c5258a79ad6..13c5de33e94 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/JbossFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/JbossFeature.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages.features; +package org.openapijsonschematools.codegen.generators.features; public interface JbossFeature { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/LoggingFeatures.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/LoggingFeatures.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/LoggingFeatures.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/LoggingFeatures.java index fabf006bcaf..c56ad06050d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/LoggingFeatures.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/LoggingFeatures.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages.features; +package org.openapijsonschematools.codegen.generators.features; public interface LoggingFeatures extends BeanValidationFeatures { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/LoggingTestFeatures.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/LoggingTestFeatures.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/LoggingTestFeatures.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/LoggingTestFeatures.java index 1e34168d020..c6a9b015ddf 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/LoggingTestFeatures.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/LoggingTestFeatures.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages.features; +package org.openapijsonschematools.codegen.generators.features; public interface LoggingTestFeatures { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/OptionalFeatures.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/OptionalFeatures.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/OptionalFeatures.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/OptionalFeatures.java index d2015ba8df5..0aa25e94215 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/OptionalFeatures.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/OptionalFeatures.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages.features; +package org.openapijsonschematools.codegen.generators.features; public interface OptionalFeatures { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/PerformBeanValidationFeatures.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/PerformBeanValidationFeatures.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/PerformBeanValidationFeatures.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/PerformBeanValidationFeatures.java index 0a82891db3c..1d80b8c5553 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/PerformBeanValidationFeatures.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/PerformBeanValidationFeatures.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages.features; +package org.openapijsonschematools.codegen.generators.features; public interface PerformBeanValidationFeatures { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/SpringFeatures.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/SpringFeatures.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/SpringFeatures.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/SpringFeatures.java index 430f794958e..fe0ece97b7d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/SpringFeatures.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/SpringFeatures.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages.features; +package org.openapijsonschematools.codegen.generators.features; public interface SpringFeatures extends BeanValidationFeatures { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/SwaggerFeatures.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/SwaggerFeatures.java similarity index 92% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/SwaggerFeatures.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/SwaggerFeatures.java index 9ad9d484591..fb6a0bd71e7 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/SwaggerFeatures.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/SwaggerFeatures.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages.features; +package org.openapijsonschematools.codegen.generators.features; public interface SwaggerFeatures { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/SwaggerUIFeatures.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/SwaggerUIFeatures.java similarity index 92% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/SwaggerUIFeatures.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/SwaggerUIFeatures.java index e780305de65..39a7e920532 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/SwaggerUIFeatures.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/SwaggerUIFeatures.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages.features; +package org.openapijsonschematools.codegen.generators.features; public interface SwaggerUIFeatures { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/UseGenericResponseFeatures.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/UseGenericResponseFeatures.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/UseGenericResponseFeatures.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/UseGenericResponseFeatures.java index 62296b5d15e..5c64f9da1bd 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/languages/features/UseGenericResponseFeatures.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/UseGenericResponseFeatures.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.languages.features; +package org.openapijsonschematools.codegen.generators.features; public interface UseGenericResponseFeatures { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenDiscriminator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenDiscriminator.java index 182be939bed..c36dfc35a27 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenDiscriminator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenDiscriminator.java @@ -33,7 +33,7 @@ public class CodegenDiscriminator { // - descendant schemas that allOf inherit self schema AND // - child oneOf + anyOf schemas // - // see the method createDiscriminator in DefaultCodegen.java + // see the method createDiscriminator in DefaultGenerator.java public final TreeSet mappedModels; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/GeneratorTemplateContentLocator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/GeneratorTemplateContentLocator.java index f81b2acc5a9..7b0d7fd401c 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/GeneratorTemplateContentLocator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/GeneratorTemplateContentLocator.java @@ -1,24 +1,24 @@ package org.openapijsonschematools.codegen.templating; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.generators.Generator; import java.io.File; import java.nio.file.Paths; /** - * Locates templates according to {@link CodegenConfig} settings. + * Locates templates according to {@link Generator} settings. */ public class GeneratorTemplateContentLocator implements TemplatePathLocator { - private final CodegenConfig codegenConfig; + private final Generator generator; /** - * Constructs a new instance of {@link GeneratorTemplateContentLocator} for the provided {@link CodegenConfig} + * Constructs a new instance of {@link GeneratorTemplateContentLocator} for the provided {@link Generator} * - * @param codegenConfig A generator's configuration used for determining template file location. + * @param generator A generator's configuration used for determining template file location. */ - public GeneratorTemplateContentLocator(CodegenConfig codegenConfig) { - this.codegenConfig = codegenConfig; + public GeneratorTemplateContentLocator(Generator generator) { + this.generator = generator; } private String buildLibraryFilePath(String dir, String library, String file) { @@ -56,7 +56,7 @@ private boolean classpathTemplateExists(String name) { */ @Override public String getFullTemplatePath(String relativeTemplateFile) { - CodegenConfig config = this.codegenConfig; + Generator config = this.generator; //check the supplied template library folder for the file final String library = config.getLibrary(); diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/MustacheEngineAdapter.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/MustacheEngineAdapter.java index 745bd81bc10..b2e32160c76 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/MustacheEngineAdapter.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/MustacheEngineAdapter.java @@ -47,7 +47,7 @@ public String getIdentifier() { /** * Compiles a template into a string * - * @param executor From where we can fetch the templates content (e.g. an instance of DefaultGenerator) + * @param executor From where we can fetch the templates content (e.g. an instance of DefaultGeneratorRunner) * @param bundle The map of values to pass to the template * @param templateFile The name of the template (e.g. model.mustache ) * @return the processed template result diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineAdapter.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineAdapter.java index 732f3b4a00a..00be9c2f95f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineAdapter.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineAdapter.java @@ -58,7 +58,7 @@ default boolean handlesFile(String filename) { /** * Compiles a template into a string * - * @param executor From where we can fetch the templates content (e.g. an instance of DefaultGenerator) + * @param executor From where we can fetch the templates content (e.g. an instance of DefaultGeneratorRunner) * @param bundle The map of values to pass to the template * @param templateFile The name of the template (e.g. model.mustache ) * @return the processed template result diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java index a59d8b6019e..b0810c5a912 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java @@ -19,7 +19,7 @@ import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.generators.Generator; import java.io.IOException; import java.io.Writer; @@ -40,7 +40,7 @@ * */ public class CamelCaseLambda implements Mustache.Lambda { - private CodegenConfig generator = null; + private Generator generator = null; private Boolean escapeParam = false; private Boolean lowercaseFirstLetter = true; @@ -50,7 +50,7 @@ public CamelCaseLambda(boolean lowercaseFirstLetter) { public CamelCaseLambda() {} - public CamelCaseLambda generator(final CodegenConfig generator) { + public CamelCaseLambda generator(final Generator generator) { this.generator = generator; return this; } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CaseFormatLambda.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CaseFormatLambda.java index 9cb9e2d5b69..c3c49b3faf2 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CaseFormatLambda.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CaseFormatLambda.java @@ -3,7 +3,7 @@ import com.google.common.base.CaseFormat; import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.generators.Generator; import java.io.IOException; import java.io.Writer; @@ -22,7 +22,7 @@ * */ public class CaseFormatLambda implements Mustache.Lambda { - private CodegenConfig generator = null; + private Generator generator = null; private CaseFormat initialFormat; private CaseFormat targetFormat; @@ -32,7 +32,7 @@ public CaseFormatLambda(CaseFormat target, CaseFormat targetFormat) { this.targetFormat = targetFormat; } - public CaseFormatLambda generator(final CodegenConfig generator) { + public CaseFormatLambda generator(final Generator generator) { this.generator = generator; return this; } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/JoinWithCommaLambda.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/JoinWithCommaLambda.java index a33551159f0..03817bf364b 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/JoinWithCommaLambda.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/JoinWithCommaLambda.java @@ -19,7 +19,7 @@ import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.generators.Generator; import java.io.IOException; import java.io.Writer; @@ -38,13 +38,13 @@ * */ public class JoinWithCommaLambda implements Mustache.Lambda { - private CodegenConfig generator = null; + private Generator generator = null; public JoinWithCommaLambda() { } - public JoinWithCommaLambda generator(final CodegenConfig generator) { + public JoinWithCommaLambda generator(final Generator generator) { this.generator = generator; return this; } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambda.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambda.java index c1a1d126929..ace03adc329 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambda.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambda.java @@ -19,7 +19,7 @@ import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.generators.Generator; import java.io.IOException; import java.io.Writer; @@ -39,13 +39,13 @@ * */ public class LowercaseLambda implements Mustache.Lambda { - private CodegenConfig generator = null; + private Generator generator = null; public LowercaseLambda() { } - public LowercaseLambda generator(final CodegenConfig generator) { + public LowercaseLambda generator(final Generator generator) { this.generator = generator; return this; } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/OptionalParameterLambda.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/OptionalParameterLambda.java index e8d46d612fb..fb11278cca3 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/OptionalParameterLambda.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/OptionalParameterLambda.java @@ -19,7 +19,7 @@ import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.generators.Generator; import java.io.IOException; import java.io.Writer; @@ -40,12 +40,12 @@ * */ public class OptionalParameterLambda implements Mustache.Lambda { - private CodegenConfig generator = null; + private Generator generator = null; private Boolean escapeParam = false; public OptionalParameterLambda() {} - public OptionalParameterLambda generator(final CodegenConfig generator) { + public OptionalParameterLambda generator(final Generator generator) { this.generator = generator; return this; } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/RequiredParameterLambda.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/RequiredParameterLambda.java index 31f3a6b944d..4aa989ad57d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/RequiredParameterLambda.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/RequiredParameterLambda.java @@ -19,7 +19,7 @@ import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.generators.Generator; import java.io.IOException; import java.io.Writer; @@ -40,12 +40,12 @@ * */ public class RequiredParameterLambda implements Mustache.Lambda { - private CodegenConfig generator = null; + private Generator generator = null; private Boolean escapeParam = false; public RequiredParameterLambda() {} - public RequiredParameterLambda generator(final CodegenConfig generator) { + public RequiredParameterLambda generator(final Generator generator) { this.generator = generator; return this; } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/URLPathUtils.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/URLPathUtils.java index a5d7b211ad7..4c56aa65847 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/URLPathUtils.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/URLPathUtils.java @@ -22,7 +22,7 @@ import io.swagger.v3.oas.models.servers.ServerVariable; import io.swagger.v3.oas.models.servers.ServerVariables; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.generators.Generator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -112,12 +112,12 @@ private static String extractUrl(Server server, String url, ServerVariables vari return url; } - public static String getScheme(OpenAPI openAPI, CodegenConfig config) { + public static String getScheme(OpenAPI openAPI, Generator config) { URL url = getServerURL(openAPI, config.serverVariableOverrides()); return getScheme(url, config); } - public static String getScheme(URL url, CodegenConfig config) { + public static String getScheme(URL url, Generator config) { String scheme; if (url != null) { scheme = url.getProtocol(); diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java index 9b4b2588a0f..7796d7ae98c 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java @@ -38,14 +38,14 @@ boolean isValid() { * * @return The instance of {@link ValidationRule} which was evaluated. */ - abstract ValidationRule getRule(); + protected abstract ValidationRule getRule(); /** * Gets the message with details about this validated state. * * @return A string intended to be displayed to a user. */ - abstract String getMessage(); + protected abstract String getMessage(); /** * Creates an instance of an {@link Invalid} validation state. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Invalid.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Invalid.java index 01225cdbd81..f3e1d09fcb7 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Invalid.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Invalid.java @@ -33,7 +33,7 @@ public final class Invalid extends Validated { * @param rule The rule which was evaluated and resulted in this state. * @param message The message to be displayed for this invalid state. */ - Invalid(ValidationRule rule, String message) { + public Invalid(ValidationRule rule, String message) { this.rule = rule; this.message = message; } @@ -54,12 +54,10 @@ public String getDetails() { return details; } - @Override public String getMessage() { return message; } - @Override public ValidationRule getRule() { return rule; } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Valid.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Valid.java index daee6deffa9..b221025fe59 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Valid.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Valid.java @@ -29,7 +29,6 @@ public final class Valid extends Validated { * * @return true if the instance passed validation of the rule returned by {@link Validated#getRule()}. */ - @Override boolean isValid() { return true; } @@ -39,7 +38,7 @@ boolean isValid() { * * @param rule The rule which was evaluated and resulted in this state. */ - Valid(ValidationRule rule) { + public Valid(ValidationRule rule) { this.rule = rule; } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/ValidationRule.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/ValidationRule.java index a3c428a45c9..d58281455d5 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/ValidationRule.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/ValidationRule.java @@ -89,7 +89,7 @@ public String getDescription() { * * @return An "empty" rule. */ - static ValidationRule empty() { + public static ValidationRule empty() { return new ValidationRule(Severity.ERROR, "empty", "failure message", (i) -> Fail.empty() ); } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidations.java index f99d5d0cee8..318a116c6f8 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidations.java @@ -12,8 +12,8 @@ /** * A standalone instance for evaluating rule and recommendations related to OAS {@link io.swagger.v3.oas.models.Operation} */ -class OpenApiOperationValidations extends GenericValidator { - OpenApiOperationValidations(RuleConfiguration ruleConfiguration) { +public class OpenApiOperationValidations extends GenericValidator { + public OpenApiOperationValidations(RuleConfiguration ruleConfiguration) { super(new ArrayList<>()); if (ruleConfiguration.isEnableRecommendations()) { if (ruleConfiguration.isEnableApiRequestUriWithBodyRecommendation()) { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidations.java index feceeefde49..61fa907215e 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidations.java @@ -12,8 +12,8 @@ /** * A standalone instance for evaluating rules and recommendations related to OAS {@link Parameter} */ -class OpenApiParameterValidations extends GenericValidator { - OpenApiParameterValidations(RuleConfiguration ruleConfiguration) { +public class OpenApiParameterValidations extends GenericValidator { + public OpenApiParameterValidations(RuleConfiguration ruleConfiguration) { super(new ArrayList<>()); if (ruleConfiguration.isEnableRecommendations()) { if (ruleConfiguration.isEnableApacheNginxUnderscoreRecommendation()) { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java index 9e6e842d9ca..9e5fcee1eb4 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java @@ -17,8 +17,8 @@ /** * A standalone instance for evaluating rules and recommendations related to OAS {@link Schema} */ -class OpenApiSchemaValidations extends GenericValidator { - OpenApiSchemaValidations(RuleConfiguration ruleConfiguration) { +public class OpenApiSchemaValidations extends GenericValidator { + public OpenApiSchemaValidations(RuleConfiguration ruleConfiguration) { super(new ArrayList<>()); if (ruleConfiguration.isEnableRecommendations()) { if (ruleConfiguration.isEnableOneOfWithPropertiesRecommendation()) { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidations.java index 8ca33aea6f8..656a295a292 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidations.java @@ -11,8 +11,8 @@ /** * A standalone instance for evaluating rules and recommendations related to OAS {@link SecurityScheme} */ -class OpenApiSecuritySchemeValidations extends GenericValidator { - OpenApiSecuritySchemeValidations(RuleConfiguration ruleConfiguration) { +public class OpenApiSecuritySchemeValidations extends GenericValidator { + public OpenApiSecuritySchemeValidations(RuleConfiguration ruleConfiguration) { super(new ArrayList<>()); if (ruleConfiguration.isEnableRecommendations()) { if (ruleConfiguration.isEnableApacheNginxUnderscoreRecommendation()) { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OperationWrapper.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OperationWrapper.java index d4f0b698017..03468f7c55c 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OperationWrapper.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OperationWrapper.java @@ -19,7 +19,7 @@ public class OperationWrapper { * @param operation The operation instances to wrap * @param httpMethod The http method to wrap */ - OperationWrapper(OpenAPI specification, Operation operation, PathItem.HttpMethod httpMethod) { + public OperationWrapper(OpenAPI specification, Operation operation, PathItem.HttpMethod httpMethod) { this.specification = specification; this.operation = operation; this.httpMethod = httpMethod; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ParameterWrapper.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ParameterWrapper.java index 2e3aa615897..2d4abd771c0 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ParameterWrapper.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ParameterWrapper.java @@ -16,7 +16,7 @@ public class ParameterWrapper { * @param specification The OAS specification * @param parameter The OAS parameter */ - ParameterWrapper(OpenAPI specification, Parameter parameter) { + public ParameterWrapper(OpenAPI specification, Parameter parameter) { this.specification = specification; this.parameter = parameter; } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SchemaWrapper.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SchemaWrapper.java index 0a17f3c6388..0e88a9c08a7 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SchemaWrapper.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SchemaWrapper.java @@ -16,7 +16,7 @@ public class SchemaWrapper { * @param specification The OAS specification * @param schema The OAS schema */ - SchemaWrapper(OpenAPI specification, Schema schema) { + public SchemaWrapper(OpenAPI specification, Schema schema) { this.specification = specification; this.schema = schema; } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SecuritySchemeWrapper.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SecuritySchemeWrapper.java index 19ab305ad6b..0930bfb7e31 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SecuritySchemeWrapper.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SecuritySchemeWrapper.java @@ -16,7 +16,7 @@ public class SecuritySchemeWrapper { * @param specification The OAS specification * @param securityScheme The OAS securityScheme */ - SecuritySchemeWrapper(OpenAPI specification, SecurityScheme securityScheme) { + public SecuritySchemeWrapper(OpenAPI specification, SecurityScheme securityScheme) { this.specification = specification; this.securityScheme = securityScheme; } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ValidationConstants.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ValidationConstants.java index ff1e067248f..5288b9c517d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ValidationConstants.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ValidationConstants.java @@ -1,6 +1,6 @@ package org.openapijsonschematools.codegen.validation.oas; -final class ValidationConstants { +public final class ValidationConstants { static String ApacheNginxUnderscoreDescription = "Apache and Nginx may fail on headers keys with underscore!"; - static String ApacheNginxUnderscoreFailureMessage = "Apache and Nginx webservers may fail due to legacy CGI constraints enabled by default in which header keys with underscore are disallowed. See https://stackoverflow.com/a/22856867/151445."; + public static String ApacheNginxUnderscoreFailureMessage = "Apache and Nginx webservers may fail due to legacy CGI constraints enabled by default in which header keys with underscore are disallowed. See https://stackoverflow.com/a/22856867/151445."; } diff --git a/modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.codegenerator.CodegenConfig b/modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.codegenerator.CodegenConfig deleted file mode 100644 index 32cd07b3ccd..00000000000 --- a/modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.codegenerator.CodegenConfig +++ /dev/null @@ -1,5 +0,0 @@ -org.openapijsonschematools.codegen.languages.KotlinClientCodegen -org.openapijsonschematools.codegen.languages.JavaClientCodegen -org.openapijsonschematools.codegen.languages.JavaJerseyServerCodegen -org.openapijsonschematools.codegen.languages.JMeterClientCodegen -org.openapijsonschematools.codegen.languages.PythonClientCodegen diff --git a/modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.generators.Generator b/modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.generators.Generator new file mode 100644 index 00000000000..cead914ce38 --- /dev/null +++ b/modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.generators.Generator @@ -0,0 +1,5 @@ +org.openapijsonschematools.codegen.generators.KotlinClientGenerator +org.openapijsonschematools.codegen.generators.JavaClientGenerator +org.openapijsonschematools.codegen.generators.JavaJerseyServerGenerator +org.openapijsonschematools.codegen.generators.JMeterClientGenerator +org.openapijsonschematools.codegen.generators.PythonClientGenerator diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java index e5a126185e0..11a1b971eef 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java @@ -19,7 +19,7 @@ import io.swagger.v3.oas.models.OpenAPI; import org.openapijsonschematools.codegen.cli.ClientOptInput; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.generators.Generator; import org.openapijsonschematools.codegen.testutils.AssertFile; import org.openapijsonschematools.codegen.testutils.IntegrationTestPathsConfig; import org.testng.annotations.Test; @@ -33,7 +33,7 @@ public abstract class AbstractIntegrationTest { protected abstract IntegrationTestPathsConfig getIntegrationTestPathsConfig(); - protected abstract CodegenConfig getCodegenConfig(); + protected abstract Generator getCodegenConfig(); protected abstract Map configProperties(); @@ -44,7 +44,7 @@ public abstract class AbstractIntegrationTest { // @wing328: ignore for the time being until we fix the error with the integration test @Test(enabled = false) public void generatesCorrectDirectoryStructure() throws IOException { - DefaultGenerator codeGen = new DefaultGenerator(); + DefaultGeneratorRunner codeGen = new DefaultGeneratorRunner(); codeGen.setGenerateMetadata(generateMetadata); for (Map.Entry propertyOverride : globalPropertyOverrides.entrySet()) { codeGen.setGeneratorPropertyDefault(propertyOverride.getKey(), propertyOverride.getValue()); @@ -56,14 +56,14 @@ public void generatesCorrectDirectoryStructure() throws IOException { OpenAPI openAPI = TestUtils.parseContent(specContent); - CodegenConfig codegenConfig = getCodegenConfig(); - codegenConfig.setOutputDir(integrationTestPathsConfig.getOutputPath().toString()); - codegenConfig.setIgnoreFilePathOverride(integrationTestPathsConfig.getIgnoreFilePath().toFile().toString()); + Generator generator = getCodegenConfig(); + generator.setOutputDir(integrationTestPathsConfig.getOutputPath().toString()); + generator.setIgnoreFilePathOverride(integrationTestPathsConfig.getIgnoreFilePath().toFile().toString()); ClientOptInput opts = new ClientOptInput() - .config(codegenConfig) + .config(generator) .openAPI(openAPI); - codegenConfig.additionalProperties().putAll(configProperties()); + generator.additionalProperties().putAll(configProperties()); codeGen.opts(opts).generate(); diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractOptionsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractOptionsTest.java index 6d1905e2e05..dca51b6fa9e 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractOptionsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractOptionsTest.java @@ -21,7 +21,7 @@ import org.apache.commons.lang3.StringUtils; import org.mockito.MockSettings; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.generators.Generator; import org.openapijsonschematools.codegen.options.OptionsProvider; import org.testng.Assert; import org.testng.annotations.Test; @@ -79,7 +79,7 @@ public String apply(CliOption option) { }; } - protected abstract CodegenConfig getCodegenConfig(); + protected abstract Generator getCodegenConfig(); protected abstract void verifyOptions(); } diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorTestRunner.java similarity index 94% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorTestRunner.java index b044c45c339..4527e15877d 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorTestRunner.java @@ -12,7 +12,8 @@ import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.responses.ApiResponses; import org.openapijsonschematools.codegen.cli.ClientOptInput; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.generators.DefaultGenerator; +import org.openapijsonschematools.codegen.generators.Generator; import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.config.CodegenConfigurator; import org.openapijsonschematools.codegen.config.GlobalSettings; @@ -34,7 +35,7 @@ import java.nio.file.StandardOpenOption; import java.util.*; -public class DefaultGeneratorTest { +public class DefaultGeneratorTestRunner { @Test public void testIgnoreFileProcessing() throws IOException { @@ -60,7 +61,7 @@ public void testIgnoreFileProcessing() throws IOException { .setOutputDir(target.toAbsolutePath().toString()); final ClientOptInput clientOptInput = configurator.toClientOptInput(); - DefaultGenerator generator = new DefaultGenerator(false); + DefaultGeneratorRunner generator = new DefaultGeneratorRunner(false); generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "true"); @@ -146,7 +147,7 @@ public void testFilesAreNeverOverwritten() throws IOException { StandardOpenOption.CREATE); final ClientOptInput clientOptInput = configurator.toClientOptInput(); - DefaultGenerator generator = new DefaultGenerator(false); + DefaultGeneratorRunner generator = new DefaultGeneratorRunner(false); generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); @@ -193,7 +194,7 @@ public void dryRunWithApisOnly() throws IOException { .setOutputDir(target.toAbsolutePath().toString()); final ClientOptInput clientOptInput = configurator.toClientOptInput(); - DefaultGenerator generator = new DefaultGenerator(true); + DefaultGeneratorRunner generator = new DefaultGeneratorRunner(true); generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); @@ -224,7 +225,7 @@ public void dryRunWithModelsOnly() throws IOException { .setOutputDir(target.toAbsolutePath().toString()); final ClientOptInput clientOptInput = configurator.toClientOptInput(); - DefaultGenerator generator = new DefaultGenerator(true); + DefaultGeneratorRunner generator = new DefaultGeneratorRunner(true); generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); @@ -255,7 +256,7 @@ public void dryRunWithSupportFilesSelections() throws IOException { .setOutputDir(target.toAbsolutePath().toString()); final ClientOptInput clientOptInput = configurator.toClientOptInput(); - DefaultGenerator generator = new DefaultGenerator(true); + DefaultGeneratorRunner generator = new DefaultGeneratorRunner(true); generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); @@ -299,11 +300,11 @@ public void testNonStrictFromPaths() throws Exception { ClientOptInput opts = new ClientOptInput(); opts.openAPI(openAPI); - CodegenConfig config = new DefaultCodegen(); + Generator config = new DefaultGenerator(); config.setStrictSpecBehavior(false); opts.config(config); - DefaultGenerator generator = new DefaultGenerator(); + DefaultGeneratorRunner generator = new DefaultGeneratorRunner(); generator.opts(opts); TreeMap paths = config.fromPaths(openAPI.getPaths()); Assert.assertEquals(paths.size(), 2); @@ -327,10 +328,10 @@ public void testFromPaths() throws Exception { ClientOptInput opts = new ClientOptInput(); opts.openAPI(openAPI); - CodegenConfig config = new DefaultCodegen(); + Generator config = new DefaultGenerator(); opts.config(config); - DefaultGenerator generator = new DefaultGenerator(); + DefaultGeneratorRunner generator = new DefaultGeneratorRunner(); generator.opts(opts); TreeMap paths = config.fromPaths(openAPI.getPaths()); // Assert.assertEquals(result.size(), 1); @@ -351,11 +352,11 @@ public void testRefModelValidationProperties() { OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/2_0/refAliasedPrimitiveWithValidation.yml"); ClientOptInput opts = new ClientOptInput(); opts.openAPI(openAPI); - DefaultCodegen config = new DefaultCodegen(); + DefaultGenerator config = new DefaultGenerator(); config.setStrictSpecBehavior(false); opts.config(config); - DefaultGenerator generator = new DefaultGenerator(); + DefaultGeneratorRunner generator = new DefaultGeneratorRunner(); generator.opts(opts); String expectedPattern = "^\\d{3}-\\d{2}-\\d{4}$"; @@ -418,7 +419,7 @@ public void testBuiltinLibraryTemplates() throws IOException { .setOutputDir(target.toAbsolutePath().toString()); final ClientOptInput clientOptInput = configurator.toClientOptInput(); - DefaultGenerator generator = new DefaultGenerator(false); + DefaultGeneratorRunner generator = new DefaultGeneratorRunner(false); generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); @@ -432,7 +433,7 @@ public void testBuiltinLibraryTemplates() throws IOException { Assert.assertEquals(files.size(), 27); - // Generator should report a library templated file as a generated file + // GeneratorRunner should report a library templated file as a generated file TestUtils.ensureContainsFile(files, output, "src/main/kotlin/org/openapijsonschematools/client/infrastructure/Errors.kt"); // Generated file should exist on the filesystem after generation @@ -460,7 +461,7 @@ public void testBuiltinNonLibraryTemplates() throws IOException { .setOutputDir(target.toAbsolutePath().toString()); final ClientOptInput clientOptInput = configurator.toClientOptInput(); - DefaultGenerator generator = new DefaultGenerator(false); + DefaultGeneratorRunner generator = new DefaultGeneratorRunner(false); generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); @@ -474,7 +475,7 @@ public void testBuiltinNonLibraryTemplates() throws IOException { Assert.assertEquals(files.size(), 27); - // Generator should report README.md as a generated file + // GeneratorRunner should report README.md as a generated file TestUtils.ensureContainsFile(files, output, "README.md"); // Generated file should exist on the filesystem after generation @@ -525,7 +526,7 @@ public void testCustomLibraryTemplates() throws IOException { .setOutputDir(target.toAbsolutePath().toString()); final ClientOptInput clientOptInput = configurator.toClientOptInput(); - DefaultGenerator generator = new DefaultGenerator(false); + DefaultGeneratorRunner generator = new DefaultGeneratorRunner(false); generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); @@ -539,7 +540,7 @@ public void testCustomLibraryTemplates() throws IOException { Assert.assertEquals(files.size(), 27); - // Generator should report a library templated file as a generated file + // GeneratorRunner should report a library templated file as a generated file TestUtils.ensureContainsFile(files, output, "src/main/kotlin/org/openapijsonschematools/client/infrastructure/Errors.kt"); // Generated file should exist on the filesystem after generation @@ -579,7 +580,7 @@ public void testCustomNonLibraryTemplates() throws IOException { .setOutputDir(target.toAbsolutePath().toString()); final ClientOptInput clientOptInput = configurator.toClientOptInput(); - DefaultGenerator generator = new DefaultGenerator(false); + DefaultGeneratorRunner generator = new DefaultGeneratorRunner(false); generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "false"); generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); @@ -593,7 +594,7 @@ public void testCustomNonLibraryTemplates() throws IOException { Assert.assertEquals(files.size(), 27); - // Generator should report README.md as a generated file + // GeneratorRunner should report README.md as a generated file TestUtils.ensureContainsFile(files, output, "README.md"); // Generated file should exist on the filesystem after generation @@ -613,10 +614,10 @@ public void testHandlesTrailingSlashInServers() { OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7533.yaml"); ClientOptInput opts = new ClientOptInput(); opts.openAPI(openAPI); - DefaultCodegen config = new DefaultCodegen(); + DefaultGenerator config = new DefaultGenerator(); config.setStrictSpecBehavior(false); opts.config(config); - final DefaultGenerator generator = new DefaultGenerator(); + final DefaultGeneratorRunner generator = new DefaultGeneratorRunner(); generator.opts(opts); generator.configureGeneratorProperties(); @@ -635,10 +636,10 @@ public void testHandlesRelativeUrlsInServers() { OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_10056.yaml"); ClientOptInput opts = new ClientOptInput(); opts.openAPI(openAPI); - DefaultCodegen config = new DefaultCodegen(); + DefaultGenerator config = new DefaultGenerator(); config.setStrictSpecBehavior(true); opts.config(config); - final DefaultGenerator generator = new DefaultGenerator(); + final DefaultGeneratorRunner generator = new DefaultGeneratorRunner(); generator.opts(opts); generator.configureGeneratorProperties(); @@ -676,7 +677,7 @@ public void testProcessUserDefinedTemplatesWithConfig() throws IOException { .setOutputDir(target.toAbsolutePath().toString()); final ClientOptInput clientOptInput = configurator.toClientOptInput(); - DefaultGenerator generator = new DefaultGenerator(false); + DefaultGeneratorRunner generator = new DefaultGeneratorRunner(false); generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); @@ -693,7 +694,7 @@ public void testProcessUserDefinedTemplatesWithConfig() throws IOException { // TestUtils.ensureContainsFile(files, output, "sampleConfig.json"); // Assert.assertTrue(new File(output, "sampleConfig.json").exists()); - // Generator should report api_client.py as a generated file + // GeneratorRunner should report api_client.py as a generated file TestUtils.ensureContainsFile(files, output, "src/io/something/api_client.py"); // Generated file should exist on the filesystem after generation @@ -715,10 +716,10 @@ public void testRecursionBug4650() { OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/bugs/recursion-bug-4650.yaml"); ClientOptInput opts = new ClientOptInput(); opts.openAPI(openAPI); - DefaultCodegen config = new DefaultCodegen(); + DefaultGenerator config = new DefaultGenerator(); config.setStrictSpecBehavior(false); opts.config(config); - final DefaultGenerator generator = new DefaultGenerator(); + final DefaultGeneratorRunner generator = new DefaultGeneratorRunner(); generator.opts(opts); generator.configureGeneratorProperties(); diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/ExampleGeneratorTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/ExampleGeneratorTestRunner.java similarity index 99% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/ExampleGeneratorTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/ExampleGeneratorTestRunner.java index b5a6d59906e..d46439b0759 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/ExampleGeneratorTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/ExampleGeneratorTestRunner.java @@ -9,7 +9,7 @@ import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertNull; -public class ExampleGeneratorTest { +public class ExampleGeneratorTestRunner { @Test public void generateFromResponseSchemaWithPrimitiveType() { OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/example_generator_test.yaml"); diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGenerator.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java similarity index 86% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGenerator.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java index 78007b7ab6b..1be8ab4a6dd 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGenerator.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java @@ -16,7 +16,8 @@ package org.openapijsonschematools.codegen; import org.openapijsonschematools.codegen.cli.ClientOptInput; -import org.openapijsonschematools.codegen.codegenerator.Generator; +import org.openapijsonschematools.codegen.codegenerator.GeneratorRunner; +import org.openapijsonschematools.codegen.generators.DefaultGenerator; import org.openapijsonschematools.codegen.templating.TemplateManagerOptions; import java.io.File; @@ -29,12 +30,12 @@ import java.util.Map; /** - * Decorates {@link DefaultCodegen and tracks some internal calls}. + * Decorates {@link DefaultGenerator and tracks some internal calls}. * - * @deprecated Please avoid using this type, as it is not a mock and invokes real generation. Prefer {@link DefaultGenerator#DefaultGenerator(Boolean)} with dryRun=true and/or true mocked spies. + * @deprecated Please avoid using this type, as it is not a mock and invokes real generation. Prefer {@link DefaultGeneratorRunner#DefaultGeneratorRunner(Boolean)} with dryRun=true and/or true mocked spies. */ @Deprecated -public class MockDefaultGenerator extends DefaultGenerator { +public class MockDefaultGeneratorRunner extends DefaultGeneratorRunner { public List getTemplateBasedFiles() { return templateBasedFiles; } @@ -47,18 +48,18 @@ public Map getFiles() { private List templateBasedFiles = new ArrayList<>(); private Map files = new HashMap<>(); - public MockDefaultGenerator() { + public MockDefaultGeneratorRunner() { super(true); } - public MockDefaultGenerator(boolean dryRun) { + public MockDefaultGeneratorRunner(boolean dryRun) { super(dryRun); } @Override - public Generator opts(ClientOptInput opts) { - Generator o = super.opts(opts); - TemplateManagerOptions templateManagerOptions = new TemplateManagerOptions(this.config.isEnableMinimalUpdate(),this.config.isSkipOverwrite()); + public GeneratorRunner opts(ClientOptInput opts) { + GeneratorRunner o = super.opts(opts); + TemplateManagerOptions templateManagerOptions = new TemplateManagerOptions(this.generator.isEnableMinimalUpdate(),this.generator.isSkipOverwrite()); this.templateProcessor = new ObservableDryRunTemplateManager(templateManagerOptions); return o; } diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TestUtils.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TestUtils.java index b788b2d46f3..8a9d3350b85 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TestUtils.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TestUtils.java @@ -102,19 +102,19 @@ public static OpenAPI createOpenAPIWithOneSchema(String name, Schema schema) { } /** - * Extract file from {@link MockDefaultGenerator} + * Extract file from {@link MockDefaultGeneratorRunner} * - * @param generator Generator + * @param generator GeneratorRunner * @param root root path * @param filename filename under root * - * @return a {@link MockDefaultGenerator.WrittenTemplateBasedFile} - * @deprecated Since 5.0. Please avoid this method and usage of {@link MockDefaultGenerator}, prefer {@link DefaultGenerator#DefaultGenerator(Boolean)} with dryRun=true. + * @return a {@link MockDefaultGeneratorRunner.WrittenTemplateBasedFile} + * @deprecated Since 5.0. Please avoid this method and usage of {@link MockDefaultGeneratorRunner}, prefer {@link DefaultGeneratorRunner#DefaultGeneratorRunner(Boolean)} with dryRun=true. */ @Deprecated - public static MockDefaultGenerator.WrittenTemplateBasedFile getTemplateBasedFile(MockDefaultGenerator generator, File root, String filename) { + public static MockDefaultGeneratorRunner.WrittenTemplateBasedFile getTemplateBasedFile(MockDefaultGeneratorRunner generator, File root, String filename) { String defaultApiFilename = new File(root, filename).getAbsolutePath().replace("\\", "/"); - Optional optional = generator.getTemplateBasedFiles().stream().filter(f -> defaultApiFilename.equals(f.getOutputFilename())).findFirst(); + Optional optional = generator.getTemplateBasedFiles().stream().filter(f -> defaultApiFilename.equals(f.getOutputFilename())).findFirst(); Assert.assertTrue(optional.isPresent()); return optional.get(); } diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultCodegenTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java similarity index 95% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultCodegenTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java index 5ace3c0f691..476967d5df9 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultCodegenTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.generators; import com.google.common.collect.Sets; import com.samskivert.mustache.Mustache.Lambda; @@ -39,6 +39,8 @@ import io.swagger.v3.oas.models.responses.ApiResponses; import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.parser.core.models.ParseOptions; +import org.openapijsonschematools.codegen.DefaultGeneratorRunner; +import org.openapijsonschematools.codegen.TestUtils; import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.model.CodegenDiscriminator; import org.openapijsonschematools.codegen.model.CodegenEncoding; @@ -84,14 +86,14 @@ import static org.testng.Assert.fail; -public class DefaultCodegenTest { +public class DefaultGeneratorTest { private String getOperationPath(String operationPath, String httpMethod) { return "#/paths/" + ModelUtils.encodeSlashes(operationPath) + "/" + httpMethod; } @Test public void testDeeplyNestedAdditionalPropertiesImports() { - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); final OpenAPI openApi = TestUtils.parseFlattenSpec("src/test/resources/3_0/additional-properties-deeply-nested.yaml"); codegen.setOpenAPI(openApi); PathItem path = openApi.getPaths().get("/ping"); @@ -101,7 +103,7 @@ public void testDeeplyNestedAdditionalPropertiesImports() { @Test public void testRefedEnumParameter() { - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.addSchemaImportsFromV3SpecLocations = true; final OpenAPI openApi = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_12445.yaml"); codegen.setOpenAPI(openApi); @@ -135,7 +137,7 @@ public void testHasBodyParameter() { openAPI.setComponents(new Components()); openAPI.getComponents().addSchemas("Pet", new ObjectSchema()); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); Assert.assertFalse(codegen.hasBodyParameter(openAPI, pingOperation)); Assert.assertTrue(codegen.hasBodyParameter(openAPI, createOperation)); @@ -143,7 +145,7 @@ public void testHasBodyParameter() { @Test(expectedExceptions = RuntimeException.class) public void testParameterEmptyDescription() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); codegen.fromRequestBody(null, null); } @@ -171,13 +173,13 @@ public void testGetConsumesInfoAndGetProducesInfo() throws Exception { .responses( new ApiResponses().addApiResponse("201", new ApiResponse() .description("Created response"))); - Set createConsumesInfo = DefaultCodegen.getConsumesInfo(openAPI, createOperation); + Set createConsumesInfo = DefaultGenerator.getConsumesInfo(openAPI, createOperation); Assert.assertEquals(createConsumesInfo.size(), 2); Assert.assertTrue(createConsumesInfo.contains("application/json"), "contains 'application/json'"); Assert.assertTrue(createConsumesInfo.contains("application/xml"), "contains 'application/xml'"); - Set createProducesInfo = DefaultCodegen.getProducesInfo(openAPI, createOperation); + Set createProducesInfo = DefaultGenerator.getProducesInfo(openAPI, createOperation); Assert.assertEquals(createProducesInfo.size(), 0); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); CodegenOperation coCreate = codegen.fromOperation(createOperation, getOperationPath("somepath", "post")); Assert.assertTrue(!coCreate.requestBody.content.isEmpty()); @@ -187,10 +189,10 @@ public void testGetConsumesInfoAndGetProducesInfo() throws Exception { Operation updateOperationWithRef = new Operation() .requestBody(new RequestBody().$ref("#/components/requestBodies/MyRequestBody")) .responses(new ApiResponses().addApiResponse("201", new ApiResponse().$ref("#/components/responses/MyResponse"))); - Set updateConsumesInfo = DefaultCodegen.getConsumesInfo(openAPI, updateOperationWithRef); + Set updateConsumesInfo = DefaultGenerator.getConsumesInfo(openAPI, updateOperationWithRef); Assert.assertEquals(updateConsumesInfo.size(), 1); Assert.assertTrue(updateConsumesInfo.contains("application/json"), "contains 'application/json'"); - Set updateProducesInfo = DefaultCodegen.getProducesInfo(openAPI, updateOperationWithRef); + Set updateProducesInfo = DefaultGenerator.getProducesInfo(openAPI, updateOperationWithRef); Assert.assertEquals(updateProducesInfo.size(), 1); Assert.assertTrue(updateProducesInfo.contains("application/xml"), "contains 'application/xml'"); @@ -207,7 +209,7 @@ public void testGetConsumesInfoAndGetProducesInfo() throws Exception { @Test public void testGetProducesInfo() throws Exception { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/produces.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); Operation textOperation = openAPI.getPaths().get("/ping/text").getGet(); @@ -232,7 +234,7 @@ public void testGetProducesInfo() throws Exception { @Test public void testInitialConfigValues() throws Exception { - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.processOpts(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE); @@ -241,7 +243,7 @@ public void testInitialConfigValues() throws Exception { @Test public void testSettersForConfigValues() throws Exception { - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setHideGenerationTimestamp(false); codegen.processOpts(); @@ -251,7 +253,7 @@ public void testSettersForConfigValues() throws Exception { @Test public void testAdditionalPropertiesPutForConfigValues() throws Exception { - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.additionalProperties().put(CodegenConstants.HIDE_GENERATION_TIMESTAMP, false); codegen.processOpts(); @@ -262,7 +264,7 @@ public void testAdditionalPropertiesPutForConfigValues() throws Exception { @Test public void testDateTimeFormParameterHasDefaultValue() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); RequestBody reqBody = openAPI.getPaths().get("/thingy/{date}").getPost().getRequestBody(); @@ -293,7 +295,7 @@ public void testOriginalOpenApiDocumentVersion() { @Test public void testAdditionalPropertiesV3SpecDisallowAdditionalPropertiesIfNotPresentFalse() { OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/python/petstore_customized.yaml"); - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); codegen.setDisallowAdditionalPropertiesIfNotPresent(false); codegen.supportsAdditionalPropertiesWithComposedSchema = true; codegen.setOpenAPI(openAPI); @@ -412,7 +414,7 @@ public void testAdditionalPropertiesV3SpecDisallowAdditionalPropertiesIfNotPrese // However, in legacy 'additionalProperties' mode, this is interpreted as // 'no additional properties are allowed'. OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml"); - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); codegen.setDisallowAdditionalPropertiesIfNotPresent(true); codegen.setOpenAPI(openAPI); @@ -426,7 +428,7 @@ public void testAdditionalPropertiesV3SpecDisallowAdditionalPropertiesIfNotPrese @Test public void testEnsureNoDuplicateProduces() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/two-responses.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); Operation operation = openAPI.getPaths().get("/test").getGet(); @@ -439,7 +441,7 @@ public void testEnsureNoDuplicateProduces() { @Test public void testComposedSchemaOneOfWithProperties() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/oneOf.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); final Schema schema = openAPI.getComponents().getSchemas().get("fruit"); codegen.setOpenAPI(openAPI); @@ -457,7 +459,7 @@ public void testComposedSchemaOneOfWithProperties() { @Test public void testEscapeText() { - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); Assert.assertEquals(codegen.escapeText("\n"), " "); Assert.assertEquals(codegen.escapeText("\r"), " "); @@ -469,7 +471,7 @@ public void testEscapeText() { @Test public void testEscapeTextWhileAllowingNewLines() { - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); // allow new lines Assert.assertEquals(codegen.escapeTextWhileAllowingNewLines("\n"), "\n"); @@ -495,7 +497,7 @@ public void updateCodegenPropertyEnum() { @Test public void updateCodegenPropertyEnumWithExtension() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); { CodegenSchema enumProperty = codegenProperty(codegen, Arrays.asList("dog", "cat"), "updateCodegenPropertyEnumWithExtension1", Arrays.asList("DOGVAR", "CATVAR")); LinkedHashMap enumVars = enumProperty.items.enumInfo.valueToName; @@ -528,7 +530,7 @@ public void updateCodegenPropertyEnumWithExtension() { @Test public void updateCodegenPropertyEnumWithPrefixRemoved() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); CodegenSchema enumProperty = codegenProperty(codegen, Arrays.asList("animal_dog", "animal_cat"), "updateCodegenPropertyEnumWithPrefixRemoved", null); Map enumVars = enumProperty.items.enumInfo.valueToName; @@ -539,7 +541,7 @@ public void updateCodegenPropertyEnumWithPrefixRemoved() { @Test public void updateCodegenPropertyEnumWithoutPrefixRemoved() { - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setRemoveEnumValuePrefix(false); CodegenSchema enumProperty = codegenProperty(codegen, Arrays.asList("animal_dog", "animal_cat"), "updateCodegenPropertyEnumWithoutPrefixRemoved", null); @@ -552,7 +554,7 @@ public void updateCodegenPropertyEnumWithoutPrefixRemoved() { @Test public void postProcessModelsEnumWithPrefixRemoved() { - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); TreeMap schemas = codegenModel(codegen, Arrays.asList("animal_dog", "animal_cat"), "postProcessModelsEnumWithPrefixRemoved", null, null); CodegenSchema cm = schemas.get("model"); @@ -564,7 +566,7 @@ public void postProcessModelsEnumWithPrefixRemoved() { @Test public void postProcessModelsEnumWithoutPrefixRemoved() { - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setRemoveEnumValuePrefix(false); TreeMap objs = codegenModel(codegen, Arrays.asList("animal_dog", "animal_cat"), "postProcessModelsEnumWithoutPrefixRemoved", null, null); CodegenSchema cm = objs.get("model"); @@ -577,7 +579,7 @@ public void postProcessModelsEnumWithoutPrefixRemoved() { @Test public void postProcessModelsEnumWithExtension() { - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); TreeMap objs = codegenModel(codegen, Arrays.asList("animal_dog", "animal_cat"), "postProcessModelsEnumWithExtension", Arrays.asList("DOGVAR", "CATVAR"), Arrays.asList("This is a dog", "This is a cat")); CodegenSchema cm = objs.get("model"); @@ -590,7 +592,7 @@ public void postProcessModelsEnumWithExtension() { @Test public void testExample1() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/examples.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); PathItem path = openAPI.getPaths().get("/example1/singular"); CodegenOperation op = codegen.fromOperation(path.getGet(), getOperationPath("/example1/singular", "get")); @@ -604,7 +606,7 @@ public void testExample1() { @Test public void testExample2() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/examples.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); PathItem path = openAPI.getPaths().get("/example2/singular"); CodegenOperation op = codegen.fromOperation(path.getGet(), getOperationPath("/example2/singular", "get")); @@ -614,7 +616,7 @@ public void testExample2() { @Test public void testExample3() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/examples.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); PathItem path = openAPI.getPaths().get("/example3/singular"); CodegenOperation op = codegen.fromOperation(path.getGet(), getOperationPath("/example3/singular", "get")); @@ -628,7 +630,7 @@ public void testExample3() { @Test public void testDiscriminator() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml"); - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); Schema animal = openAPI.getComponents().getSchemas().get("Animal"); codegen.setOpenAPI(openAPI); @@ -653,7 +655,7 @@ public void testDiscriminator() { @Test public void testDiscriminatorWithCustomMapping() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/allOf.yaml"); - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); codegen.setLegacyDiscriminatorBehavior(false); codegen.setOpenAPI(openAPI); @@ -671,7 +673,7 @@ public void testDiscriminatorWithCustomMapping() { @Test public void testAllOfRequired() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/allOf-required.yaml"); - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); Schema child = openAPI.getComponents().getSchemas().get("clubForCreation"); codegen.setOpenAPI(openAPI); @@ -686,7 +688,7 @@ public void testAllOfRequired() { @Test public void testComposedSchemaAllOfDiscriminatorMap() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/allOf_composition_discriminator.yaml"); - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.setLegacyDiscriminatorBehavior(false); Schema sc; @@ -823,7 +825,7 @@ public void testComposedSchemaAllOfDiscriminatorMap() { @Test public void testComposedSchemaAllOfDiscriminatorMapLegacy() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/allOf_composition_discriminator.yaml"); - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); // codegen.legacyDiscriminatorBehavior remains false in the legacy use case codegen.setOpenAPI(openAPI); Schema sc; @@ -938,7 +940,7 @@ public void testComposedSchemaAllOfDiscriminatorMapLegacy() { @Test public void testComposedSchemaOneOfDiscriminatorsInvalid() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/oneOfDiscriminator.yaml"); - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); codegen.setLegacyDiscriminatorBehavior(false); codegen.setOpenAPI(openAPI); @@ -970,7 +972,7 @@ public void testComposedSchemaOneOfDiscriminatorsInvalid() { @Test public void testComposedSchemaAnyOfDiscriminatorsInvalid() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/anyOfDiscriminator.yaml"); - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); codegen.setLegacyDiscriminatorBehavior(false); codegen.setOpenAPI(openAPI); @@ -1002,7 +1004,7 @@ public void testComposedSchemaAnyOfDiscriminatorsInvalid() { @Test public void testComposedSchemaAnyOfDiscriminatorMap() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/anyOfDiscriminator.yaml"); - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); codegen.setLegacyDiscriminatorBehavior(false); codegen.setOpenAPI(openAPI); @@ -1111,7 +1113,7 @@ public void testComposedSchemaAnyOfDiscriminatorMap() { @Test public void testComposedSchemaOneOfDiscriminatorMap() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/oneOfDiscriminator.yaml"); - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); codegen.setLegacyDiscriminatorBehavior(false); codegen.setOpenAPI(openAPI); @@ -1220,7 +1222,7 @@ public void testComposedSchemaOneOfDiscriminatorMap() { public void testComposedSchemaMyPetsOneOfDiscriminatorMap() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/allOf_composition_discriminator.yaml"); - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); codegen.setLegacyDiscriminatorBehavior(false); codegen.setOpenAPI(openAPI); @@ -1237,7 +1239,7 @@ public void testComposedSchemaMyPetsOneOfDiscriminatorMap() { public void testComposedSchemaAllOfHierarchy() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/allOf_composition_discriminator.yaml"); - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); codegen.setLegacyDiscriminatorBehavior(false); codegen.setOpenAPI(openAPI); @@ -1263,7 +1265,7 @@ private void verifyLizardDiscriminator(CodegenDiscriminator discriminator) { String propertyName = prop; Map mapping = null; TreeSet mappedModels = new TreeSet<>(); - CodegenKey testPropName = new DefaultCodegen().getKey(propertyName, "misc"); + CodegenKey testPropName = new DefaultGenerator().getKey(propertyName, "misc"); CodegenDiscriminator test = new CodegenDiscriminator(testPropName, mapping, mappedModels); assertEquals(discriminator, test); } @@ -1275,7 +1277,7 @@ private void verifyReptileDiscriminator(CodegenDiscriminator discriminator) { TreeSet mappedModels = new TreeSet<>(); mappedModels.add(new CodegenDiscriminator.MappedModel("Lizard", "Lizard")); mappedModels.add(new CodegenDiscriminator.MappedModel("Snake", "Snake")); - CodegenKey expectedDiscriminatorPropName = new DefaultCodegen().getKey(propertyName, "misc"); + CodegenKey expectedDiscriminatorPropName = new DefaultGenerator().getKey(propertyName, "misc"); CodegenDiscriminator expectedDiscriminator = new CodegenDiscriminator(expectedDiscriminatorPropName, mapping, mappedModels); assertEquals(discriminator, expectedDiscriminator); } @@ -1287,7 +1289,7 @@ private void verifyMyPetsDiscriminator(CodegenDiscriminator discriminator) { TreeSet mappedModels = new TreeSet<>(); mappedModels.add(new CodegenDiscriminator.MappedModel("Cat", "Cat")); mappedModels.add(new CodegenDiscriminator.MappedModel("Lizard", "Lizard")); - CodegenKey expectedDiscriminatorPropName = new DefaultCodegen().getKey(propertyName, "misc"); + CodegenKey expectedDiscriminatorPropName = new DefaultGenerator().getKey(propertyName, "misc"); CodegenDiscriminator expectedDiscriminator = new CodegenDiscriminator(expectedDiscriminatorPropName, mapping, mappedModels); assertEquals(discriminator, expectedDiscriminator); } @@ -1295,21 +1297,21 @@ private void verifyMyPetsDiscriminator(CodegenDiscriminator discriminator) { @Test public void verifyXDiscriminatorValue() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/2_0/x-discriminator-value.yaml"); - final DefaultCodegen config = new DefaultCodegen(); + final DefaultGenerator config = new DefaultGenerator(); config.setOpenAPI(openAPI); String modelName; CodegenSchema cm; Boolean dryRun = Boolean.TRUE; - final DefaultGenerator generator = new DefaultGenerator(dryRun); - generator.openAPI = openAPI; - generator.config = config; - generator.configureGeneratorProperties(); + final DefaultGeneratorRunner runner = new DefaultGeneratorRunner(dryRun); + runner.openAPI = openAPI; + runner.generator = config; + runner.configureGeneratorProperties(); // check that the model's children contain the x-discriminator-values modelName = "BaseObj"; - cm = generator.config.fromSchema( + cm = runner.generator.fromSchema( openAPI.getComponents().getSchemas().get(modelName), "#/components/schemas/" + modelName, "#/components/schemas/" + modelName @@ -1324,7 +1326,7 @@ public void verifyXDiscriminatorValue() { mappedModels.add(new CodegenDiscriminator.MappedModel("DailySubObj", "DailySubObj")); mappedModels.add(new CodegenDiscriminator.MappedModel("sub-obj", "SubObj")); mappedModels.add(new CodegenDiscriminator.MappedModel("SubObj", "SubObj")); - CodegenKey expectedDiscriminatorPropName = new DefaultCodegen().getKey(propertyName, "misc"); + CodegenKey expectedDiscriminatorPropName = new DefaultGenerator().getKey(propertyName, "misc"); CodegenDiscriminator expectedDiscriminator = new CodegenDiscriminator(expectedDiscriminatorPropName, mapping, mappedModels); assertEquals(cm.discriminator, expectedDiscriminator); } @@ -1333,7 +1335,7 @@ public void verifyXDiscriminatorValue() { @Test public void testAllOfSingleRefNoOwnProps() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/2_0/composed-allof.yaml"); - final DefaultCodegen codegen = new CodegenWithMultipleInheritance(); + final DefaultGenerator codegen = new GeneratorWithMultipleInheritance(); Schema schema = openAPI.getComponents().getSchemas().get("NewMessageEventCoreNoOwnProps"); codegen.setOpenAPI(openAPI); @@ -1351,7 +1353,7 @@ public void testAllOfSingleRefNoOwnProps() { @Test public void testAllOfParent() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/allOf-required-parent.yaml"); - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); Schema person = openAPI.getComponents().getSchemas().get("person"); @@ -1386,7 +1388,7 @@ public void testLeadingSlashIsAddedIfMissing() { openAPI.path("/here", new PathItem().get(operation1)); Operation operation2 = new Operation().operationId("op2").responses(new ApiResponses().addApiResponse("201", new ApiResponse().description("OK"))); openAPI.path("some/path", new PathItem().get(operation2)); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.preprocessOpenAPI(openAPI); codegen.setOpenAPI(openAPI); @@ -1408,7 +1410,7 @@ public void testDefaultResponseShouldBeLast() { "422", new ApiResponse().description("Error")) ); openAPI.path("/here", new PathItem().get(myOperation)); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); CodegenOperation co = codegen.fromOperation(myOperation, getOperationPath("/here", "get")); @@ -1427,7 +1429,7 @@ public void testResponseWithNoSchemaInHeaders() { .style(Header.StyleEnum.SIMPLE)); Operation operation1 = new Operation().operationId("op1").responses(new ApiResponses().addApiResponse("2XX", response2XX)); openAPI.path("/here", new PathItem().get(operation1)); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); CodegenResponse cr = codegen.fromResponse(response2XX, ""); @@ -1438,7 +1440,7 @@ public void testResponseWithNoSchemaInHeaders() { @Test public void testNullableProperty() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/examples.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); CodegenSchema userModel = codegen.fromSchema( @@ -1453,7 +1455,7 @@ public void testNullableProperty() { @Test public void testDeprecatedModel() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/component-deprecated.yml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); CodegenSchema codegenPetModel = codegen.fromSchema( openAPI.getComponents().getSchemas().get("Pet"), @@ -1473,7 +1475,7 @@ public void testDeprecatedModel() { @Test public void testDeprecatedProperty() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/property-deprecated.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); final Map responseProperties = Collections.unmodifiableMap(openAPI.getComponents().getSchemas().get("Response").getProperties()); @@ -1504,7 +1506,7 @@ public void testDeprecatedProperty() { @Test public void testDeprecatedRef() { final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/model-deprecated.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); final Map requestProperties = openAPI.getComponents().getSchemas().get("complex").getProperties(); @@ -1530,7 +1532,7 @@ public void testDeprecatedRef() { public void integerSchemaPropertyAndModelTest() { OpenAPI openAPI = TestUtils.createOpenAPI(); final Schema schema = new IntegerSchema().format("int32"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); //Property: @@ -1558,7 +1560,7 @@ public void integerSchemaPropertyAndModelTest() { public void longSchemaPropertyAndModelTest() { OpenAPI openAPI = TestUtils.createOpenAPI(); final Schema schema = new IntegerSchema().format("int64"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); //Property: @@ -1588,7 +1590,7 @@ public void longSchemaPropertyAndModelTest() { public void numberSchemaPropertyAndModelTest() { OpenAPI openAPI = TestUtils.createOpenAPI(); final Schema schema = new NumberSchema(); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); //Property: @@ -1616,7 +1618,7 @@ public void numberSchemaPropertyAndModelTest() { public void numberFloatSchemaPropertyAndModelTest() { OpenAPI openAPI = TestUtils.createOpenAPI(); final Schema schema = new NumberSchema().format("float"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); //Property: @@ -1646,7 +1648,7 @@ public void numberFloatSchemaPropertyAndModelTest() { public void numberDoubleSchemaPropertyAndModelTest() { OpenAPI openAPI = TestUtils.createOpenAPI(); final Schema schema = new NumberSchema().format("double"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); //Property: @@ -1676,7 +1678,7 @@ public void numberDoubleSchemaPropertyAndModelTest() { public void testAlias() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/type_alias.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.fromSchema( @@ -1704,7 +1706,7 @@ private void verifyPersonDiscriminator(CodegenDiscriminator discriminator) { mappedModels.add(new CodegenDiscriminator.MappedModel("c", "Child")); mappedModels.add(new CodegenDiscriminator.MappedModel("Adult", "Adult")); mappedModels.add(new CodegenDiscriminator.MappedModel("Child", "Child")); - CodegenKey expectedDiscriminatorPropName = new DefaultCodegen().getKey(propertyName, "misc"); + CodegenKey expectedDiscriminatorPropName = new DefaultGenerator().getKey(propertyName, "misc"); CodegenDiscriminator expectedDiscriminator = new CodegenDiscriminator(expectedDiscriminatorPropName, mapping, mappedModels); Assert.assertEquals(discriminator, expectedDiscriminator); } @@ -1715,12 +1717,12 @@ private CodegenSchema codegenPropertyWithArrayOfIntegerValues() { ArraySchema arraySchema = new ArraySchema(); arraySchema.setItems(itemsSchema); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); String jsonPath = "#/components/schemas/codegenPropertyWithArrayOfIntegerValues"; return codegen.fromSchema(arraySchema, jsonPath, jsonPath); } - private CodegenSchema codegenProperty(DefaultCodegen codegen, List values, String identifier, List xEnumVarnames) { + private CodegenSchema codegenProperty(DefaultGenerator codegen, List values, String identifier, List xEnumVarnames) { StringSchema itemsSchema = new StringSchema(); itemsSchema.setEnum(values); if (xEnumVarnames != null) { @@ -1734,7 +1736,7 @@ private CodegenSchema codegenProperty(DefaultCodegen codegen, List value return codegen.fromSchema(arraySchema, jsonPath, jsonPath); } - private TreeMap codegenModel(DefaultCodegen codegen, List values, String identifier, List xEnumVarnames, List xEnumDescriptions) { + private TreeMap codegenModel(DefaultGenerator codegen, List values, String identifier, List xEnumVarnames, List xEnumDescriptions) { StringSchema itemsSchema = new StringSchema(); itemsSchema.setEnum(values); if (xEnumVarnames != null || xEnumDescriptions != null) { @@ -1756,7 +1758,7 @@ private TreeMap codegenModel(DefaultCodegen codegen, List @Test public void modelDoNotContainInheritedVars() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); codegen.supportsInheritance = true; final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/generic.yaml"); @@ -1773,7 +1775,7 @@ public void modelDoNotContainInheritedVars() { @Test public void schemaMapping() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); codegen.schemaMapping.put("TypeAlias", "foo.bar.TypeAlias"); OpenAPI openAPI = new OpenAPIParser() @@ -1793,7 +1795,7 @@ public void schemaMapping() { @Test public void modelWithPrefixDoNotContainInheritedVars() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); codegen.supportsInheritance = true; codegen.setModelNamePrefix("prefix"); @@ -1811,7 +1813,7 @@ public void modelWithPrefixDoNotContainInheritedVars() { @Test public void modelWithSuffixDoNotContainInheritedVars() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); codegen.supportsInheritance = true; codegen.setModelNameSuffix("suffix"); @@ -1830,7 +1832,7 @@ public void modelWithSuffixDoNotContainInheritedVars() { @Test public void arrayInnerReferencedSchemaMarkedAsModel_30() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/arrayRefBody.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); RequestBody body = openAPI.getPaths().get("/examples").getPost().getRequestBody(); @@ -1847,7 +1849,7 @@ public void arrayInnerReferencedSchemaMarkedAsModel_30() { @SuppressWarnings("unchecked") public void commonLambdasRegistrationTest() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); Object lambdasObj = codegen.additionalProperties.get("lambda"); assertNotNull(lambdasObj, "Expecting lambda in additionalProperties"); @@ -1866,14 +1868,14 @@ public void commonLambdasRegistrationTest() { @Test public void convertApiNameWithEmptySuffix() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); assertEquals(codegen.toApiName("Fake"), "FakeApi"); assertEquals(codegen.toApiName(""), "DefaultApi"); } @Test public void convertApiNameWithSuffix() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); codegen.setApiNameSuffix("Test"); assertEquals(codegen.toApiName("Fake"), "FakeTest"); assertEquals(codegen.toApiName(""), "DefaultApi"); @@ -1926,7 +1928,7 @@ public void testFormComposedSchema() { " type: string\n" + " format: password\n"); - final DefaultCodegen cg = new DefaultCodegen(); + final DefaultGenerator cg = new DefaultGenerator(); cg.setOpenAPI(openAPI); cg.preprocessOpenAPI(openAPI); @@ -1941,7 +1943,7 @@ public void testFormComposedSchema() { @Test public void inlineAllOfSchemaDoesNotThrowException() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue7262.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); String modelName = "UserTimeBase"; @@ -1971,7 +1973,7 @@ public void inlineAllOfSchemaDoesNotThrowException() { @Test public void arrayModelHasValidation() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue7356.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); String modelName = "ArrayWithValidations"; @@ -1987,7 +1989,7 @@ public void arrayModelHasValidation() { @Test public void testOauthMultipleFlows() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7193.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); final Map securitySchemes = openAPI.getComponents().getSecuritySchemes(); @@ -2005,7 +2007,7 @@ public void testOauthMultipleFlows() { @Test public void testItemsPresent() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7613.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); String modelName; @@ -2054,7 +2056,7 @@ public void testItemsPresent() { @Test public void testAdditionalPropertiesPresentInModels() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7613.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.setDisallowAdditionalPropertiesIfNotPresent(false); @@ -2113,7 +2115,7 @@ public void testAdditionalPropertiesPresentInModels() { @Test public void testAdditionalPropertiesPresentInModelProperties() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7613.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.setDisallowAdditionalPropertiesIfNotPresent(false); @@ -2180,7 +2182,7 @@ public void testAdditionalPropertiesPresentInModelProperties() { @Test public void testAdditionalPropertiesPresentInParameters() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7613.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.setDisallowAdditionalPropertiesIfNotPresent(false); @@ -2243,7 +2245,7 @@ public void testAdditionalPropertiesPresentInParameters() { @Test public void testAdditionalPropertiesPresentInResponses() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7613.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.setDisallowAdditionalPropertiesIfNotPresent(false); @@ -2317,7 +2319,7 @@ public void testAdditionalPropertiesPresentInResponses() { @Test public void testAdditionalPropertiesAnyType() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_9282.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); Schema sc; @@ -2347,7 +2349,7 @@ public void testAdditionalPropertiesAnyType() { @Test public void testIsXPresence() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7651.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); String modelName; @@ -2489,7 +2491,7 @@ public void testIsXPresence() { @Test public void testModelGetHasValidation() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7651.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); Schema sc; @@ -2561,7 +2563,7 @@ public void testModelGetHasValidation() { @Test public void testPropertyGetHasValidation() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7651.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); String modelName = "ObjectWithPropertiesThatHaveValidations"; @@ -2582,7 +2584,7 @@ public void testPropertyGetHasValidation() { @Test public void testQueryParametersGetHasValidation() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7651.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); String path = "/queryParametersWithValidation"; @@ -2598,7 +2600,7 @@ public void testQueryParametersGetHasValidation() { @Test public void testHeaderParametersGetHasValidation() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7651.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); String path = "/headerParametersWithValidation"; @@ -2614,7 +2616,7 @@ public void testHeaderParametersGetHasValidation() { @Test public void testCookieParametersGetHasValidation() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7651.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); String path = "/cookieParametersWithValidation"; @@ -2630,7 +2632,7 @@ public void testCookieParametersGetHasValidation() { @Test public void testPathParametersGetHasValidation() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7651.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); String path = "/pathParametersWithValidation"; @@ -2646,7 +2648,7 @@ public void testPathParametersGetHasValidation() { @Test public void testBodyAndResponseGetHasValidation() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7651.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); List modelNames = Arrays.asList( @@ -2719,7 +2721,7 @@ public void testBodyAndResponseGetHasValidation() { @Test public void testVarsAndRequiredVarsPresent() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7613.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.setDisallowAdditionalPropertiesIfNotPresent(false); @@ -2770,7 +2772,7 @@ public void testVarsAndRequiredVarsPresent() { @Test public void testHasVarsInModel() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7613.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.setDisallowAdditionalPropertiesIfNotPresent(false); @@ -2816,7 +2818,7 @@ public void testHasVarsInModel() { @Test public void testHasVarsInProperty() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7613.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.setDisallowAdditionalPropertiesIfNotPresent(false); @@ -2869,7 +2871,7 @@ public void testHasVarsInProperty() { @Test public void testHasVarsInParameter() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7613.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.setDisallowAdditionalPropertiesIfNotPresent(false); @@ -2895,7 +2897,7 @@ public void testHasVarsInParameter() { @Test public void testHasVarsInResponse() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7613.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.setDisallowAdditionalPropertiesIfNotPresent(false); @@ -2919,7 +2921,7 @@ public void testHasVarsInResponse() { @Test public void testHasRequiredInModel() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_8906.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.setDisallowAdditionalPropertiesIfNotPresent(false); @@ -2978,7 +2980,7 @@ public void testHasRequiredInModel() { @Test public void testHasRequiredInProperties() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_8906.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.setDisallowAdditionalPropertiesIfNotPresent(false); @@ -3018,7 +3020,7 @@ public void testHasRequiredInProperties() { @Test public void testHasRequiredInParameters() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_8906.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.setDisallowAdditionalPropertiesIfNotPresent(false); @@ -3061,7 +3063,7 @@ public void testHasRequiredInParameters() { @Test public void testHasRequiredInResponses() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_8906.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.setDisallowAdditionalPropertiesIfNotPresent(false); @@ -3098,7 +3100,7 @@ public void testHasRequiredInResponses() { @Test public void testBooleansSetForIntSchemas() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_9447.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.setDisallowAdditionalPropertiesIfNotPresent(false); @@ -3211,7 +3213,7 @@ public void testBooleansSetForIntSchemas() { @Test public void testRemoveOperationIdPrefix() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/bugs/issue_9719.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.setDisallowAdditionalPropertiesIfNotPresent(false); @@ -3277,7 +3279,7 @@ public void testRemoveOperationIdPrefix() { @Test @Ignore public void testComposedPropertyTypes() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_10330.yaml"); codegen.setOpenAPI(openAPI); String modelName; @@ -3303,7 +3305,7 @@ public void testComposedPropertyTypes() { @Test public void testComposedModelTypes() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_10330.yaml"); codegen.setOpenAPI(openAPI); String modelName; @@ -3375,7 +3377,7 @@ public void testComposedModelTypes() { @Test public void testComposedResponseTypes() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_10330.yaml"); codegen.setOpenAPI(openAPI); String path; @@ -3426,7 +3428,7 @@ public void testComposedResponseTypes() { @Test public void testComposedRequestBodyTypes() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_10330.yaml"); codegen.setOpenAPI(openAPI); String path; @@ -3477,7 +3479,7 @@ public void testComposedRequestBodyTypes() { @Test public void testComposedRequestQueryParamTypes() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_10330.yaml"); codegen.setOpenAPI(openAPI); String path; @@ -3527,7 +3529,7 @@ public void testComposedRequestQueryParamTypes() { @Test public void testByteArrayTypeInSchemas() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_10725.yaml"); codegen.setOpenAPI(openAPI); String path; @@ -3559,7 +3561,7 @@ public void testByteArrayTypeInSchemas() { @Test public void testResponses() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/response-tests.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.setDisallowAdditionalPropertiesIfNotPresent(false); @@ -3600,7 +3602,7 @@ public void testResponses() { @Test public void testRequestParameterContent() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/content-data.yaml"); codegen.setOpenAPI(openAPI); String path; @@ -3635,7 +3637,7 @@ public void testRequestParameterContent() { @Test public void testRequestBodyContent() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/content-data.yaml"); codegen.setOpenAPI(openAPI); String path; @@ -3708,7 +3710,7 @@ public void testRequestBodyContent() { @Test public void testResponseContentAndHeader() { - DefaultCodegen codegen = new DefaultCodegen(); + DefaultGenerator codegen = new DefaultGenerator(); final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/content-data.yaml"); codegen.setOpenAPI(openAPI); String path; @@ -3793,7 +3795,7 @@ public void testResponseContentAndHeader() { @Test public void testUnalias() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/schema-unalias-test.yml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); Schema requestBodySchema = ModelUtils.getSchemaFromRequestBody( @@ -3817,7 +3819,7 @@ public void testUnalias() { @Test public void testFromPropertyRequiredAndOptional() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_12857.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); codegen.setDisallowAdditionalPropertiesIfNotPresent(false); @@ -3848,7 +3850,7 @@ public void testFromPropertyRequiredAndOptional() { @Test public void testAssigning310SpecWorks() { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_1/petstore.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); assertEquals(openAPI, codegen.openAPI); } @@ -3856,7 +3858,7 @@ public void testAssigning310SpecWorks() { public static class FromParameter { private CodegenParameter codegenParameter(String path) { final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/fromParameter.yaml"); - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); codegen.setOpenAPI(openAPI); return codegen @@ -3885,7 +3887,7 @@ public void setShouldExplode() { @Test public void testConvertPropertyToBooleanAndWriteBack_Boolean_true() { - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); Map additionalProperties = codegen.additionalProperties(); additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, true); boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL); @@ -3894,7 +3896,7 @@ public void testConvertPropertyToBooleanAndWriteBack_Boolean_true() { @Test public void testConvertPropertyToBooleanAndWriteBack_Boolean_false() { - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); Map additionalProperties = codegen.additionalProperties(); additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, false); boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL); @@ -3903,7 +3905,7 @@ public void testConvertPropertyToBooleanAndWriteBack_Boolean_false() { @Test public void testConvertPropertyToBooleanAndWriteBack_String_true() { - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); Map additionalProperties = codegen.additionalProperties(); additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, "true"); boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL); @@ -3912,7 +3914,7 @@ public void testConvertPropertyToBooleanAndWriteBack_String_true() { @Test public void testConvertPropertyToBooleanAndWriteBack_String_false() { - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); Map additionalProperties = codegen.additionalProperties(); additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, "false"); boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL); @@ -3921,7 +3923,7 @@ public void testConvertPropertyToBooleanAndWriteBack_String_false() { @Test public void testConvertPropertyToBooleanAndWriteBack_String_blibb() { - final DefaultCodegen codegen = new DefaultCodegen(); + final DefaultGenerator codegen = new DefaultGenerator(); Map additionalProperties = codegen.additionalProperties(); additionalProperties.put(CodegenConstants.SERIALIZABLE_MODEL, "blibb"); boolean result = codegen.convertPropertyToBooleanAndWriteBack(CodegenConstants.SERIALIZABLE_MODEL); @@ -3929,8 +3931,8 @@ public void testConvertPropertyToBooleanAndWriteBack_String_blibb() { } } - class CodegenWithMultipleInheritance extends DefaultCodegen { - public CodegenWithMultipleInheritance() { + class GeneratorWithMultipleInheritance extends DefaultGenerator { + public GeneratorWithMultipleInheritance() { super(); supportsInheritance = true; supportsMultipleInheritance = true; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/languages/features/DocumentationProviderFeaturesTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/features/DocumentationProviderFeaturesTest.java similarity index 96% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/languages/features/DocumentationProviderFeaturesTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/features/DocumentationProviderFeaturesTest.java index ec81e695de1..92221e45e31 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/languages/features/DocumentationProviderFeaturesTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/features/DocumentationProviderFeaturesTest.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.languages.features; +package org.openapijsonschematools.codegen.generators.features; import java.util.Arrays; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/AbstractJavaCodegenExampleValuesTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/AbstractJavaCodegenExampleValuesTest.java index 36891e02ad8..9e6e117e812 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/AbstractJavaCodegenExampleValuesTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/AbstractJavaCodegenExampleValuesTest.java @@ -20,9 +20,9 @@ import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; +import org.openapijsonschematools.codegen.generators.AbstractJavaGenerator; import org.openapijsonschematools.codegen.model.CodegenParameter; -import org.openapijsonschematools.codegen.codegenerator.CodegenType; -import org.openapijsonschematools.codegen.languages.AbstractJavaCodegen; +import org.openapijsonschematools.codegen.codegenerator.GeneratorType; import org.testng.Assert; import org.testng.annotations.Test; @@ -30,7 +30,7 @@ public class AbstractJavaCodegenExampleValuesTest { - private final AbstractJavaCodegen fakeJavaCodegen = new P_AbstractJavaCodegen(); + private final AbstractJavaGenerator fakeJavaCodegen = new P_AbstractJavaGenerator(); @Test void inlineEnum() { @@ -129,9 +129,9 @@ void uuidGivenExample() { Assert.assertEquals(p.example, "UUID.fromString(\"13b48713-b931-45ea-bd60-b07491245960\")"); } - private static class P_AbstractJavaCodegen extends AbstractJavaCodegen { + private static class P_AbstractJavaGenerator extends AbstractJavaGenerator { @Override - public CodegenType getTag() { + public GeneratorType getTag() { return null; } diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java index 7bd9dca2390..31e1fd334f8 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java @@ -19,7 +19,7 @@ import com.google.common.collect.ImmutableMap; import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; -import org.openapijsonschematools.codegen.languages.PythonClientCodegen; +import org.openapijsonschematools.codegen.generators.PythonClientGenerator; import java.util.Map; @@ -42,7 +42,7 @@ public String getLanguage() { @Override public Map createOptions() { ImmutableMap.Builder builder = new ImmutableMap.Builder(); - return builder.put(PythonClientCodegen.PACKAGE_URL, PACKAGE_URL_VALUE) + return builder.put(PythonClientGenerator.PACKAGE_URL, PACKAGE_URL_VALUE) .put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE) .put(CodegenConstants.PROJECT_NAME, PROJECT_NAME_VALUE) .put(CodegenConstants.PACKAGE_VERSION, PACKAGE_VERSION_VALUE) @@ -50,9 +50,9 @@ public Map createOptions() { .put(CodegenConstants.SOURCECODEONLY_GENERATION, "false") .put(CodegenConstants.LIBRARY, "urllib3") .put(CodegenConstants.DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT, DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT) - .put(PythonClientCodegen.USE_NOSE, USE_NOSE_VALUE) - .put(PythonClientCodegen.RECURSION_LIMIT, RECURSION_LIMIT) - //.put(PythonClientCodegen.PYTHON_ATTR_NONE_IF_UNSET, PYTHON_ATTR_NONE_IF_UNSET) + .put(PythonClientGenerator.USE_NOSE, USE_NOSE_VALUE) + .put(PythonClientGenerator.RECURSION_LIMIT, RECURSION_LIMIT) + //.put(PythonClientGenerator.PYTHON_ATTR_NONE_IF_UNSET, PYTHON_ATTR_NONE_IF_UNSET) .put(CodegenConstants.INIT_REQUIRED_VARS, INIT_REQUIRED_VARS) .build(); } diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/python/PythonClientTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/python/PythonClientTest.java index e7ced2d8e94..d96951b976a 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/python/PythonClientTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/python/PythonClientTest.java @@ -20,12 +20,12 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.media.*; +import org.openapijsonschematools.codegen.DefaultGeneratorRunner; import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.generators.PythonClientGenerator; import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.DefaultGenerator; import org.openapijsonschematools.codegen.TestUtils; import org.openapijsonschematools.codegen.config.CodegenConfigurator; -import org.openapijsonschematools.codegen.languages.PythonClientCodegen; import org.openapijsonschematools.codegen.model.EnumValue; import org.openapijsonschematools.codegen.utils.ModelUtils; import org.testng.Assert; @@ -50,7 +50,7 @@ public class PythonClientTest { public void testRecursiveExampleValueWithCycle() throws Exception { final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/issue_7532.yaml"); - final PythonClientCodegen codegen = new PythonClientCodegen(); + final PythonClientGenerator codegen = new PythonClientGenerator(); codegen.setOpenAPI(openAPI); Schema schemaWithCycleInTreesProperty = openAPI.getComponents().getSchemas().get("Forest"); String exampleValue = codegen.toExampleValue(schemaWithCycleInTreesProperty, null); @@ -65,14 +65,14 @@ public void testRecursiveExampleValueWithCycle() throws Exception { @Test(expectedExceptions = RuntimeException.class) public void testSpecWithTooLowVersionThrowsException() { final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/2_0/petstore.yaml"); - final PythonClientCodegen codegen = new PythonClientCodegen(); + final PythonClientGenerator codegen = new PythonClientGenerator(); codegen.preprocessOpenAPI(openAPI); } @Test public void testSpecWithAcceptableVersion() { final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/petstore.yaml"); - final PythonClientCodegen codegen = new PythonClientCodegen(); + final PythonClientGenerator codegen = new PythonClientGenerator(); codegen.preprocessOpenAPI(openAPI); Assert.assertEquals(openAPI.getOpenapi() , "3.0.0"); Assert.assertTrue(openAPI.getExtensions() == null); @@ -81,7 +81,7 @@ public void testSpecWithAcceptableVersion() { @Test public void testSpecWithAcceptableVersionAndExtension() { final OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/issue_12196.yaml"); - final PythonClientCodegen codegen = new PythonClientCodegen(); + final PythonClientGenerator codegen = new PythonClientGenerator(); codegen.preprocessOpenAPI(openAPI); Assert.assertEquals(openAPI.getOpenapi() , "3.0.0"); Assert.assertFalse(openAPI.getExtensions().isEmpty()); @@ -109,7 +109,7 @@ public void testRecursiveGeoJsonExampleWhenTypeIsGeometryCollection() throws IOE private void testEndpointExampleValue(String endpoint, String specFilePath, String expectedAnswerPath) throws IOException { final OpenAPI openAPI = TestUtils.parseFlattenSpec(specFilePath); - final PythonClientCodegen codegen = new PythonClientCodegen(); + final PythonClientGenerator codegen = new PythonClientGenerator(); codegen.setOpenAPI(openAPI); final Operation operation = openAPI.getPaths().get(endpoint).getPost(); @@ -142,7 +142,7 @@ public void testApiTestsNotGenerated() throws Exception { .setOutputDir(output.getAbsolutePath().replace("\\", "/")); final ClientOptInput clientOptInput = configurator.toClientOptInput(); - DefaultGenerator generator = new DefaultGenerator(); + DefaultGeneratorRunner generator = new DefaultGeneratorRunner(); List files = generator.opts(clientOptInput).generate(); Assert.assertTrue(files.size() > 0); @@ -163,7 +163,7 @@ public void testApisNotGenerated() throws Exception { .setOutputDir(output.getAbsolutePath().replace("\\", "/")); final ClientOptInput clientOptInput = configurator.toClientOptInput(); - DefaultGenerator generator = new DefaultGenerator(); + DefaultGeneratorRunner generator = new DefaultGeneratorRunner(); List files = generator.opts(clientOptInput).generate(); Assert.assertTrue(files.size() > 0); @@ -175,7 +175,7 @@ public void testApisNotGenerated() throws Exception { @Test public void testRegexWithoutTrailingSlashWorks() { OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/11_regex.yaml"); - PythonClientCodegen codegen = new PythonClientCodegen(); + PythonClientGenerator codegen = new PythonClientGenerator(); codegen.setOpenAPI(openAPI); String modelName = "UUID"; @@ -194,7 +194,7 @@ public void testRegexWithoutTrailingSlashWorks() { @Test public void testRegexWithMultipleFlagsWorks() { OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/11_regex.yaml"); - PythonClientCodegen codegen = new PythonClientCodegen(); + PythonClientGenerator codegen = new PythonClientGenerator(); codegen.setOpenAPI(openAPI); String modelName = "StringWithRegexWithThreeFlags"; @@ -213,7 +213,7 @@ public void testRegexWithMultipleFlagsWorks() { @Test public void testEnumNames() { OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/70_schema_enum_names.yaml"); - PythonClientCodegen codegen = new PythonClientCodegen(); + PythonClientGenerator codegen = new PythonClientGenerator(); codegen.setOpenAPI(openAPI); String modelName = "StringEnum"; @@ -238,7 +238,7 @@ public void testEnumNames() { @Test(description = "format imports of models using a package containing dots") public void testImportWithQualifiedPackageName() throws Exception { - final PythonClientCodegen codegen = new PythonClientCodegen(); + final PythonClientGenerator codegen = new PythonClientGenerator(); codegen.setPackageName("openapi.client"); String importValue = codegen.toModelImport("model_name.ModelName"); diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambdaTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambdaTest.java index 2ca3d6c0ead..b545e9733cc 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambdaTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambdaTest.java @@ -10,14 +10,14 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.generators.Generator; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; public class CamelCaseLambdaTest extends LambdaTest { @Mock - CodegenConfig generator; + Generator generator; @BeforeMethod public void setup() { diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambdaTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambdaTest.java index 79cadc0ee51..0e1940aac34 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambdaTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambdaTest.java @@ -10,14 +10,14 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.generators.Generator; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; public class LowercaseLambdaTest extends LambdaTest { @Mock - CodegenConfig generator; + Generator generator; @BeforeMethod public void setup() { diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/PascalCaseLambdaTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/PascalCaseLambdaTest.java index 2a91fecc8e7..0e2db6b100a 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/PascalCaseLambdaTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/PascalCaseLambdaTest.java @@ -10,14 +10,14 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.openapijsonschematools.codegen.codegenerator.CodegenConfig; +import org.openapijsonschematools.codegen.generators.Generator; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; public class PascalCaseLambdaTest extends LambdaTest { @Mock - CodegenConfig generator; + Generator generator; @BeforeMethod public void setup() { diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiOperationValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiOperationValidationsTest.java index 17ba8953f66..3be40f63f0b 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiOperationValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiOperationValidationsTest.java @@ -8,7 +8,7 @@ import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.validation.common.Invalid; import org.openapijsonschematools.codegen.validation.ValidationResult; -import org.openapijsonschematools.codegen.validation.oas.oas.OpenApiOperationValidations; +import org.openapijsonschematools.codegen.validation.oas.OpenApiOperationValidations; import org.openapijsonschematools.codegen.validation.oas.OperationWrapper; import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; import org.testng.Assert; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiParameterValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiParameterValidationsTest.java index a23d917bd43..0d2ea2deb94 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiParameterValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiParameterValidationsTest.java @@ -3,10 +3,10 @@ import io.swagger.v3.oas.models.parameters.Parameter; import org.openapijsonschematools.codegen.validation.common.Invalid; import org.openapijsonschematools.codegen.validation.ValidationResult; -import org.openapijsonschematools.codegen.validation.oas.oas.OpenApiParameterValidations; +import org.openapijsonschematools.codegen.validation.oas.OpenApiParameterValidations; import org.openapijsonschematools.codegen.validation.oas.ParameterWrapper; import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; -import org.openapijsonschematools.codegen.validation.oas.oas.ValidationConstants; +import org.openapijsonschematools.codegen.validation.oas.ValidationConstants; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaValidationsTest.java index 7a3a7bf7058..17cddf020cf 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaValidationsTest.java @@ -3,7 +3,7 @@ import io.swagger.v3.oas.models.media.*; import org.openapijsonschematools.codegen.validation.common.Invalid; import org.openapijsonschematools.codegen.validation.ValidationResult; -import org.openapijsonschematools.codegen.validation.oas.oas.OpenApiSchemaValidations; +import org.openapijsonschematools.codegen.validation.oas.OpenApiSchemaValidations; import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; import org.openapijsonschematools.codegen.validation.oas.SchemaWrapper; import org.testng.Assert; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSecuritySchemeValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSecuritySchemeValidationsTest.java index 383a66ff7b7..00022f1079d 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSecuritySchemeValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSecuritySchemeValidationsTest.java @@ -3,10 +3,10 @@ import io.swagger.v3.oas.models.security.SecurityScheme; import org.openapijsonschematools.codegen.validation.common.Invalid; import org.openapijsonschematools.codegen.validation.ValidationResult; -import org.openapijsonschematools.codegen.validation.oas.oas.OpenApiSecuritySchemeValidations; +import org.openapijsonschematools.codegen.validation.oas.OpenApiSecuritySchemeValidations; import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; import org.openapijsonschematools.codegen.validation.oas.SecuritySchemeWrapper; -import org.openapijsonschematools.codegen.validation.oas.oas.ValidationConstants; +import org.openapijsonschematools.codegen.validation.oas.ValidationConstants; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; From e275e925ee83b70a510d684916a830da68169a2b Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 10:28:45 -0700 Subject: [PATCH 05/43] Removes common subpackage --- .../codegen/validation/{common => }/GenericValidator.java | 5 +---- .../codegen/validation/{common => }/Invalid.java | 4 +--- .../codegen/validation/{common => }/Severity.java | 2 +- .../codegen/validation/{common => }/Valid.java | 4 +--- .../codegen/validation/Validated.java | 4 ---- .../codegen/validation/ValidationResult.java | 5 ----- .../codegen/validation/{common => }/ValidationRule.java | 2 +- .../codegen/validation/{common => }/Validator.java | 2 +- .../codegen/validation/oas/OpenApiEvaluator.java | 6 +++--- .../codegen/validation/oas/OpenApiOperationValidations.java | 4 ++-- .../codegen/validation/oas/OpenApiParameterValidations.java | 4 ++-- .../codegen/validation/oas/OpenApiSchemaValidations.java | 4 ++-- .../validation/oas/OpenApiSecuritySchemeValidations.java | 4 ++-- .../codegen/validation/GenericValidatorTest.java | 4 ---- .../codegen/validation/ValidatedTest.java | 1 - .../codegen/validation/ValidationRuleTest.java | 1 - .../validations/oas/OpenApiOperationValidationsTest.java | 2 +- .../validations/oas/OpenApiParameterValidationsTest.java | 2 +- .../codegen/validations/oas/OpenApiSchemaTypeTest.java | 2 +- .../validations/oas/OpenApiSchemaValidationsTest.java | 2 +- .../oas/OpenApiSecuritySchemeValidationsTest.java | 2 +- 21 files changed, 22 insertions(+), 44 deletions(-) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{common => }/GenericValidator.java (91%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{common => }/Invalid.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{common => }/Severity.java (95%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{common => }/Valid.java (92%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{common => }/ValidationRule.java (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{common => }/Validator.java (95%) diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/GenericValidator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/GenericValidator.java similarity index 91% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/GenericValidator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/GenericValidator.java index 3798e7e2651..64f922fc26e 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/GenericValidator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/GenericValidator.java @@ -14,10 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation.common; - -import org.openapijsonschematools.codegen.validation.Validated; -import org.openapijsonschematools.codegen.validation.ValidationResult; +package org.openapijsonschematools.codegen.validation; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Invalid.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Invalid.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java index f3e1d09fcb7..f983226396f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Invalid.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation.common; - -import org.openapijsonschematools.codegen.validation.Validated; +package org.openapijsonschematools.codegen.validation; /** * Represents a {@link Validated} state which is "Invalid" to some degree of {@link Severity}. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Severity.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Severity.java similarity index 95% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Severity.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Severity.java index 3f40bf10e79..9be63d0f536 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Severity.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Severity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation.common; +package org.openapijsonschematools.codegen.validation; /** * Defines different levels of severity to be used during validation. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Valid.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java similarity index 92% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Valid.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java index b221025fe59..4c53ef1540f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Valid.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation.common; - -import org.openapijsonschematools.codegen.validation.Validated; +package org.openapijsonschematools.codegen.validation; /** * Represents a {@link Validated} state which is "valid" according to the defined rule. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java index 7796d7ae98c..9292ac4825b 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java @@ -16,10 +16,6 @@ package org.openapijsonschematools.codegen.validation; -import org.openapijsonschematools.codegen.validation.common.Invalid; -import org.openapijsonschematools.codegen.validation.common.Valid; -import org.openapijsonschematools.codegen.validation.common.ValidationRule; - /** * Provides details about the state of a completed validation. */ diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java index 34bfecd96bc..45b98a857bf 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java @@ -16,11 +16,6 @@ package org.openapijsonschematools.codegen.validation; -import org.openapijsonschematools.codegen.validation.common.Invalid; -import org.openapijsonschematools.codegen.validation.common.Severity; -import org.openapijsonschematools.codegen.validation.common.Valid; -import org.openapijsonschematools.codegen.validation.common.ValidationRule; - import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/ValidationRule.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/ValidationRule.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java index d58281455d5..79bff993afd 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/ValidationRule.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation.common; +package org.openapijsonschematools.codegen.validation; import java.util.function.Function; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Validator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validator.java similarity index 95% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Validator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validator.java index f10d76de271..892f2636abc 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/common/Validator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation.common; +package org.openapijsonschematools.codegen.validation; import org.openapijsonschematools.codegen.validation.ValidationResult; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiEvaluator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiEvaluator.java index e2f94925631..cdec80c7fac 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiEvaluator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiEvaluator.java @@ -8,11 +8,11 @@ import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.tags.Tag; import org.openapijsonschematools.codegen.utils.ModelUtils; -import org.openapijsonschematools.codegen.validation.common.Severity; +import org.openapijsonschematools.codegen.validation.Severity; import org.openapijsonschematools.codegen.validation.Validated; import org.openapijsonschematools.codegen.validation.ValidationResult; -import org.openapijsonschematools.codegen.validation.common.ValidationRule; -import org.openapijsonschematools.codegen.validation.common.Validator; +import org.openapijsonschematools.codegen.validation.ValidationRule; +import org.openapijsonschematools.codegen.validation.Validator; import java.util.*; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidations.java index 318a116c6f8..d0414939f56 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidations.java @@ -3,8 +3,8 @@ import io.swagger.v3.oas.models.PathItem; import io.swagger.v3.oas.models.parameters.RequestBody; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.validation.common.GenericValidator; -import org.openapijsonschematools.codegen.validation.common.ValidationRule; +import org.openapijsonschematools.codegen.validation.GenericValidator; +import org.openapijsonschematools.codegen.validation.ValidationRule; import java.util.ArrayList; import java.util.Locale; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidations.java index 61fa907215e..7a856690081 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidations.java @@ -3,8 +3,8 @@ import io.swagger.v3.oas.models.parameters.HeaderParameter; import io.swagger.v3.oas.models.parameters.Parameter; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.validation.common.GenericValidator; -import org.openapijsonschematools.codegen.validation.common.ValidationRule; +import org.openapijsonschematools.codegen.validation.GenericValidator; +import org.openapijsonschematools.codegen.validation.ValidationRule; import java.util.ArrayList; import java.util.Locale; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java index 9e5fcee1eb4..644bbdf686d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java @@ -5,8 +5,8 @@ import org.openapijsonschematools.codegen.utils.ModelUtils; import org.openapijsonschematools.codegen.utils.SemVer; -import org.openapijsonschematools.codegen.validation.common.GenericValidator; -import org.openapijsonschematools.codegen.validation.common.ValidationRule; +import org.openapijsonschematools.codegen.validation.GenericValidator; +import org.openapijsonschematools.codegen.validation.ValidationRule; import java.util.ArrayList; import java.util.Locale; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidations.java index 656a295a292..8375d061a9d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidations.java @@ -2,8 +2,8 @@ import io.swagger.v3.oas.models.security.SecurityScheme; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.validation.common.GenericValidator; -import org.openapijsonschematools.codegen.validation.common.ValidationRule; +import org.openapijsonschematools.codegen.validation.GenericValidator; +import org.openapijsonschematools.codegen.validation.ValidationRule; import java.util.ArrayList; import java.util.Locale; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java index 3fc6a456b54..75120247608 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java @@ -16,10 +16,6 @@ package org.openapijsonschematools.codegen.validation; -import org.openapijsonschematools.codegen.validation.common.GenericValidator; -import org.openapijsonschematools.codegen.validation.common.Invalid; -import org.openapijsonschematools.codegen.validation.common.Valid; -import org.openapijsonschematools.codegen.validation.common.ValidationRule; import org.testng.annotations.Test; import static org.testng.Assert.*; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java index 32a05596f68..ddc780c3e2c 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java @@ -16,7 +16,6 @@ package org.openapijsonschematools.codegen.validation; -import org.openapijsonschematools.codegen.validation.common.ValidationRule; import org.testng.annotations.Test; import static org.testng.Assert.*; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java index 4a7050411db..d6149067cc0 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java @@ -16,7 +16,6 @@ package org.openapijsonschematools.codegen.validation; -import org.openapijsonschematools.codegen.validation.common.ValidationRule; import org.testng.annotations.Test; import static org.testng.Assert.*; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiOperationValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiOperationValidationsTest.java index 3be40f63f0b..7d4b2929a88 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiOperationValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiOperationValidationsTest.java @@ -6,7 +6,7 @@ import io.swagger.v3.oas.models.media.MediaType; import io.swagger.v3.oas.models.parameters.RequestBody; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.validation.common.Invalid; +import org.openapijsonschematools.codegen.validation.Invalid; import org.openapijsonschematools.codegen.validation.ValidationResult; import org.openapijsonschematools.codegen.validation.oas.OpenApiOperationValidations; import org.openapijsonschematools.codegen.validation.oas.OperationWrapper; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiParameterValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiParameterValidationsTest.java index 0d2ea2deb94..4a6ba5ff20e 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiParameterValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiParameterValidationsTest.java @@ -1,7 +1,7 @@ package org.openapijsonschematools.codegen.validations.oas; import io.swagger.v3.oas.models.parameters.Parameter; -import org.openapijsonschematools.codegen.validation.common.Invalid; +import org.openapijsonschematools.codegen.validation.Invalid; import org.openapijsonschematools.codegen.validation.ValidationResult; import org.openapijsonschematools.codegen.validation.oas.OpenApiParameterValidations; import org.openapijsonschematools.codegen.validation.oas.ParameterWrapper; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaTypeTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaTypeTest.java index 229102a2f9c..f93fa1050d8 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaTypeTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaTypeTest.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.models.OpenAPI; import org.openapijsonschematools.codegen.TestUtils; -import org.openapijsonschematools.codegen.validation.common.Invalid; +import org.openapijsonschematools.codegen.validation.Invalid; import org.openapijsonschematools.codegen.validation.ValidationResult; import org.openapijsonschematools.codegen.validation.oas.OpenApiEvaluator; import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaValidationsTest.java index 17cddf020cf..c68befc30a0 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaValidationsTest.java @@ -1,7 +1,7 @@ package org.openapijsonschematools.codegen.validations.oas; import io.swagger.v3.oas.models.media.*; -import org.openapijsonschematools.codegen.validation.common.Invalid; +import org.openapijsonschematools.codegen.validation.Invalid; import org.openapijsonschematools.codegen.validation.ValidationResult; import org.openapijsonschematools.codegen.validation.oas.OpenApiSchemaValidations; import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSecuritySchemeValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSecuritySchemeValidationsTest.java index 00022f1079d..494e203ac3d 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSecuritySchemeValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSecuritySchemeValidationsTest.java @@ -1,7 +1,7 @@ package org.openapijsonschematools.codegen.validations.oas; import io.swagger.v3.oas.models.security.SecurityScheme; -import org.openapijsonschematools.codegen.validation.common.Invalid; +import org.openapijsonschematools.codegen.validation.Invalid; import org.openapijsonschematools.codegen.validation.ValidationResult; import org.openapijsonschematools.codegen.validation.oas.OpenApiSecuritySchemeValidations; import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; From ca7ecc0ca89e593393f1428a307150a4d7ec5329 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 10:38:58 -0700 Subject: [PATCH 06/43] Reverts validation public changes --- .../openapijsonschematools/codegen/validation/Invalid.java | 2 +- .../org/openapijsonschematools/codegen/validation/Valid.java | 2 +- .../codegen/validation/ValidationRule.java | 2 +- .../codegen/validation/oas/OpenApiOperationValidations.java | 4 ++-- .../codegen/validation/oas/OpenApiParameterValidations.java | 4 ++-- .../codegen/validation/oas/OpenApiSchemaValidations.java | 4 ++-- .../validation/oas/OpenApiSecuritySchemeValidations.java | 4 ++-- .../codegen/validation/oas/OperationWrapper.java | 2 +- .../codegen/validation/oas/ParameterWrapper.java | 2 +- .../codegen/validation/oas/SchemaWrapper.java | 2 +- .../codegen/validation/oas/SecuritySchemeWrapper.java | 2 +- .../codegen/validation/oas/ValidationConstants.java | 4 ++-- .../oas/OpenApiOperationValidationsTest.java | 2 +- .../oas/OpenApiParameterValidationsTest.java | 2 +- .../oas/OpenApiSchemaTypeTest.java | 2 +- .../oas/OpenApiSchemaValidationsTest.java | 2 +- .../oas/OpenApiSecuritySchemeValidationsTest.java | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{validations => validation}/oas/OpenApiOperationValidationsTest.java (98%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{validations => validation}/oas/OpenApiParameterValidationsTest.java (98%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{validations => validation}/oas/OpenApiSchemaTypeTest.java (96%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{validations => validation}/oas/OpenApiSchemaValidationsTest.java (98%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{validations => validation}/oas/OpenApiSecuritySchemeValidationsTest.java (98%) diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java index f983226396f..c8940f7c4ee 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java @@ -31,7 +31,7 @@ public final class Invalid extends Validated { * @param rule The rule which was evaluated and resulted in this state. * @param message The message to be displayed for this invalid state. */ - public Invalid(ValidationRule rule, String message) { + Invalid(ValidationRule rule, String message) { this.rule = rule; this.message = message; } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java index 4c53ef1540f..b56adb806d9 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java @@ -36,7 +36,7 @@ boolean isValid() { * * @param rule The rule which was evaluated and resulted in this state. */ - public Valid(ValidationRule rule) { + Valid(ValidationRule rule) { this.rule = rule; } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java index 79bff993afd..1cebb01ee30 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java @@ -89,7 +89,7 @@ public String getDescription() { * * @return An "empty" rule. */ - public static ValidationRule empty() { + static ValidationRule empty() { return new ValidationRule(Severity.ERROR, "empty", "failure message", (i) -> Fail.empty() ); } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidations.java index d0414939f56..b118688e102 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidations.java @@ -12,8 +12,8 @@ /** * A standalone instance for evaluating rule and recommendations related to OAS {@link io.swagger.v3.oas.models.Operation} */ -public class OpenApiOperationValidations extends GenericValidator { - public OpenApiOperationValidations(RuleConfiguration ruleConfiguration) { +class OpenApiOperationValidations extends GenericValidator { + OpenApiOperationValidations(RuleConfiguration ruleConfiguration) { super(new ArrayList<>()); if (ruleConfiguration.isEnableRecommendations()) { if (ruleConfiguration.isEnableApiRequestUriWithBodyRecommendation()) { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidations.java index 7a856690081..ee1698089ff 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidations.java @@ -12,8 +12,8 @@ /** * A standalone instance for evaluating rules and recommendations related to OAS {@link Parameter} */ -public class OpenApiParameterValidations extends GenericValidator { - public OpenApiParameterValidations(RuleConfiguration ruleConfiguration) { +class OpenApiParameterValidations extends GenericValidator { + OpenApiParameterValidations(RuleConfiguration ruleConfiguration) { super(new ArrayList<>()); if (ruleConfiguration.isEnableRecommendations()) { if (ruleConfiguration.isEnableApacheNginxUnderscoreRecommendation()) { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java index 644bbdf686d..a764339fde7 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java @@ -17,8 +17,8 @@ /** * A standalone instance for evaluating rules and recommendations related to OAS {@link Schema} */ -public class OpenApiSchemaValidations extends GenericValidator { - public OpenApiSchemaValidations(RuleConfiguration ruleConfiguration) { +class OpenApiSchemaValidations extends GenericValidator { + OpenApiSchemaValidations(RuleConfiguration ruleConfiguration) { super(new ArrayList<>()); if (ruleConfiguration.isEnableRecommendations()) { if (ruleConfiguration.isEnableOneOfWithPropertiesRecommendation()) { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidations.java index 8375d061a9d..5f49cc82005 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidations.java @@ -11,8 +11,8 @@ /** * A standalone instance for evaluating rules and recommendations related to OAS {@link SecurityScheme} */ -public class OpenApiSecuritySchemeValidations extends GenericValidator { - public OpenApiSecuritySchemeValidations(RuleConfiguration ruleConfiguration) { +class OpenApiSecuritySchemeValidations extends GenericValidator { + OpenApiSecuritySchemeValidations(RuleConfiguration ruleConfiguration) { super(new ArrayList<>()); if (ruleConfiguration.isEnableRecommendations()) { if (ruleConfiguration.isEnableApacheNginxUnderscoreRecommendation()) { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OperationWrapper.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OperationWrapper.java index 03468f7c55c..d4f0b698017 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OperationWrapper.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OperationWrapper.java @@ -19,7 +19,7 @@ public class OperationWrapper { * @param operation The operation instances to wrap * @param httpMethod The http method to wrap */ - public OperationWrapper(OpenAPI specification, Operation operation, PathItem.HttpMethod httpMethod) { + OperationWrapper(OpenAPI specification, Operation operation, PathItem.HttpMethod httpMethod) { this.specification = specification; this.operation = operation; this.httpMethod = httpMethod; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ParameterWrapper.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ParameterWrapper.java index 2d4abd771c0..2e3aa615897 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ParameterWrapper.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ParameterWrapper.java @@ -16,7 +16,7 @@ public class ParameterWrapper { * @param specification The OAS specification * @param parameter The OAS parameter */ - public ParameterWrapper(OpenAPI specification, Parameter parameter) { + ParameterWrapper(OpenAPI specification, Parameter parameter) { this.specification = specification; this.parameter = parameter; } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SchemaWrapper.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SchemaWrapper.java index 0e88a9c08a7..0a17f3c6388 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SchemaWrapper.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SchemaWrapper.java @@ -16,7 +16,7 @@ public class SchemaWrapper { * @param specification The OAS specification * @param schema The OAS schema */ - public SchemaWrapper(OpenAPI specification, Schema schema) { + SchemaWrapper(OpenAPI specification, Schema schema) { this.specification = specification; this.schema = schema; } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SecuritySchemeWrapper.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SecuritySchemeWrapper.java index 0930bfb7e31..19ab305ad6b 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SecuritySchemeWrapper.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SecuritySchemeWrapper.java @@ -16,7 +16,7 @@ public class SecuritySchemeWrapper { * @param specification The OAS specification * @param securityScheme The OAS securityScheme */ - public SecuritySchemeWrapper(OpenAPI specification, SecurityScheme securityScheme) { + SecuritySchemeWrapper(OpenAPI specification, SecurityScheme securityScheme) { this.specification = specification; this.securityScheme = securityScheme; } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ValidationConstants.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ValidationConstants.java index 5288b9c517d..ff1e067248f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ValidationConstants.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ValidationConstants.java @@ -1,6 +1,6 @@ package org.openapijsonschematools.codegen.validation.oas; -public final class ValidationConstants { +final class ValidationConstants { static String ApacheNginxUnderscoreDescription = "Apache and Nginx may fail on headers keys with underscore!"; - public static String ApacheNginxUnderscoreFailureMessage = "Apache and Nginx webservers may fail due to legacy CGI constraints enabled by default in which header keys with underscore are disallowed. See https://stackoverflow.com/a/22856867/151445."; + static String ApacheNginxUnderscoreFailureMessage = "Apache and Nginx webservers may fail due to legacy CGI constraints enabled by default in which header keys with underscore are disallowed. See https://stackoverflow.com/a/22856867/151445."; } diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiOperationValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidationsTest.java similarity index 98% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiOperationValidationsTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidationsTest.java index 7d4b2929a88..a334a42234e 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiOperationValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidationsTest.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validations.oas; +package org.openapijsonschematools.codegen.validation.oas; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiParameterValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidationsTest.java similarity index 98% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiParameterValidationsTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidationsTest.java index 4a6ba5ff20e..b2e3993cdd3 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiParameterValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidationsTest.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validations.oas; +package org.openapijsonschematools.codegen.validation.oas; import io.swagger.v3.oas.models.parameters.Parameter; import org.openapijsonschematools.codegen.validation.Invalid; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaTypeTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaTypeTest.java similarity index 96% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaTypeTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaTypeTest.java index f93fa1050d8..d03ea9b28f4 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaTypeTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaTypeTest.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validations.oas; +package org.openapijsonschematools.codegen.validation.oas; import io.swagger.v3.oas.models.OpenAPI; import org.openapijsonschematools.codegen.TestUtils; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidationsTest.java similarity index 98% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaValidationsTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidationsTest.java index c68befc30a0..95ab4fa706c 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSchemaValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidationsTest.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validations.oas; +package org.openapijsonschematools.codegen.validation.oas; import io.swagger.v3.oas.models.media.*; import org.openapijsonschematools.codegen.validation.Invalid; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSecuritySchemeValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidationsTest.java similarity index 98% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSecuritySchemeValidationsTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidationsTest.java index 494e203ac3d..69c7bf3a310 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validations/oas/OpenApiSecuritySchemeValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidationsTest.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validations.oas; +package org.openapijsonschematools.codegen.validation.oas; import io.swagger.v3.oas.models.security.SecurityScheme; import org.openapijsonschematools.codegen.validation.Invalid; From a8c359d7e3d5d000ebcdeae7354fb4afd8d2651f Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 10:42:52 -0700 Subject: [PATCH 07/43] Moves java python client test file --- .../PythonClientGeneratorTest.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{python/PythonClientTest.java => generators/PythonClientGeneratorTest.java} (99%) diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/python/PythonClientTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java similarity index 99% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/python/PythonClientTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java index d96951b976a..6094848ae7c 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/python/PythonClientTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.python; +package org.openapijsonschematools.codegen.generators; import com.google.common.io.Resources; import io.swagger.v3.oas.models.OpenAPI; @@ -44,7 +44,7 @@ import java.util.TreeMap; @SuppressWarnings("static-method") -public class PythonClientTest { +public class PythonClientGeneratorTest { @Test(description = "tests RecursiveExampleValueWithCycle") public void testRecursiveExampleValueWithCycle() throws Exception { From cad4efff186c1a36236da0a8b820bda32f5366a0 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 10:55:32 -0700 Subject: [PATCH 08/43] Moves meta into generators and renames it generatormetadata --- .../codegen/cmd/ConfigHelp.java | 2 +- .../codegen/cmd/ListGenerators.java | 4 +-- .../codegen/DefaultGeneratorRunner.java | 4 +-- .../generators/AbstractJavaGenerator.java | 10 +++---- .../codegen/generators/DefaultGenerator.java | 24 ++++++++--------- .../codegen/generators/Generator.java | 4 +-- .../generators/JMeterClientGenerator.java | 10 +++---- .../generators/JavaClientGenerator.java | 2 +- .../generators/JavaJerseyServerGenerator.java | 2 +- .../generators/KotlinClientGenerator.java | 12 ++++----- .../generators/PythonClientGenerator.java | 22 ++++++++-------- .../generatormetadata}/FeatureSet.java | 26 +++++++++---------- .../generatormetadata}/GeneratorMetadata.java | 2 +- .../generatormetadata}/Stability.java | 2 +- .../features/ClientModificationFeature.java | 4 +-- .../features/ComponentsFeature.java | 4 +-- .../features/DataTypeFeature.java | 6 ++--- .../features/DocumentationFeature.java | 8 +++--- .../features/GlobalFeature.java | 6 ++--- .../features/OperationFeature.java | 4 +-- .../features/ParameterFeature.java | 6 ++--- .../features/SchemaFeature.java | 6 ++--- .../features/SecurityFeature.java | 6 ++--- .../features/WireFormatFeature.java | 8 +++--- .../features/annotations/AnnotationType.java | 2 +- .../features/annotations/OAS2.java | 2 +- .../features/annotations/OAS3.java | 2 +- .../annotations/ToolingExtension.java | 2 +- .../generatormetadata}/FeatureSetTest.java | 21 ++++++++------- 29 files changed, 107 insertions(+), 106 deletions(-) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{meta => generators/generatormetadata}/FeatureSet.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{meta => generators/generatormetadata}/GeneratorMetadata.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{meta => generators/generatormetadata}/Stability.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{meta => generators/generatormetadata}/features/ClientModificationFeature.java (86%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{meta => generators/generatormetadata}/features/ComponentsFeature.java (83%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{meta => generators/generatormetadata}/features/DataTypeFeature.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{meta => generators/generatormetadata}/features/DocumentationFeature.java (77%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{meta => generators/generatormetadata}/features/GlobalFeature.java (78%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{meta => generators/generatormetadata}/features/OperationFeature.java (83%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{meta => generators/generatormetadata}/features/ParameterFeature.java (81%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{meta => generators/generatormetadata}/features/SchemaFeature.java (87%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{meta => generators/generatormetadata}/features/SecurityFeature.java (86%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{meta => generators/generatormetadata}/features/WireFormatFeature.java (74%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{meta => generators/generatormetadata}/features/annotations/AnnotationType.java (79%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{meta => generators/generatormetadata}/features/annotations/OAS2.java (90%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{meta => generators/generatormetadata}/features/annotations/OAS3.java (90%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{meta => generators/generatormetadata}/features/annotations/ToolingExtension.java (90%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{meta => generators/generatormetadata}/FeatureSetTest.java (87%) diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java index 56d028c1231..07d734c1d1a 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java @@ -25,7 +25,7 @@ import org.openapijsonschematools.codegen.codegenerator.GeneratorLoader; import org.openapijsonschematools.codegen.codegenerator.GeneratorNotFoundException; import org.openapijsonschematools.codegen.codegenerator.VendorExtension; -import org.openapijsonschematools.codegen.meta.FeatureSet; +import org.openapijsonschematools.codegen.generators.generatormetadata.FeatureSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java index 357a70dd954..5747d58a9bd 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java @@ -9,8 +9,8 @@ import org.openapijsonschematools.codegen.generators.Generator; import org.openapijsonschematools.codegen.codegenerator.GeneratorLoader; import org.openapijsonschematools.codegen.codegenerator.GeneratorType; -import org.openapijsonschematools.codegen.meta.GeneratorMetadata; -import org.openapijsonschematools.codegen.meta.Stability; +import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorMetadata; +import org.openapijsonschematools.codegen.generators.generatormetadata.Stability; import java.util.*; import java.util.stream.Collectors; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGeneratorRunner.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGeneratorRunner.java index 5249ef43d4b..0bec1a87fd4 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGeneratorRunner.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGeneratorRunner.java @@ -67,8 +67,8 @@ import org.openapijsonschematools.codegen.templating.TemplateProcessor; import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter; import org.openapijsonschematools.codegen.templating.TemplateFileType; -import org.openapijsonschematools.codegen.meta.GeneratorMetadata; -import org.openapijsonschematools.codegen.meta.Stability; +import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorMetadata; +import org.openapijsonschematools.codegen.generators.generatormetadata.Stability; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java index 061b14d3fc1..18be01b8a89 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java @@ -29,15 +29,15 @@ import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; -import org.openapijsonschematools.codegen.meta.features.SchemaFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; import org.openapijsonschematools.codegen.model.CodegenPatternInfo; import org.openapijsonschematools.codegen.model.CodegenSchema; import org.openapijsonschematools.codegen.codegenerator.VendorExtension; import org.openapijsonschematools.codegen.generators.features.DocumentationProviderFeatures; -import org.openapijsonschematools.codegen.meta.features.ClientModificationFeature; -import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; -import org.openapijsonschematools.codegen.meta.features.SecurityFeature; -import org.openapijsonschematools.codegen.meta.features.WireFormatFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.ClientModificationFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.DocumentationFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.SecurityFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.WireFormatFeature; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java index 4e4b4e9c59d..94d4a993f4b 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java @@ -39,15 +39,15 @@ import org.openapijsonschematools.codegen.codegenerator.GeneratorLanguage; import org.openapijsonschematools.codegen.codegenerator.VendorExtension; import org.openapijsonschematools.codegen.config.GlobalSettings; -import org.openapijsonschematools.codegen.meta.features.ComponentsFeature; -import org.openapijsonschematools.codegen.meta.features.DataTypeFeature; -import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; -import org.openapijsonschematools.codegen.meta.features.GlobalFeature; -import org.openapijsonschematools.codegen.meta.features.OperationFeature; -import org.openapijsonschematools.codegen.meta.features.ParameterFeature; -import org.openapijsonschematools.codegen.meta.features.SchemaFeature; -import org.openapijsonschematools.codegen.meta.features.SecurityFeature; -import org.openapijsonschematools.codegen.meta.features.WireFormatFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.ComponentsFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.DataTypeFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.DocumentationFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.GlobalFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.OperationFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.ParameterFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.SecurityFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.WireFormatFeature; import org.openapijsonschematools.codegen.model.ArrayListWithContext; import org.openapijsonschematools.codegen.model.CodegenCallback; import org.openapijsonschematools.codegen.model.CodegenDiscriminator; @@ -87,9 +87,9 @@ import org.openapijsonschematools.codegen.utils.ModelUtils; import org.openapijsonschematools.codegen.model.CodegenDiscriminator.MappedModel; import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter; -import org.openapijsonschematools.codegen.meta.FeatureSet; -import org.openapijsonschematools.codegen.meta.GeneratorMetadata; -import org.openapijsonschematools.codegen.meta.Stability; +import org.openapijsonschematools.codegen.generators.generatormetadata.FeatureSet; +import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorMetadata; +import org.openapijsonschematools.codegen.generators.generatormetadata.Stability; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java index ca1022db0da..91a59991794 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java @@ -50,8 +50,8 @@ import org.openapijsonschematools.codegen.model.CodegenSecurityScheme; import org.openapijsonschematools.codegen.model.CodegenServer; import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter; -import org.openapijsonschematools.codegen.meta.FeatureSet; -import org.openapijsonschematools.codegen.meta.GeneratorMetadata; +import org.openapijsonschematools.codegen.generators.generatormetadata.FeatureSet; +import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorMetadata; import org.openapijsonschematools.codegen.model.CodegenTag; import java.io.File; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java index 16df3b0fe5d..396b6105784 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java @@ -21,11 +21,11 @@ import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; import org.openapijsonschematools.codegen.codegenerator.GeneratorType; -import org.openapijsonschematools.codegen.meta.features.ClientModificationFeature; -import org.openapijsonschematools.codegen.meta.features.ParameterFeature; -import org.openapijsonschematools.codegen.meta.features.SchemaFeature; -import org.openapijsonschematools.codegen.meta.features.SecurityFeature; -import org.openapijsonschematools.codegen.meta.features.WireFormatFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.ClientModificationFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.ParameterFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.SecurityFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.WireFormatFeature; import java.io.File; import java.util.Arrays; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index 07b90d9b34b..1badd00f2ee 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -28,7 +28,7 @@ import org.openapijsonschematools.codegen.generators.features.GzipFeatures; import org.openapijsonschematools.codegen.generators.features.PerformBeanValidationFeatures; import org.openapijsonschematools.codegen.templating.mustache.CaseFormatLambda; -import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.DocumentationFeature; import org.openapijsonschematools.codegen.utils.ProcessUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java index 9c0aa2958d7..582934ef62b 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java @@ -22,7 +22,7 @@ import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.model.CodegenSchema; import org.openapijsonschematools.codegen.templating.SupportingFile; -import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.DocumentationFeature; import java.util.HashMap; import java.util.Map; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java index 4fe452f474e..4645dfb2ded 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java @@ -27,15 +27,15 @@ import org.openapijsonschematools.codegen.cli.CliOption; import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; -import org.openapijsonschematools.codegen.meta.features.SchemaFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; import org.openapijsonschematools.codegen.model.CodegenSchema; import org.openapijsonschematools.codegen.codegenerator.GeneratorType; import org.openapijsonschematools.codegen.templating.SupportingFile; -import org.openapijsonschematools.codegen.meta.features.ClientModificationFeature; -import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; -import org.openapijsonschematools.codegen.meta.features.ParameterFeature; -import org.openapijsonschematools.codegen.meta.features.SecurityFeature; -import org.openapijsonschematools.codegen.meta.features.WireFormatFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.ClientModificationFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.DocumentationFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.ParameterFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.SecurityFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.WireFormatFeature; import org.openapijsonschematools.codegen.utils.ProcessUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java index f8dc8dd10b8..3988b5ec47a 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java @@ -26,20 +26,20 @@ import org.openapijsonschematools.codegen.cli.CliOption; import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; import org.openapijsonschematools.codegen.codegenerator.GeneratorType; -import org.openapijsonschematools.codegen.meta.features.ComponentsFeature; -import org.openapijsonschematools.codegen.meta.features.OperationFeature; -import org.openapijsonschematools.codegen.meta.features.SchemaFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.ComponentsFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.OperationFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; import org.openapijsonschematools.codegen.model.CodegenDiscriminator; import org.openapijsonschematools.codegen.model.CodegenPatternInfo; import org.openapijsonschematools.codegen.model.CodegenSchema; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.templating.TemplateManager; -import org.openapijsonschematools.codegen.meta.features.DataTypeFeature; -import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; -import org.openapijsonschematools.codegen.meta.features.GlobalFeature; -import org.openapijsonschematools.codegen.meta.features.ParameterFeature; -import org.openapijsonschematools.codegen.meta.features.SecurityFeature; -import org.openapijsonschematools.codegen.meta.features.WireFormatFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.DataTypeFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.DocumentationFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.GlobalFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.ParameterFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.SecurityFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.WireFormatFeature; import org.openapijsonschematools.codegen.model.PairCacheKey; import org.openapijsonschematools.codegen.templating.CommonTemplateContentLocator; import org.openapijsonschematools.codegen.templating.GeneratorTemplateContentLocator; @@ -54,8 +54,8 @@ import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.model.CodegenDiscriminator.MappedModel; import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter; -import org.openapijsonschematools.codegen.meta.GeneratorMetadata; -import org.openapijsonschematools.codegen.meta.Stability; +import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorMetadata; +import org.openapijsonschematools.codegen.generators.generatormetadata.Stability; import org.openapijsonschematools.codegen.utils.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/FeatureSet.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSet.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/FeatureSet.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSet.java index 16829b176be..16bc50d9719 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/FeatureSet.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSet.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.meta; - -import org.openapijsonschematools.codegen.meta.features.ClientModificationFeature; -import org.openapijsonschematools.codegen.meta.features.ComponentsFeature; -import org.openapijsonschematools.codegen.meta.features.DataTypeFeature; -import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; -import org.openapijsonschematools.codegen.meta.features.GlobalFeature; -import org.openapijsonschematools.codegen.meta.features.OperationFeature; -import org.openapijsonschematools.codegen.meta.features.ParameterFeature; -import org.openapijsonschematools.codegen.meta.features.SchemaFeature; -import org.openapijsonschematools.codegen.meta.features.SecurityFeature; -import org.openapijsonschematools.codegen.meta.features.WireFormatFeature; -import org.openapijsonschematools.codegen.meta.features.annotations.AnnotationType; +package org.openapijsonschematools.codegen.generators.generatormetadata; + +import org.openapijsonschematools.codegen.generators.generatormetadata.features.ClientModificationFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.ComponentsFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.DataTypeFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.DocumentationFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.GlobalFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.OperationFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.ParameterFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.SecurityFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.WireFormatFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.AnnotationType; import java.lang.annotation.Annotation; import java.util.*; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/GeneratorMetadata.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorMetadata.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/GeneratorMetadata.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorMetadata.java index 4564c67b148..2741975c181 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/GeneratorMetadata.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorMetadata.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.meta; +package org.openapijsonschematools.codegen.generators.generatormetadata; import java.util.HashMap; import java.util.Map; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/Stability.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/Stability.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/Stability.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/Stability.java index e236cb384c7..bdca00e9fb3 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/Stability.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/Stability.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.meta; +package org.openapijsonschematools.codegen.generators.generatormetadata; /** * Represents the "stability index" of a generator or feature, based on the stability indexes defined in the node.js ecosystem. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/ClientModificationFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ClientModificationFeature.java similarity index 86% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/ClientModificationFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ClientModificationFeature.java index 9534629eae0..5ffbc81eaba 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/ClientModificationFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ClientModificationFeature.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.meta.features; +package org.openapijsonschematools.codegen.generators.generatormetadata.features; -import org.openapijsonschematools.codegen.meta.features.annotations.ToolingExtension; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.ToolingExtension; /** * Defines a general set of modifications supported by a generated client. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/ComponentsFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ComponentsFeature.java similarity index 83% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/ComponentsFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ComponentsFeature.java index c16e3ac63c0..6f06f250367 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/ComponentsFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ComponentsFeature.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.meta.features; +package org.openapijsonschematools.codegen.generators.generatormetadata.features; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS3; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.OAS3; public enum ComponentsFeature { @OAS3 diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/DataTypeFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/DataTypeFeature.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/DataTypeFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/DataTypeFeature.java index 95314f30953..361471bd27c 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/DataTypeFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/DataTypeFeature.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.meta.features; +package org.openapijsonschematools.codegen.generators.generatormetadata.features; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS3; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.OAS3; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.OAS2; /** * Defines common data types supported by a generator. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/DocumentationFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/DocumentationFeature.java similarity index 77% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/DocumentationFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/DocumentationFeature.java index c30b8ac9dfa..a7d885d8770 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/DocumentationFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/DocumentationFeature.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.meta.features; +package org.openapijsonschematools.codegen.generators.generatormetadata.features; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS3; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; -import org.openapijsonschematools.codegen.meta.features.annotations.ToolingExtension; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.OAS3; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.OAS2; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.ToolingExtension; /** * Defines the documentation type available in generated output. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/GlobalFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/GlobalFeature.java similarity index 78% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/GlobalFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/GlobalFeature.java index 9c14350d74c..5a2136cc552 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/GlobalFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/GlobalFeature.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.meta.features; +package org.openapijsonschematools.codegen.generators.generatormetadata.features; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS3; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.OAS3; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.OAS2; /** * Defines a set of globally available features. That is, support of these are defined at the top-level of the spec diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/OperationFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/OperationFeature.java similarity index 83% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/OperationFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/OperationFeature.java index b6eb0ccccaf..a100566767f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/OperationFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/OperationFeature.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.meta.features; +package org.openapijsonschematools.codegen.generators.generatormetadata.features; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS3; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.OAS3; /** * Defines Operation features supported in the generated code. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/ParameterFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ParameterFeature.java similarity index 81% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/ParameterFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ParameterFeature.java index fa51f4068b3..1a995d099da 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/ParameterFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ParameterFeature.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.meta.features; +package org.openapijsonschematools.codegen.generators.generatormetadata.features; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS3; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.OAS3; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.OAS2; /** * Defines parameters supported by endpoints in the generated code. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/SchemaFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/SchemaFeature.java similarity index 87% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/SchemaFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/SchemaFeature.java index cb812bfcb1f..59857e55c76 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/SchemaFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/SchemaFeature.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.meta.features; +package org.openapijsonschematools.codegen.generators.generatormetadata.features; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS3; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.OAS3; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.OAS2; /** * Defines special circumstances handled by the generator. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/SecurityFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/SecurityFeature.java similarity index 86% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/SecurityFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/SecurityFeature.java index 829e4313493..27160054c28 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/SecurityFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/SecurityFeature.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.meta.features; +package org.openapijsonschematools.codegen.generators.generatormetadata.features; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS3; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.OAS3; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.OAS2; /** * Defines security features supported in the generated code. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/WireFormatFeature.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/WireFormatFeature.java similarity index 74% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/WireFormatFeature.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/WireFormatFeature.java index e0813115721..c273a5d9c57 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/WireFormatFeature.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/WireFormatFeature.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.meta.features; +package org.openapijsonschematools.codegen.generators.generatormetadata.features; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS3; -import org.openapijsonschematools.codegen.meta.features.annotations.OAS2; -import org.openapijsonschematools.codegen.meta.features.annotations.ToolingExtension; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.OAS3; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.OAS2; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.ToolingExtension; /** * Defines wire formats explicitly defined in spec or supported by the tool. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/AnnotationType.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/AnnotationType.java similarity index 79% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/AnnotationType.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/AnnotationType.java index d3eb16ee21a..5c7c2e7b82a 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/AnnotationType.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/AnnotationType.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.meta.features.annotations; +package org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations; public enum AnnotationType { OAS2, OAS3, ToolingExtension; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS2.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/OAS2.java similarity index 90% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS2.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/OAS2.java index 8ceb90178b4..3a440a9ab37 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS2.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/OAS2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.meta.features.annotations; +package org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS3.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/OAS3.java similarity index 90% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS3.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/OAS3.java index 59f5acd410b..0e481f06a37 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/OAS3.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/OAS3.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.meta.features.annotations; +package org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/ToolingExtension.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/ToolingExtension.java similarity index 90% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/ToolingExtension.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/ToolingExtension.java index 9e7b8aba685..6796032efcc 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/meta/features/annotations/ToolingExtension.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/ToolingExtension.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.meta.features.annotations; +package org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/meta/FeatureSetTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSetTest.java similarity index 87% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/meta/FeatureSetTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSetTest.java index 2c80f4e664b..bbbd0966182 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/meta/FeatureSetTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSetTest.java @@ -1,13 +1,14 @@ -package org.openapijsonschematools.codegen.meta; - -import org.openapijsonschematools.codegen.meta.features.ClientModificationFeature; -import org.openapijsonschematools.codegen.meta.features.DataTypeFeature; -import org.openapijsonschematools.codegen.meta.features.DocumentationFeature; -import org.openapijsonschematools.codegen.meta.features.GlobalFeature; -import org.openapijsonschematools.codegen.meta.features.ParameterFeature; -import org.openapijsonschematools.codegen.meta.features.SchemaFeature; -import org.openapijsonschematools.codegen.meta.features.SecurityFeature; -import org.openapijsonschematools.codegen.meta.features.annotations.AnnotationType; +package org.openapijsonschematools.codegen.generators.generatormetadata; + +import org.openapijsonschematools.codegen.generators.generatormetadata.FeatureSet; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.ClientModificationFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.DataTypeFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.DocumentationFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.GlobalFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.ParameterFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.SecurityFeature; +import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.AnnotationType; import org.testng.annotations.Test; import java.util.ArrayList; From d83d3e5a4dacd42aab26736d017dd66ad7c65a12 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 11:14:39 -0700 Subject: [PATCH 09/43] Removes example module --- .../codegen/examples/ExampleGenerator.java | 360 ------------------ .../codegen/examples/XmlExampleGenerator.java | 234 ------------ .../codegen/ExampleGeneratorTestRunner.java | 144 ------- .../SerializerUtilsTest.java | 2 +- 4 files changed, 1 insertion(+), 739 deletions(-) delete mode 100644 modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/examples/ExampleGenerator.java delete mode 100644 modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/examples/XmlExampleGenerator.java delete mode 100644 modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/ExampleGeneratorTestRunner.java rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{serializer => utils}/SerializerUtilsTest.java (99%) diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/examples/ExampleGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/examples/ExampleGenerator.java deleted file mode 100644 index 67ff7532227..00000000000 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/examples/ExampleGenerator.java +++ /dev/null @@ -1,360 +0,0 @@ -/* - * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) - * Copyright 2018 SmartBear Software - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.openapijsonschematools.codegen.examples; - -import io.swagger.v3.core.util.Json; -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.media.ArraySchema; -import io.swagger.v3.oas.models.media.Schema; -import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.utils.ModelUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.math.BigDecimal; -import java.util.*; - -public class ExampleGenerator { - private final Logger LOGGER = LoggerFactory.getLogger(ExampleGenerator.class); - - // TODO: move constants to more appropriate location - private static final String MIME_TYPE_JSON = "application/json"; - private static final String MIME_TYPE_XML = "application/xml"; - - private static final String EXAMPLE = "example"; - private static final String CONTENT_TYPE = "contentType"; - private static final String OUTPUT = "output"; - private static final String NONE = "none"; - private static final String URL = "url"; - private static final String URI = "uri"; - private static final String STATUS_CODE = "statusCode"; - - protected Map examples; - private OpenAPI openAPI; - private Random random; - - public ExampleGenerator(Map examples, OpenAPI openAPI) { - this.examples = examples; - this.openAPI = openAPI; - // use a fixed seed to make the "random" numbers reproducible. - this.random = new Random("ExampleGenerator".hashCode()); - } - - public List> generateFromResponseSchema(String statusCode, Schema responseSchema, Set producesInfo) { - List> examples = generateFromResponseSchema(responseSchema, producesInfo); - if (examples == null) { - return null; - } - - for (Map example : examples) { - example.put(STATUS_CODE, statusCode); - } - - return examples; - } - - private List> generateFromResponseSchema(Schema responseSchema, Set producesInfo) { - if (responseSchema.getExample() == null && StringUtils.isEmpty(responseSchema.get$ref()) && !ModelUtils.isArraySchema(responseSchema)) { - // no example provided - return null; - } - - if (responseSchema.getExample() != null && !(responseSchema.getExample() instanceof Map)) { - return generate(responseSchema.getExample(), new ArrayList<>(producesInfo)); - } - - if (ModelUtils.isArraySchema(responseSchema)) { // array of schema - ArraySchema as = (ArraySchema) responseSchema; - if (as.getItems() != null && StringUtils.isEmpty(as.getItems().get$ref())) { // array of primitive types - return generate((Map) responseSchema.getExample(), - new ArrayList(producesInfo), as.getItems()); - } else if (as.getItems() != null && !StringUtils.isEmpty(as.getItems().get$ref())) { // array of model - return generate((Map) responseSchema.getExample(), - new ArrayList(producesInfo), ModelUtils.getSimpleRef(as.getItems().get$ref())); - } else { - // TODO log warning message as such case is not handled at the moment - return null; - } - } else if (StringUtils.isEmpty(responseSchema.get$ref())) { // primitive type (e.g. integer, string) - return generate((Map) responseSchema.getExample(), - new ArrayList(producesInfo), responseSchema); - } else { // model - return generate((Map) responseSchema.getExample(), - new ArrayList(producesInfo), ModelUtils.getSimpleRef(responseSchema.get$ref())); - } - } - - public List> generate(Map examples, List mediaTypes, Schema property) { - LOGGER.debug("debugging generate in ExampleGenerator"); - List> output = new ArrayList<>(); - Set processedModels = new HashSet<>(); - if (examples == null) { - if (mediaTypes == null) { - // assume application/json for this - mediaTypes = Collections.singletonList(MIME_TYPE_JSON); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. - } - for (String mediaType : mediaTypes) { - Map kv = new HashMap<>(); - kv.put(CONTENT_TYPE, mediaType); - if (property != null && (mediaType.startsWith(MIME_TYPE_JSON) || mediaType.contains("*/*"))) { - String example = Json.pretty(resolvePropertyToExample("", mediaType, property, processedModels)); - if (example != null) { - kv.put(EXAMPLE, example); - output.add(kv); - } - } else if (property != null && mediaType.startsWith(MIME_TYPE_XML)) { - String example = new XmlExampleGenerator(this.examples).toXml(property); - if (example != null) { - kv.put(EXAMPLE, example); - output.add(kv); - } - } - } - } else { - for (Map.Entry entry : examples.entrySet()) { - final Map kv = new HashMap<>(); - kv.put(CONTENT_TYPE, entry.getKey()); - kv.put(EXAMPLE, Json.pretty(entry.getValue())); - output.add(kv); - } - } - - if (output.size() == 0) { - Map kv = new HashMap<>(); - kv.put(OUTPUT, NONE); - output.add(kv); - } - return output; - } - - public List> generate(Map examples, List mediaTypes, String modelName) { - List> output = new ArrayList<>(); - Set processedModels = new HashSet<>(); - if (examples == null) { - if (mediaTypes == null) { - // assume application/json for this - mediaTypes = Collections.singletonList(MIME_TYPE_JSON); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'. - } - for (String mediaType : mediaTypes) { - Map kv = new HashMap<>(); - kv.put(CONTENT_TYPE, mediaType); - if (modelName != null && (mediaType.startsWith(MIME_TYPE_JSON) || mediaType.contains("*/*"))) { - final Schema schema = this.examples.get(modelName); - if (schema != null) { - String example = Json.pretty(resolveModelToExample(modelName, mediaType, schema, processedModels)); - - if (example != null) { - kv.put(EXAMPLE, example); - output.add(kv); - } - } - } else if (modelName != null && mediaType.startsWith(MIME_TYPE_XML)) { - final Schema schema = this.examples.get(modelName); - String example = new XmlExampleGenerator(this.examples).toXml(schema, 0, Collections.emptySet()); - if (example != null) { - kv.put(EXAMPLE, example); - output.add(kv); - } - } else { - kv.put(EXAMPLE, "Custom MIME type example not yet supported: " + mediaType); - output.add(kv); - } - } - } else { - for (Map.Entry entry : examples.entrySet()) { - final Map kv = new HashMap<>(); - kv.put(CONTENT_TYPE, entry.getKey()); - kv.put(EXAMPLE, Json.pretty(entry.getValue())); - output.add(kv); - } - } - - if (output.size() == 0) { - Map kv = new HashMap<>(); - kv.put(OUTPUT, NONE); - output.add(kv); - } - return output; - } - - private List> generate(Object example, List mediaTypes) { - List> output = new ArrayList<>(); - if (examples != null) { - if (mediaTypes == null) { - // assume application/json for this - mediaTypes = Collections.singletonList(MIME_TYPE_JSON); - } - for (String mediaType : mediaTypes) { - Map kv = new HashMap<>(); - kv.put(CONTENT_TYPE, mediaType); - if ((mediaType.startsWith(MIME_TYPE_JSON) || mediaType.contains("*/*"))) { - kv.put(EXAMPLE, Json.pretty(example)); - output.add(kv); - } else if (mediaType.startsWith(MIME_TYPE_XML)) { - // TODO - LOGGER.warn("XML example value of (array/primitive) is not handled at the moment: {}", example); - } - } - } - - if (output.size() == 0) { - Map kv = new HashMap<>(); - kv.put(OUTPUT, NONE); - output.add(kv); - } - return output; - } - - private Object resolvePropertyToExample(String propertyName, String mediaType, Schema property, Set processedModels) { - LOGGER.debug("Resolving example for property {}...", property); - if (property.getExample() != null) { - LOGGER.debug("Example set in openapi spec, returning example: '{}'", property.getExample().toString()); - return property.getExample(); - } else if (ModelUtils.isBooleanSchema(property)) { - Object defaultValue = property.getDefault(); - if (defaultValue != null) { - return defaultValue; - } - return Boolean.TRUE; - } else if (ModelUtils.isArraySchema(property)) { - Schema innerType = ((ArraySchema) property).getItems(); - if (innerType != null) { - int arrayLength = null == ((ArraySchema) property).getMaxItems() ? 2 : ((ArraySchema) property).getMaxItems(); - // avoid memory issues by limiting to max. 5 items - arrayLength = Math.min(arrayLength, 5); - Object[] objectProperties = new Object[arrayLength]; - Object objProperty = resolvePropertyToExample(propertyName, mediaType, innerType, processedModels); - for (int i = 0; i < arrayLength; i++) { - objectProperties[i] = objProperty; - } - return objectProperties; - } - } else if (ModelUtils.isDateSchema(property)) { - return "2000-01-23"; - } else if (ModelUtils.isDateTimeSchema(property)) { - return "2000-01-23T04:56:07.000+00:00"; - } else if (ModelUtils.isNumberSchema(property)) { - Double min = getPropertyValue(property.getMinimum()); - Double max = getPropertyValue(property.getMaximum()); - if (ModelUtils.isFloatSchema(property)) { // float - return (float) randomNumber(min, max); - } else if (ModelUtils.isDoubleSchema(property)) { // decimal/double - return BigDecimal.valueOf(randomNumber(min, max)); - } else { // no format defined - return randomNumber(min, max); - } - } else if (ModelUtils.isFileSchema(property)) { - return ""; // TODO - - } else if (ModelUtils.isIntegerSchema(property)) { - Double min = getPropertyValue(property.getMinimum()); - Double max = getPropertyValue(property.getMaximum()); - if (ModelUtils.isLongSchema(property)) { - return (long) randomNumber(min, max); - } - return (int) randomNumber(min, max); - } else if (ModelUtils.isMapSchema(property)) { - Map mp = new HashMap(); - if (property.getName() != null) { - mp.put(property.getName(), - resolvePropertyToExample(propertyName, mediaType, ModelUtils.getAdditionalProperties(openAPI, property), processedModels)); - } else { - mp.put("key", - resolvePropertyToExample(propertyName, mediaType, ModelUtils.getAdditionalProperties(openAPI, property), processedModels)); - } - return mp; - } else if (ModelUtils.isUUIDSchema(property)) { - return "046b6c7f-0b8a-43b9-b35d-6489e6daee91"; - } else if (ModelUtils.isURISchema(property)) { - return "https://openapi-generator.tech"; - } else if (ModelUtils.isStringSchema(property)) { - LOGGER.debug("String property"); - String defaultValue = (String) property.getDefault(); - if (defaultValue != null && !defaultValue.isEmpty()) { - LOGGER.debug("Default value found: '{}'", defaultValue); - return defaultValue; - } - List enumValues = property.getEnum(); - if (enumValues != null && !enumValues.isEmpty()) { - LOGGER.debug("Enum value found: '{}'", enumValues.get(0)); - return enumValues.get(0); - } - String format = property.getFormat(); - if (format != null && (URI.equals(format) || URL.equals(format))) { - LOGGER.debug("URI or URL format, without default or enum, generating random one."); - return "http://example.com/aeiou"; - } - LOGGER.debug("No values found, using property name {} as example", propertyName); - return propertyName; - } else if (!StringUtils.isEmpty(property.get$ref())) { // model - String simpleName = ModelUtils.getSimpleRef(property.get$ref()); - Schema schema = ModelUtils.getSchema(openAPI, simpleName); - if (schema == null) { // couldn't find the model/schema - return "{}"; - } - return resolveModelToExample(simpleName, mediaType, schema, processedModels); - - } else if (ModelUtils.isObjectSchema(property)) { - return "{}"; - } - - return ""; - } - - private Double getPropertyValue(BigDecimal propertyValue) { - return propertyValue == null ? null : propertyValue.doubleValue(); - } - - private double randomNumber(Double min, Double max) { - if (min != null && max != null) { - double range = max - min; - return random.nextDouble() * range + min; - } else if (min != null) { - return random.nextDouble() + min; - } else if (max != null) { - return random.nextDouble() * max; - } else { - return random.nextDouble() * 10; - } - } - - private Object resolveModelToExample(String name, String mediaType, Schema schema, Set processedModels) { - if (processedModels.contains(name)) { - return schema.getExample(); - } - - processedModels.add(name); - Map values = new HashMap<>(); - LOGGER.debug("Resolving model '{}' to example", name); - if (schema.getExample() != null) { - LOGGER.debug("Using example from spec: {}", schema.getExample()); - return schema.getExample(); - } else if (schema.getProperties() != null) { - LOGGER.debug("Creating example from model values"); - for (Object propertyName : schema.getProperties().keySet()) { - Schema property = (Schema) schema.getProperties().get(propertyName.toString()); - values.put(propertyName.toString(), resolvePropertyToExample(propertyName.toString(), mediaType, property, processedModels)); - } - schema.setExample(values); - return schema.getExample(); - } else { - // TODO log an error message as the model does not have any properties - return null; - } - } -} diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/examples/XmlExampleGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/examples/XmlExampleGenerator.java deleted file mode 100644 index 1eabf2a9125..00000000000 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/examples/XmlExampleGenerator.java +++ /dev/null @@ -1,234 +0,0 @@ -/* - * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) - * Copyright 2018 SmartBear Software - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.openapijsonschematools.codegen.examples; - -import io.swagger.v3.oas.models.media.ArraySchema; -import io.swagger.v3.oas.models.media.Schema; -import io.swagger.v3.oas.models.media.XML; -import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.utils.ModelUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.*; - -public class XmlExampleGenerator { - protected final Logger LOGGER = LoggerFactory.getLogger(XmlExampleGenerator.class); - public static String NEWLINE = "\n"; - public static String TAG_START = "<"; - public static String CLOSE_TAG = ">"; - public static String TAG_END = " examples; - - public XmlExampleGenerator(Map examples) { - this.examples = examples; - if (examples == null) { - this.examples = new HashMap(); - } - } - - public String toXml(Schema schema) { - return toXml(null, schema, 0, Collections.emptySet()); - } - - protected String toXml(Schema schema, int indent, Collection path) { - if (schema == null) return ""; - if (StringUtils.isNotEmpty(schema.get$ref())) { - Schema actualSchema = examples.get(schema.get$ref()); - if (actualSchema != null) { - return modelImplToXml(actualSchema, indent, path); - } - } - return modelImplToXml(schema, indent, path); - } - - protected String modelImplToXml(Schema schema, int indent, Collection path) { - final String modelName = schema.getName(); - if (path.contains(modelName)) { - return EMPTY; - } - final Set selfPath = new HashSet(path); - selfPath.add(modelName); - - StringBuilder sb = new StringBuilder(); - // attributes - Map attributes = new LinkedHashMap(); - Map elements = new LinkedHashMap(); - - String name = modelName; - XML xml = schema.getXml(); - if (xml != null) { - if (xml.getName() != null) { - name = xml.getName(); - } - } - // TODO: map objects will not enter this block - Map properties = schema.getProperties(); - if (properties != null && !properties.isEmpty()) { - for (Map.Entry propertiesEntry : properties.entrySet()) { - String pName = propertiesEntry.getKey(); - Schema property = propertiesEntry.getValue(); - if (property != null && property.getXml() != null && property.getXml().getAttribute() != null && property.getXml().getAttribute()) { - attributes.put(pName, property); - } else { - elements.put(pName, property); - } - } - } - - sb.append(indent(indent)).append(TAG_START); - sb.append(name); - for (Map.Entry attributesEntry : attributes.entrySet()) { - String pName = attributesEntry.getKey(); - Schema s = attributesEntry.getValue(); - sb.append(" ").append(pName).append("=").append(quote(toXml(null, s, 0, selfPath))); - } - sb.append(CLOSE_TAG); - sb.append(NEWLINE); - for (Map.Entry elementsEntry : elements.entrySet()) { - String pName = elementsEntry.getKey(); - Schema s = elementsEntry.getValue(); - final String asXml = toXml(pName, s, indent + 1, selfPath); - if (StringUtils.isEmpty(asXml)) { - continue; - } - sb.append(asXml); - sb.append(NEWLINE); - } - sb.append(indent(indent)).append(TAG_END).append(name).append(CLOSE_TAG); - - return sb.toString(); - } - - @SuppressWarnings("static-method") - protected String quote(String string) { - return "\"" + string + "\""; - } - - protected String toXml(String name, Schema schema, int indent, Collection path) { - if (schema == null) { - return ""; - } - StringBuilder sb = new StringBuilder(); - - if (ModelUtils.isArraySchema(schema)) { - ArraySchema as = (ArraySchema) schema; - Schema inner = as.getItems(); - boolean wrapped = false; - if (schema.getXml() != null && schema.getXml().getWrapped() != null && schema.getXml().getWrapped()) { - wrapped = true; - } - if (wrapped) { - String prefix = EMPTY; - if (name != null) { - sb.append(indent(indent)); - sb.append(openTag(name)); - prefix = NEWLINE; - } - final String asXml = toXml(name, inner, indent + 1, path); - if (StringUtils.isNotEmpty(asXml)) { - sb.append(prefix).append(asXml); - } - if (name != null) { - sb.append(NEWLINE); - sb.append(indent(indent)); - sb.append(closeTag(name)); - } - } else { - sb.append(toXml(name, inner, indent, path)); - } - } else if (StringUtils.isNotEmpty(schema.get$ref())) { - Schema actualSchema = examples.get(schema.get$ref()); - sb.append(toXml(actualSchema, indent, path)); - } else { - if (name != null) { - sb.append(indent(indent)); - sb.append(openTag(name)); - } - sb.append(getExample(schema)); - if (name != null) { - sb.append(closeTag(name)); - } - } - return sb.toString(); - } - - /** - * Get the example string value for the given schema. - * - * If an example value was not provided in the specification, a default will be generated. - * - * @param schema Schema to get example string for - * @return Example String - */ - protected String getExample(Schema schema) { - if (schema.getExample() != null) { - return schema.getExample().toString(); - } else if (ModelUtils.isDateTimeSchema(schema)) { - return "2000-01-23T04:56:07.000Z"; - } else if (ModelUtils.isDateSchema(schema)) { - return "2000-01-23"; - } else if (ModelUtils.isBooleanSchema(schema)) { - return "true"; - } else if (ModelUtils.isNumberSchema(schema)) { - if (ModelUtils.isFloatSchema(schema)) { // float - return "1.3579"; - } else { // double - return "3.149"; - } - } else if (ModelUtils.isPasswordSchema(schema)) { - return "********"; - } else if (ModelUtils.isUUIDSchema(schema)) { - return "046b6c7f-0b8a-43b9-b35d-6489e6daee91"; - } else if (ModelUtils.isURISchema(schema)) { - return "https://openapi-generator.tech"; - // do these last in case the specific types above are derived from these classes - } else if (ModelUtils.isStringSchema(schema)) { - return "aeiou"; - } else if (ModelUtils.isIntegerSchema(schema)) { - if (ModelUtils.isLongSchema(schema)) { // long - return "123456789"; - } else { //integer - return "123"; - } - } else { - LOGGER.debug("default example value not implemented for {}. Default to UNDEFINED_EXAMPLE_VALUE", schema); - return "UNDEFINED_EXAMPLE_VALUE"; - } - } - - @SuppressWarnings("static-method") - protected String openTag(String name) { - return "<" + name + ">"; - } - - @SuppressWarnings("static-method") - protected String closeTag(String name) { - return ""; - } - - @SuppressWarnings("static-method") - protected String indent(int indent) { - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < indent; i++) { - sb.append(" "); - } - return sb.toString(); - } -} diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/ExampleGeneratorTestRunner.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/ExampleGeneratorTestRunner.java deleted file mode 100644 index d46439b0759..00000000000 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/ExampleGeneratorTestRunner.java +++ /dev/null @@ -1,144 +0,0 @@ -package org.openapijsonschematools.codegen; - -import io.swagger.v3.oas.models.OpenAPI; -import org.openapijsonschematools.codegen.examples.ExampleGenerator; -import org.testng.annotations.Test; - -import java.util.*; - -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertNull; - -public class ExampleGeneratorTestRunner { - @Test - public void generateFromResponseSchemaWithPrimitiveType() { - OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/example_generator_test.yaml"); - - ExampleGenerator exampleGenerator = new ExampleGenerator(openAPI.getComponents().getSchemas(), openAPI); - Set mediaTypeKeys = new TreeSet<>(); - mediaTypeKeys.add("application/json"); - List> examples = exampleGenerator.generateFromResponseSchema( - "200", - openAPI - .getPaths() - .get("/generate_from_response_schema_with_primitive_type") - .getGet() - .getResponses() - .get("200") - .getContent() - .get("application/json") - .getSchema(), - mediaTypeKeys - ); - - assertEquals(1, examples.size()); - assertEquals("application/json", examples.get(0).get("contentType")); - assertEquals("\"primitive type example value\"", examples.get(0).get("example")); - assertEquals("200", examples.get(0).get("statusCode")); - } - - @Test - public void generateFromResponseSchemaWithNoExample() { - OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/example_generator_test.yaml"); - - ExampleGenerator exampleGenerator = new ExampleGenerator(openAPI.getComponents().getSchemas(), openAPI); - Set mediaTypeKeys = new TreeSet<>(); - mediaTypeKeys.add("application/json"); - List> examples = exampleGenerator.generateFromResponseSchema( - "200", - openAPI - .getPaths() - .get("/generate_from_response_schema_with_no_example") - .getGet() - .getResponses() - .get("200") - .getContent() - .get("application/json") - .getSchema(), - mediaTypeKeys - ); - - assertNull(examples); - } - - @Test - public void generateFromResponseSchemaWithArrayOfModel() { - OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/example_generator_test.yaml"); - - ExampleGenerator exampleGenerator = new ExampleGenerator(openAPI.getComponents().getSchemas(), openAPI); - Set mediaTypeKeys = new TreeSet<>(); - mediaTypeKeys.add("application/json"); - List> examples = exampleGenerator.generateFromResponseSchema( - "200", - openAPI - .getPaths() - .get("/generate_from_response_schema_with_array_of_model") - .getGet() - .getResponses() - .get("200") - .getContent() - .get("application/json") - .getSchema(), - mediaTypeKeys - ); - - assertEquals(1, examples.size()); - assertEquals("application/json", examples.get(0).get("contentType")); - assertEquals("\"string schema example value\"", examples.get(0).get("example")); - assertEquals("200", examples.get(0).get("statusCode")); - } - - @Test - public void generateFromResponseSchemaWithArrayOfPrimitiveTypes() { - OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/example_generator_test.yaml"); - - ExampleGenerator exampleGenerator = new ExampleGenerator(openAPI.getComponents().getSchemas(), openAPI); - Set mediaTypeKeys = new TreeSet<>(); - mediaTypeKeys.add("application/json"); - List> examples = exampleGenerator.generateFromResponseSchema( - "200", - openAPI - .getPaths() - .get("/generate_from_response_schema_with_array_of_primitive_types") - .getGet() - .getResponses() - .get("200") - .getContent() - .get("application/json") - .getSchema(), - mediaTypeKeys - ); - - assertEquals(1, examples.size()); - assertEquals("application/json", examples.get(0).get("contentType")); - assertEquals("\"primitive types example value\"", examples.get(0).get("example")); - assertEquals("200", examples.get(0).get("statusCode")); - } - - @Test - public void generateFromResponseSchemaWithModel() { - OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/example_generator_test.yaml"); - - ExampleGenerator exampleGenerator = new ExampleGenerator(openAPI.getComponents().getSchemas(), openAPI); - Set mediaTypeKeys = new TreeSet<>(); - mediaTypeKeys.add("application/json"); - List> examples = exampleGenerator.generateFromResponseSchema( - "200", - openAPI - .getPaths() - .get("/generate_from_response_schema_with_model") - .getGet() - .getResponses() - .get("200") - .getContent() - .get("application/json") - .getSchema(), - mediaTypeKeys - ); - - assertEquals(1, examples.size()); - assertEquals("application/json", examples.get(0).get("contentType")); - assertEquals(String.format(Locale.ROOT, "{%n \"example_schema_property\" : \"example schema property value\"%n}"), examples.get(0).get("example")); - assertEquals("200", examples.get(0).get("statusCode")); - } -} diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/serializer/SerializerUtilsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/SerializerUtilsTest.java similarity index 99% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/serializer/SerializerUtilsTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/SerializerUtilsTest.java index 9fd323aa6e6..7f447fd8342 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/serializer/SerializerUtilsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/SerializerUtilsTest.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.serializer; +package org.openapijsonschematools.codegen.utils; import io.swagger.v3.oas.models.*; import io.swagger.v3.oas.models.info.Info; From d8cb01ea6dbd10ccddbf198bb054ea8ef6f146c8 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 11:24:37 -0700 Subject: [PATCH 10/43] Renames codegenerator to generatorrunner --- docs/global-properties.md | 2 +- .../codegen/cmd/AuthorTemplate.java | 4 +-- .../codegen/cmd/ConfigHelp.java | 6 ++-- .../codegen/cmd/Generate.java | 8 ++--- .../codegen/cmd/GenerateBatch.java | 2 +- .../codegen/cmd/ListGenerators.java | 4 +-- .../codegen/cmd/GenerateTest.java | 4 +-- .../codegen/cmd/utils/OptionUtilsTest.java | 2 +- .../codegen/{ => common}/DryRunStatus.java | 6 ++-- .../ImplementationVersion.java | 2 +- .../codegen/{utils => common}/JsonCache.java | 2 +- .../{utils => common}/JsonCacheImpl.java | 2 +- .../codegen/{utils => common}/Markdown.java | 2 +- .../codegen/{utils => common}/ModelUtils.java | 2 +- .../codegen/{utils => common}/OnceLogger.java | 2 +- .../{utils => common}/OpenAPISerializer.java | 2 +- .../{utils => common}/OptionUtils.java | 2 +- .../{utils => common}/ProcessUtils.java | 2 +- .../codegen/{utils => common}/SemVer.java | 2 +- .../{utils => common}/SerializerUtils.java | 2 +- .../{utils => common}/StringUtils.java | 2 +- .../{utils => common}/URLPathUtils.java | 4 +-- .../codegen/config/CodegenConfigurator.java | 6 ++-- .../config/CodegenConfiguratorUtils.java | 2 +- .../CodegenConstants.java | 2 +- .../DefaultGeneratorRunner.java | 16 ++++----- .../GeneratorLanguage.java | 2 +- .../GeneratorLoader.java | 2 +- .../GeneratorNotFoundException.java | 2 +- .../GeneratorRunner.java | 2 +- .../GeneratorType.java | 2 +- .../VendorExtension.java | 2 +- .../generators/AbstractJavaGenerator.java | 6 ++-- .../AbstractJavaJAXRSServerGenerator.java | 6 ++-- .../generators/AbstractKotlinGenerator.java | 8 ++--- .../generators/AbstractPythonGenerator.java | 10 +++--- .../codegen/generators/DefaultGenerator.java | 34 +++++++++---------- .../codegen/generators/Generator.java | 8 ++--- .../generators/JMeterClientGenerator.java | 2 +- .../generators/JavaClientGenerator.java | 10 +++--- .../generators/JavaJerseyServerGenerator.java | 2 +- .../generators/KotlinClientGenerator.java | 6 ++-- .../generators/PythonClientGenerator.java | 10 +++--- .../codegen/model/CodegenHeader.java | 2 +- .../codegen/model/CodegenParameter.java | 2 +- .../DryRunTemplateManager.java | 5 ++- .../templating/mustache/CamelCaseLambda.java | 2 +- .../mustache/OptionalParameterLambda.java | 2 +- .../mustache/RequiredParameterLambda.java | 2 +- .../templating/mustache/SnakecaseLambda.java | 2 +- .../validation/oas/OpenApiEvaluator.java | 2 +- .../oas/OpenApiSchemaValidations.java | 4 +-- .../codegen/AbstractIntegrationTest.java | 1 + .../codegen/MockDefaultGeneratorRunner.java | 4 ++- .../codegen/TestUtils.java | 3 +- .../{utils => common}/JsonCacheTest.java | 2 +- .../{utils => common}/ModelUtilsTest.java | 2 +- .../{utils => common}/OnceLoggerTest.java | 2 +- .../SerializerUtilsTest.java | 3 +- .../{utils => common}/StringUtilsTest.java | 2 +- .../{utils => common}/URLPathUtilsTest.java | 2 +- .../DefaultGeneratorRunnerTest.java} | 10 +++--- .../generators/DefaultGeneratorTest.java | 8 ++--- .../generators/PythonClientGeneratorTest.java | 5 ++- .../AbstractJavaCodegenExampleValuesTest.java | 2 +- .../options/PythonClientOptionsProvider.java | 2 +- 66 files changed, 140 insertions(+), 137 deletions(-) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => common}/DryRunStatus.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{utils => common}/ImplementationVersion.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{utils => common}/JsonCache.java (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{utils => common}/JsonCacheImpl.java (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{utils => common}/Markdown.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{utils => common}/ModelUtils.java (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{utils => common}/OnceLogger.java (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{utils => common}/OpenAPISerializer.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{utils => common}/OptionUtils.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{utils => common}/ProcessUtils.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{utils => common}/SemVer.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{utils => common}/SerializerUtils.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{utils => common}/StringUtils.java (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{utils => common}/URLPathUtils.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{codegenerator => generatorrunner}/CodegenConstants.java (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => generatorrunner}/DefaultGeneratorRunner.java (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{codegenerator => generatorrunner}/GeneratorLanguage.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{codegenerator => generatorrunner}/GeneratorLoader.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{codegenerator => generatorrunner}/GeneratorNotFoundException.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{codegenerator => generatorrunner}/GeneratorRunner.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{codegenerator => generatorrunner}/GeneratorType.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{codegenerator => generatorrunner}/VendorExtension.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => templating}/DryRunTemplateManager.java (94%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{utils => common}/JsonCacheTest.java (99%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{utils => common}/ModelUtilsTest.java (99%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{utils => common}/OnceLoggerTest.java (98%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{utils => common}/SerializerUtilsTest.java (98%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{utils => common}/StringUtilsTest.java (97%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{utils => common}/URLPathUtilsTest.java (99%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{DefaultGeneratorTestRunner.java => generatorrunner/DefaultGeneratorRunnerTest.java} (99%) diff --git a/docs/global-properties.md b/docs/global-properties.md index 543d9d2f986..071dd9b5c65 100644 --- a/docs/global-properties.md +++ b/docs/global-properties.md @@ -13,7 +13,7 @@ title: Global Properties | debugSupportingFiles | Dumps JSON formatted Supporting File information during generation | none | | verbose | Defines the verbosity | `true` or `false` | | generateAliasAsModel | Defines whether primitive types defined at the model/schema level will be wrapped in a model | `true` or `false` | -| org.openapijsonschematools.codegen.utils.oncelogger.enabled | Enable/disable the "OnceLogger" which reduces noise for select repeated logs | `true` or `false` | +| org.openapijsonschematools.codegen.common.oncelogger.enabled | Enable/disable the "OnceLogger" which reduces noise for select repeated logs | `true` or `false` | | supportingFiles | Allows the user to define which supporting files will be generated. Prefer using the more robust `.openapi-generator-ignore`. | no value, or a comma-separated string of file names | | models | Allows the user to define which models will be generated. Prefer using the more robust `.openapi-generator-ignore`. | no value, or a comma-separated string of model names | | apis | Allows the user to define which apis will be generated. Prefer using the more robust `.openapi-generator-ignore`. | no value, or a comma-separated string of api names | diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java index 82515082374..30437fb6659 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java @@ -4,8 +4,8 @@ import io.airlift.airline.Option; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.generators.Generator; -import org.openapijsonschematools.codegen.codegenerator.GeneratorLoader; -import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorLoader; +import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java index 07d734c1d1a..f5c321d800c 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java @@ -22,9 +22,9 @@ import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; import org.openapijsonschematools.codegen.generators.Generator; -import org.openapijsonschematools.codegen.codegenerator.GeneratorLoader; -import org.openapijsonschematools.codegen.codegenerator.GeneratorNotFoundException; -import org.openapijsonschematools.codegen.codegenerator.VendorExtension; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorLoader; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorNotFoundException; +import org.openapijsonschematools.codegen.generatorrunner.VendorExtension; import org.openapijsonschematools.codegen.generators.generatormetadata.FeatureSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java index 35c9f91905c..c7f7961fff4 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java @@ -30,10 +30,10 @@ import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.ClientOptInput; -import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; -import org.openapijsonschematools.codegen.DefaultGeneratorRunner; -import org.openapijsonschematools.codegen.codegenerator.GeneratorRunner; -import org.openapijsonschematools.codegen.codegenerator.GeneratorNotFoundException; +import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; +import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorRunner; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorNotFoundException; import org.openapijsonschematools.codegen.config.CodegenConfigurator; import org.openapijsonschematools.codegen.config.CodegenConfiguratorUtils; import org.slf4j.Logger; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java index adabac2aeef..6e758bf8a7b 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java @@ -34,7 +34,7 @@ import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.ClientOptInput; import org.openapijsonschematools.codegen.generators.Generator; -import org.openapijsonschematools.codegen.DefaultGeneratorRunner; +import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; import org.openapijsonschematools.codegen.config.CodegenConfigurator; import org.openapijsonschematools.codegen.config.DynamicSettings; import org.openapijsonschematools.codegen.config.GlobalSettings; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java index 5747d58a9bd..205f3325040 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java @@ -7,8 +7,8 @@ import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.generators.Generator; -import org.openapijsonschematools.codegen.codegenerator.GeneratorLoader; -import org.openapijsonschematools.codegen.codegenerator.GeneratorType; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorLoader; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorType; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorMetadata; import org.openapijsonschematools.codegen.generators.generatormetadata.Stability; diff --git a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateTest.java b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateTest.java index d36aa23dbbe..323512abd5b 100644 --- a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateTest.java +++ b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateTest.java @@ -20,8 +20,8 @@ import io.airlift.airline.Cli; import org.apache.commons.lang3.ArrayUtils; import org.mockito.MockSettings; -import org.openapijsonschematools.codegen.DefaultGeneratorRunner; -import org.openapijsonschematools.codegen.codegenerator.GeneratorRunner; +import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorRunner; import org.openapijsonschematools.codegen.config.CodegenConfigurator; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; diff --git a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/utils/OptionUtilsTest.java b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/utils/OptionUtilsTest.java index b83da92b592..406fdefc1d3 100644 --- a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/utils/OptionUtilsTest.java +++ b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/utils/OptionUtilsTest.java @@ -17,7 +17,7 @@ package org.openapijsonschematools.codegen.cmd.utils; -import org.openapijsonschematools.codegen.utils.OptionUtils; +import org.openapijsonschematools.codegen.common.OptionUtils; import org.apache.commons.lang3.tuple.Pair; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DryRunStatus.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/DryRunStatus.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DryRunStatus.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/DryRunStatus.java index df2add3b6cd..f399b2389bd 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DryRunStatus.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/DryRunStatus.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.common; import java.io.IOException; import java.nio.file.Path; @@ -7,7 +7,7 @@ /** * Holds details about a file's write status for display via the --dry-run option of CLI */ -class DryRunStatus { +public class DryRunStatus { private Path path; private State state; private String reason; @@ -116,7 +116,7 @@ public void setState(State state) { /** * Represents the possible states of a file write operation as determined by the Generator */ - enum State { + public enum State { Write("w", "Write"), WriteIfNewer("n", "Write if New/Updated"), Ignored("i", "Ignored"), diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/ImplementationVersion.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ImplementationVersion.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/ImplementationVersion.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ImplementationVersion.java index c61084529f3..4645030f826 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/ImplementationVersion.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ImplementationVersion.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; public class ImplementationVersion { public static String read() { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/JsonCache.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/JsonCache.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/JsonCache.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/JsonCache.java index 7105a387418..b1c8a29a19a 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/JsonCache.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/JsonCache.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; import java.io.File; import java.io.InputStream; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/JsonCacheImpl.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/JsonCacheImpl.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/JsonCacheImpl.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/JsonCacheImpl.java index b983abd9dbe..1abe04c70d9 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/JsonCacheImpl.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/JsonCacheImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; import java.io.File; import java.io.FileInputStream; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/Markdown.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/Markdown.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/Markdown.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/Markdown.java index 6479f53fca4..fe8c765d7ca 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/Markdown.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/Markdown.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; import org.commonmark.node.Node; import org.commonmark.parser.Parser; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/ModelUtils.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ModelUtils.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/ModelUtils.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ModelUtils.java index 89021fcd0d2..41c5bcbd1f1 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/ModelUtils.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ModelUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/OnceLogger.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/OnceLogger.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/OnceLogger.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/OnceLogger.java index 34b13384ef5..81cc9ba9e18 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/OnceLogger.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/OnceLogger.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/OpenAPISerializer.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/OpenAPISerializer.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/OpenAPISerializer.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/OpenAPISerializer.java index 699a0dc6df8..f1369129832 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/OpenAPISerializer.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/OpenAPISerializer.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/OptionUtils.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/OptionUtils.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/OptionUtils.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/OptionUtils.java index 00a2980ea98..f7af5a56c9a 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/OptionUtils.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/OptionUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; import org.apache.commons.lang3.tuple.Pair; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/ProcessUtils.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ProcessUtils.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/ProcessUtils.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ProcessUtils.java index 1461ed98663..c33d6dff4fd 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/ProcessUtils.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ProcessUtils.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.security.SecurityScheme; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/SemVer.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/SemVer.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/SemVer.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/SemVer.java index 05c91a689fd..eb5c734d658 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/SemVer.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/SemVer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; public class SemVer implements Comparable { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/SerializerUtils.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/SerializerUtils.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/SerializerUtils.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/SerializerUtils.java index 39d9347a941..b7db60e5b34 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/SerializerUtils.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/SerializerUtils.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.MapperFeature; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/StringUtils.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/StringUtils.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/StringUtils.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/StringUtils.java index f1f4ee44abf..53b42219c2f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/StringUtils.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/StringUtils.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/URLPathUtils.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/URLPathUtils.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/URLPathUtils.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/URLPathUtils.java index 4c56aa65847..3df5bce290e 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/utils/URLPathUtils.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/URLPathUtils.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.servers.Server; @@ -32,7 +32,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.openapijsonschematools.codegen.utils.OnceLogger.once; +import static org.openapijsonschematools.codegen.common.OnceLogger.once; public class URLPathUtils { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java index d9714c746e3..750e5c4826f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java @@ -32,13 +32,13 @@ import org.apache.commons.lang3.Validate; import org.openapijsonschematools.codegen.cli.ClientOptInput; import org.openapijsonschematools.codegen.generators.Generator; -import org.openapijsonschematools.codegen.codegenerator.GeneratorLoader; -import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorLoader; +import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; import org.openapijsonschematools.codegen.templating.TemplatingEngineLoader; import org.openapijsonschematools.codegen.templating.TemplateDefinition; import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter; import org.openapijsonschematools.codegen.cli.AuthParser; -import org.openapijsonschematools.codegen.utils.ModelUtils; +import org.openapijsonschematools.codegen.common.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfiguratorUtils.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfiguratorUtils.java index 044c9af0517..621162d3280 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfiguratorUtils.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfiguratorUtils.java @@ -18,7 +18,7 @@ package org.openapijsonschematools.codegen.config; import org.apache.commons.lang3.tuple.Pair; -import org.openapijsonschematools.codegen.utils.OptionUtils; +import org.openapijsonschematools.codegen.common.OptionUtils; import java.util.*; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConstants.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/CodegenConstants.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConstants.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/CodegenConstants.java index 8bf0cb56b3d..bfe376a8eea 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/CodegenConstants.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/CodegenConstants.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.codegenerator; +package org.openapijsonschematools.codegen.generatorrunner; /** * A class for storing constants that are used throughout the project. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGeneratorRunner.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGeneratorRunner.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java index 0bec1a87fd4..e31f3318bd4 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DefaultGeneratorRunner.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.generatorrunner; import io.swagger.v3.core.util.Json; import io.swagger.v3.oas.models.OpenAPI; @@ -33,9 +33,8 @@ import org.apache.commons.io.comparator.PathFileComparator; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.common.DryRunStatus; import org.openapijsonschematools.codegen.generators.Generator; -import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; -import org.openapijsonschematools.codegen.codegenerator.GeneratorRunner; import org.openapijsonschematools.codegen.config.GlobalSettings; import org.openapijsonschematools.codegen.ignore.CodegenIgnoreProcessor; import org.openapijsonschematools.codegen.model.CodegenHeader; @@ -51,17 +50,18 @@ import org.openapijsonschematools.codegen.model.CodegenSecurityScheme; import org.openapijsonschematools.codegen.model.CodegenServer; import org.openapijsonschematools.codegen.model.CodegenTag; +import org.openapijsonschematools.codegen.templating.DryRunTemplateManager; import org.openapijsonschematools.codegen.templating.SupportingFile; -import org.openapijsonschematools.codegen.utils.SerializerUtils; +import org.openapijsonschematools.codegen.common.SerializerUtils; import org.openapijsonschematools.codegen.templating.CommonTemplateContentLocator; import org.openapijsonschematools.codegen.templating.GeneratorTemplateContentLocator; import org.openapijsonschematools.codegen.templating.MustacheEngineAdapter; import org.openapijsonschematools.codegen.templating.TemplateManager; import org.openapijsonschematools.codegen.templating.TemplateManagerOptions; -import org.openapijsonschematools.codegen.utils.ImplementationVersion; -import org.openapijsonschematools.codegen.utils.ModelUtils; -import org.openapijsonschematools.codegen.utils.OnceLogger; -import org.openapijsonschematools.codegen.utils.URLPathUtils; +import org.openapijsonschematools.codegen.common.ImplementationVersion; +import org.openapijsonschematools.codegen.common.ModelUtils; +import org.openapijsonschematools.codegen.common.OnceLogger; +import org.openapijsonschematools.codegen.common.URLPathUtils; import org.openapijsonschematools.codegen.templating.TemplateDefinition; import org.openapijsonschematools.codegen.templating.TemplatePathLocator; import org.openapijsonschematools.codegen.templating.TemplateProcessor; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorLanguage.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorLanguage.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorLanguage.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorLanguage.java index 507b2684906..02f25cd11c6 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorLanguage.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorLanguage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.codegenerator; +package org.openapijsonschematools.codegen.generatorrunner; public enum GeneratorLanguage { /* diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorLoader.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorLoader.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorLoader.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorLoader.java index bcce01d70fa..aa6e2294b0d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorLoader.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorLoader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.codegenerator; +package org.openapijsonschematools.codegen.generatorrunner; import org.openapijsonschematools.codegen.generators.Generator; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorNotFoundException.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorNotFoundException.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorNotFoundException.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorNotFoundException.java index 2bbf39a13ae..10931cf4003 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorNotFoundException.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorNotFoundException.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.codegenerator; +package org.openapijsonschematools.codegen.generatorrunner; /** * Typed exception exposing issues with loading generators (e.g. by name). diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorRunner.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorRunner.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorRunner.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorRunner.java index 6ce87fb9b2c..65e4a9548eb 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorRunner.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorRunner.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.codegenerator; +package org.openapijsonschematools.codegen.generatorrunner; import org.openapijsonschematools.codegen.cli.ClientOptInput; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorType.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorType.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorType.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorType.java index 364d6745277..6aec5622787 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/GeneratorType.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorType.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.codegenerator; +package org.openapijsonschematools.codegen.generatorrunner; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/VendorExtension.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/VendorExtension.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/VendorExtension.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/VendorExtension.java index 5c03c0ef88b..0db8eb331bf 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/codegenerator/VendorExtension.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/VendorExtension.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.codegenerator; +package org.openapijsonschematools.codegen.generatorrunner; import java.util.Collections; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java index 18be01b8a89..c9a1a1bc80e 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java @@ -28,11 +28,11 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; +import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; import org.openapijsonschematools.codegen.model.CodegenPatternInfo; import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.codegenerator.VendorExtension; +import org.openapijsonschematools.codegen.generatorrunner.VendorExtension; import org.openapijsonschematools.codegen.generators.features.DocumentationProviderFeatures; import org.openapijsonschematools.codegen.generators.generatormetadata.features.ClientModificationFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.DocumentationFeature; @@ -47,7 +47,7 @@ import java.util.regex.Pattern; import java.util.stream.Stream; -import static org.openapijsonschematools.codegen.utils.StringUtils.*; +import static org.openapijsonschematools.codegen.common.StringUtils.*; public abstract class AbstractJavaGenerator extends DefaultGenerator implements Generator, DocumentationProviderFeatures { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java index 50dbda64b66..10fcf707eeb 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java @@ -23,11 +23,11 @@ import io.swagger.v3.oas.models.PathItem; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; -import org.openapijsonschematools.codegen.codegenerator.GeneratorType; +import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorType; import org.openapijsonschematools.codegen.model.CodegenOperation; import org.openapijsonschematools.codegen.generators.features.BeanValidationFeatures; -import org.openapijsonschematools.codegen.utils.URLPathUtils; +import org.openapijsonschematools.codegen.common.URLPathUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java index acfd60b5624..1ef36eba181 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java @@ -21,11 +21,11 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; +import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; import org.openapijsonschematools.codegen.model.CodegenPatternInfo; import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.codegenerator.GeneratorLanguage; -import org.openapijsonschematools.codegen.utils.ModelUtils; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorLanguage; +import org.openapijsonschematools.codegen.common.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,7 +34,7 @@ import java.util.*; import java.util.regex.Pattern; -import static org.openapijsonschematools.codegen.utils.StringUtils.*; +import static org.openapijsonschematools.codegen.common.StringUtils.*; public abstract class AbstractKotlinGenerator extends DefaultGenerator implements Generator { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractPythonGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractPythonGenerator.java index c3bcba9ed32..a85d2c6d694 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractPythonGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractPythonGenerator.java @@ -21,9 +21,9 @@ import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; -import org.openapijsonschematools.codegen.codegenerator.GeneratorLanguage; -import org.openapijsonschematools.codegen.utils.ModelUtils; +import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorLanguage; +import org.openapijsonschematools.codegen.common.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,8 +34,8 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import static org.openapijsonschematools.codegen.utils.StringUtils.camelize; -import static org.openapijsonschematools.codegen.utils.StringUtils.underscore; +import static org.openapijsonschematools.codegen.common.StringUtils.camelize; +import static org.openapijsonschematools.codegen.common.StringUtils.underscore; public abstract class AbstractPythonGenerator extends DefaultGenerator implements Generator { private final Logger LOGGER = LoggerFactory.getLogger(AbstractPythonGenerator.class); diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java index 94d4a993f4b..da7dc089f1b 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java @@ -34,10 +34,10 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; -import org.openapijsonschematools.codegen.codegenerator.GeneratorType; -import org.openapijsonschematools.codegen.codegenerator.GeneratorLanguage; -import org.openapijsonschematools.codegen.codegenerator.VendorExtension; +import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorType; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorLanguage; +import org.openapijsonschematools.codegen.generatorrunner.VendorExtension; import org.openapijsonschematools.codegen.config.GlobalSettings; import org.openapijsonschematools.codegen.generators.generatormetadata.features.ComponentsFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.DataTypeFeature; @@ -76,7 +76,7 @@ import org.openapijsonschematools.codegen.model.PairCacheKey; import org.openapijsonschematools.codegen.model.SchemaTestCase; import org.openapijsonschematools.codegen.templating.SupportingFile; -import org.openapijsonschematools.codegen.utils.SerializerUtils; +import org.openapijsonschematools.codegen.common.SerializerUtils; import org.openapijsonschematools.codegen.templating.MustacheEngineAdapter; import org.openapijsonschematools.codegen.templating.mustache.CamelCaseLambda; import org.openapijsonschematools.codegen.templating.mustache.IndentedLambda; @@ -84,7 +84,7 @@ import org.openapijsonschematools.codegen.templating.mustache.SnakecaseLambda; import org.openapijsonschematools.codegen.templating.mustache.TitlecaseLambda; import org.openapijsonschematools.codegen.templating.mustache.UppercaseLambda; -import org.openapijsonschematools.codegen.utils.ModelUtils; +import org.openapijsonschematools.codegen.common.ModelUtils; import org.openapijsonschematools.codegen.model.CodegenDiscriminator.MappedModel; import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter; import org.openapijsonschematools.codegen.generators.generatormetadata.FeatureSet; @@ -186,8 +186,8 @@ public class DefaultGenerator implements Generator { ) .build(); - int cacheSize = Integer.parseInt(GlobalSettings.getProperty(org.openapijsonschematools.codegen.utils.StringUtils.NAME_CACHE_SIZE_PROPERTY, "500")); - int cacheExpiry = Integer.parseInt(GlobalSettings.getProperty(org.openapijsonschematools.codegen.utils.StringUtils.NAME_CACHE_EXPIRY_PROPERTY, "10")); + int cacheSize = Integer.parseInt(GlobalSettings.getProperty(org.openapijsonschematools.codegen.common.StringUtils.NAME_CACHE_SIZE_PROPERTY, "500")); + int cacheExpiry = Integer.parseInt(GlobalSettings.getProperty(org.openapijsonschematools.codegen.common.StringUtils.NAME_CACHE_EXPIRY_PROPERTY, "10")); sanitizedNameCache = Caffeine.newBuilder() .maximumSize(cacheSize) .expireAfterAccess(cacheExpiry, TimeUnit.SECONDS) @@ -1075,7 +1075,7 @@ public String toModelFilename(String name, String jsonPath) { @Override public String toModuleFilename(String name, String jsonPath) { - return org.openapijsonschematools.codegen.utils.StringUtils.camelize(name); + return org.openapijsonschematools.codegen.common.StringUtils.camelize(name); } public String toPathFilename(String name, String jsonPath) { @@ -1119,7 +1119,7 @@ public String getCamelCaseParameter(String basename) { */ @Override public String toModelTestFilename(String name) { - return org.openapijsonschematools.codegen.utils.StringUtils.camelize(name) + "Test"; + return org.openapijsonschematools.codegen.common.StringUtils.camelize(name) + "Test"; } /** @@ -1143,7 +1143,7 @@ public String toVarName(final String name) { if (reservedWords.contains(name)) { return escapeReservedWord(name); } else if (name.chars().anyMatch(character -> specialCharReplacements.containsKey(String.valueOf((char) character)))) { - return org.openapijsonschematools.codegen.utils.StringUtils.escape(name, specialCharReplacements, null, null); + return org.openapijsonschematools.codegen.common.StringUtils.escape(name, specialCharReplacements, null, null); } return name; } @@ -1161,7 +1161,7 @@ public String toParamName(String name) { if (reservedWords.contains(name)) { return escapeReservedWord(name); } else if (name.chars().anyMatch(character -> specialCharReplacements.containsKey(String.valueOf((char) character)))) { - return org.openapijsonschematools.codegen.utils.StringUtils.escape(name, specialCharReplacements, null, null); + return org.openapijsonschematools.codegen.common.StringUtils.escape(name, specialCharReplacements, null, null); } return name; @@ -1537,7 +1537,7 @@ public String toApiName(String name) { if (name.length() == 0) { return "DefaultApi"; } - return org.openapijsonschematools.codegen.utils.StringUtils.camelize(apiNamePrefix + "_" + name + "_" + apiNameSuffix); + return org.openapijsonschematools.codegen.common.StringUtils.camelize(apiNamePrefix + "_" + name + "_" + apiNameSuffix); } /** @@ -1554,7 +1554,7 @@ public String toModelName(final String name, String jsonPath) { return schemaKeyToModelNameCache.get(name); } - String camelCaseName = org.openapijsonschematools.codegen.utils.StringUtils.camelize(modelNamePrefix + "_" + name + "_" + modelNameSuffix); + String camelCaseName = org.openapijsonschematools.codegen.common.StringUtils.camelize(modelNamePrefix + "_" + name + "_" + modelNameSuffix); schemaKeyToModelNameCache.put(name, camelCaseName); return camelCaseName; } @@ -2450,7 +2450,7 @@ protected String getOperationIdSnakeCase(String operationId) { if (StringUtils.isEmpty(operationId)) { throw new RuntimeException("Empty method name (operationId) not allowed"); } - return org.openapijsonschematools.codegen.utils.StringUtils.underscore(operationId); + return org.openapijsonschematools.codegen.common.StringUtils.underscore(operationId); } protected CodegenKey getOperationId(Operation operation, String path, String httpMethod) { @@ -3338,7 +3338,7 @@ protected String getOrGenerateOperationId(Operation operation, String path, Stri if (builder.toString().length() == 0) { part = Character.toLowerCase(part.charAt(0)) + part.substring(1); } else { - part = org.openapijsonschematools.codegen.utils.StringUtils.camelize(part); + part = org.openapijsonschematools.codegen.common.StringUtils.camelize(part); } builder.append(part); } @@ -3987,7 +3987,7 @@ private String sanitizeValue(String value, String replaceMatch, String replaceVa */ @Override public String sanitizeTag(String tag) { - tag = org.openapijsonschematools.codegen.utils.StringUtils.camelize(sanitizeName(tag)); + tag = org.openapijsonschematools.codegen.common.StringUtils.camelize(sanitizeName(tag)); // tag starts with numbers if (tag.matches("^\\d.*")) { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java index 91a59991794..90145e42e18 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java @@ -31,10 +31,10 @@ import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.servers.ServerVariable; -import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; -import org.openapijsonschematools.codegen.codegenerator.GeneratorLanguage; -import org.openapijsonschematools.codegen.codegenerator.GeneratorType; -import org.openapijsonschematools.codegen.codegenerator.VendorExtension; +import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorLanguage; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorType; +import org.openapijsonschematools.codegen.generatorrunner.VendorExtension; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.cli.CliOption; import org.openapijsonschematools.codegen.model.CodegenHeader; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java index 396b6105784..efa7dad92a2 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java @@ -20,7 +20,7 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; -import org.openapijsonschematools.codegen.codegenerator.GeneratorType; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorType; import org.openapijsonschematools.codegen.generators.generatormetadata.features.ClientModificationFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.ParameterFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index 1badd00f2ee..ee6a3c8032c 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -19,17 +19,17 @@ import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; -import org.openapijsonschematools.codegen.codegenerator.GeneratorType; +import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorType; import org.openapijsonschematools.codegen.model.CodegenSchema; import org.openapijsonschematools.codegen.templating.SupportingFile; -import org.openapijsonschematools.codegen.codegenerator.VendorExtension; +import org.openapijsonschematools.codegen.generatorrunner.VendorExtension; import org.openapijsonschematools.codegen.generators.features.BeanValidationFeatures; import org.openapijsonschematools.codegen.generators.features.GzipFeatures; import org.openapijsonschematools.codegen.generators.features.PerformBeanValidationFeatures; import org.openapijsonschematools.codegen.templating.mustache.CaseFormatLambda; import org.openapijsonschematools.codegen.generators.generatormetadata.features.DocumentationFeature; -import org.openapijsonschematools.codegen.utils.ProcessUtils; +import org.openapijsonschematools.codegen.common.ProcessUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +39,7 @@ import static com.google.common.base.CaseFormat.LOWER_CAMEL; import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE; import static java.util.Collections.sort; -import static org.openapijsonschematools.codegen.utils.StringUtils.camelize; +import static org.openapijsonschematools.codegen.common.StringUtils.camelize; public class JavaClientGenerator extends AbstractJavaGenerator implements BeanValidationFeatures, PerformBeanValidationFeatures, GzipFeatures { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java index 582934ef62b..a73cf4454eb 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java @@ -19,7 +19,7 @@ import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; +import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; import org.openapijsonschematools.codegen.model.CodegenSchema; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.generators.generatormetadata.features.DocumentationFeature; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java index 4645dfb2ded..43911c6c3fb 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java @@ -26,17 +26,17 @@ import java.util.stream.Stream; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; +import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.codegenerator.GeneratorType; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorType; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.generators.generatormetadata.features.ClientModificationFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.DocumentationFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.ParameterFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.SecurityFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.WireFormatFeature; -import org.openapijsonschematools.codegen.utils.ProcessUtils; +import org.openapijsonschematools.codegen.common.ProcessUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java index 3988b5ec47a..3c985719245 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java @@ -24,8 +24,8 @@ import org.apache.commons.io.FileUtils; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; -import org.openapijsonschematools.codegen.codegenerator.GeneratorType; +import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorType; import org.openapijsonschematools.codegen.generators.generatormetadata.features.ComponentsFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.OperationFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; @@ -56,7 +56,7 @@ import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorMetadata; import org.openapijsonschematools.codegen.generators.generatormetadata.Stability; -import org.openapijsonschematools.codegen.utils.ModelUtils; +import org.openapijsonschematools.codegen.common.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.openapijsonschematools.codegen.templating.TemplateProcessor; @@ -70,8 +70,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.openapijsonschematools.codegen.utils.StringUtils.camelize; -import static org.openapijsonschematools.codegen.utils.StringUtils.underscore; +import static org.openapijsonschematools.codegen.common.StringUtils.camelize; +import static org.openapijsonschematools.codegen.common.StringUtils.underscore; @SuppressWarnings("rawtypes") public class PythonClientGenerator extends AbstractPythonGenerator { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenHeader.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenHeader.java index 3831f753e43..e5c55372b3b 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenHeader.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenHeader.java @@ -17,7 +17,7 @@ package org.openapijsonschematools.codegen.model; -import org.openapijsonschematools.codegen.utils.ModelUtils; +import org.openapijsonschematools.codegen.common.ModelUtils; import java.util.LinkedHashMap; import java.util.Map; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenParameter.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenParameter.java index 19e09233c62..092981e4c2d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenParameter.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenParameter.java @@ -17,7 +17,7 @@ package org.openapijsonschematools.codegen.model; -import org.openapijsonschematools.codegen.utils.ModelUtils; +import org.openapijsonschematools.codegen.common.ModelUtils; import java.util.*; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DryRunTemplateManager.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/DryRunTemplateManager.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DryRunTemplateManager.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/DryRunTemplateManager.java index 5f16d59adf1..efada81f2e3 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/DryRunTemplateManager.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/DryRunTemplateManager.java @@ -1,7 +1,6 @@ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.templating; -import org.openapijsonschematools.codegen.templating.TemplateManagerOptions; -import org.openapijsonschematools.codegen.templating.TemplateProcessor; +import org.openapijsonschematools.codegen.common.DryRunStatus; import java.io.File; import java.io.IOException; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java index b0810c5a912..16df641220b 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.io.Writer; -import static org.openapijsonschematools.codegen.utils.StringUtils.camelize; +import static org.openapijsonschematools.codegen.common.StringUtils.camelize; /** * Converts text in a fragment to camelCase. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/OptionalParameterLambda.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/OptionalParameterLambda.java index fb11278cca3..a2426e8e946 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/OptionalParameterLambda.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/OptionalParameterLambda.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.io.Writer; -import static org.openapijsonschematools.codegen.utils.StringUtils.camelize; +import static org.openapijsonschematools.codegen.common.StringUtils.camelize; /** * Appends trailing ? to a text fragement if not already present diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/RequiredParameterLambda.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/RequiredParameterLambda.java index 4aa989ad57d..7cf5a9dbbfe 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/RequiredParameterLambda.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/RequiredParameterLambda.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.io.Writer; -import static org.openapijsonschematools.codegen.utils.StringUtils.camelize; +import static org.openapijsonschematools.codegen.common.StringUtils.camelize; /** * Strips trailing ? from a text fragement diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/SnakecaseLambda.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/SnakecaseLambda.java index 30fc7390db7..ebd156ed420 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/SnakecaseLambda.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/SnakecaseLambda.java @@ -22,7 +22,7 @@ import java.io.IOException; import java.io.Writer; -import static org.openapijsonschematools.codegen.utils.StringUtils.underscore; +import static org.openapijsonschematools.codegen.common.StringUtils.underscore; /** * Converts text in a fragment to snake case. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiEvaluator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiEvaluator.java index cdec80c7fac..7033dc588db 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiEvaluator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiEvaluator.java @@ -7,7 +7,7 @@ import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.tags.Tag; -import org.openapijsonschematools.codegen.utils.ModelUtils; +import org.openapijsonschematools.codegen.common.ModelUtils; import org.openapijsonschematools.codegen.validation.Severity; import org.openapijsonschematools.codegen.validation.Validated; import org.openapijsonschematools.codegen.validation.ValidationResult; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java index a764339fde7..38ec3333454 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java @@ -3,8 +3,8 @@ import io.swagger.v3.oas.models.media.ComposedSchema; import io.swagger.v3.oas.models.media.Schema; -import org.openapijsonschematools.codegen.utils.ModelUtils; -import org.openapijsonschematools.codegen.utils.SemVer; +import org.openapijsonschematools.codegen.common.ModelUtils; +import org.openapijsonschematools.codegen.common.SemVer; import org.openapijsonschematools.codegen.validation.GenericValidator; import org.openapijsonschematools.codegen.validation.ValidationRule; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java index 11a1b971eef..14fe490a607 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java @@ -19,6 +19,7 @@ import io.swagger.v3.oas.models.OpenAPI; import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; import org.openapijsonschematools.codegen.generators.Generator; import org.openapijsonschematools.codegen.testutils.AssertFile; import org.openapijsonschematools.codegen.testutils.IntegrationTestPathsConfig; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java index 1be8ab4a6dd..b07291994e6 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java @@ -16,8 +16,10 @@ package org.openapijsonschematools.codegen; import org.openapijsonschematools.codegen.cli.ClientOptInput; -import org.openapijsonschematools.codegen.codegenerator.GeneratorRunner; +import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorRunner; import org.openapijsonschematools.codegen.generators.DefaultGenerator; +import org.openapijsonschematools.codegen.templating.DryRunTemplateManager; import org.openapijsonschematools.codegen.templating.TemplateManagerOptions; import java.io.File; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TestUtils.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TestUtils.java index 8a9d3350b85..dffd5ad9883 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TestUtils.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TestUtils.java @@ -19,8 +19,9 @@ import io.swagger.v3.parser.core.models.ParseOptions; import org.apache.commons.io.IOUtils; +import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; import org.openapijsonschematools.codegen.java.assertions.JavaFileAssert; -import org.openapijsonschematools.codegen.utils.ModelUtils; +import org.openapijsonschematools.codegen.common.ModelUtils; import org.openrewrite.maven.internal.RawPom; import org.testng.Assert; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/JsonCacheTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/JsonCacheTest.java similarity index 99% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/JsonCacheTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/JsonCacheTest.java index 90ce4b5772b..a440d527fcd 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/JsonCacheTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/JsonCacheTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonPointer; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/ModelUtilsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/ModelUtilsTest.java similarity index 99% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/ModelUtilsTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/ModelUtilsTest.java index 96dd7c8c816..ca0ca8e1e63 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/ModelUtilsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/ModelUtilsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.media.*; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/OnceLoggerTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/OnceLoggerTest.java similarity index 98% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/OnceLoggerTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/OnceLoggerTest.java index 157d3623b6a..2c758221b1f 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/OnceLoggerTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/OnceLoggerTest.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; import com.google.common.testing.FakeTicker; import org.mockito.Mockito; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/SerializerUtilsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/SerializerUtilsTest.java similarity index 98% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/SerializerUtilsTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/SerializerUtilsTest.java index 7f447fd8342..6892bb478ef 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/SerializerUtilsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/SerializerUtilsTest.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; import io.swagger.v3.oas.models.*; import io.swagger.v3.oas.models.info.Info; @@ -9,7 +9,6 @@ import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.tags.Tag; -import org.openapijsonschematools.codegen.utils.SerializerUtils; import org.testng.annotations.Test; import java.util.Arrays; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/StringUtilsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/StringUtilsTest.java similarity index 97% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/StringUtilsTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/StringUtilsTest.java index 115578c9789..d25ffe8b7aa 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/StringUtilsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/StringUtilsTest.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/URLPathUtilsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/URLPathUtilsTest.java similarity index 99% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/URLPathUtilsTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/URLPathUtilsTest.java index 2e308cb921a..fb1607c8501 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/utils/URLPathUtilsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/URLPathUtilsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.utils; +package org.openapijsonschematools.codegen.common; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.servers.Server; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorTestRunner.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java similarity index 99% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorTestRunner.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java index 4527e15877d..4454b907e0b 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorTestRunner.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.generatorrunner; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; @@ -11,10 +11,12 @@ import io.swagger.v3.oas.models.parameters.RequestBody; import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.responses.ApiResponses; +import org.openapijsonschematools.codegen.TestUtils; import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; import org.openapijsonschematools.codegen.generators.DefaultGenerator; import org.openapijsonschematools.codegen.generators.Generator; -import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; +import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; import org.openapijsonschematools.codegen.config.CodegenConfigurator; import org.openapijsonschematools.codegen.config.GlobalSettings; import org.openapijsonschematools.codegen.model.CodegenKey; @@ -23,7 +25,7 @@ import org.openapijsonschematools.codegen.model.CodegenResponse; import org.openapijsonschematools.codegen.model.CodegenSchema; import org.openapijsonschematools.codegen.model.CodegenServer; -import org.openapijsonschematools.codegen.utils.ModelUtils; +import org.openapijsonschematools.codegen.common.ModelUtils; import org.testng.Assert; import org.testng.annotations.Test; @@ -35,7 +37,7 @@ import java.nio.file.StandardOpenOption; import java.util.*; -public class DefaultGeneratorTestRunner { +public class DefaultGeneratorRunnerTest { @Test public void testIgnoreFileProcessing() throws IOException { diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java index 476967d5df9..dde08ed6f41 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java @@ -39,9 +39,9 @@ import io.swagger.v3.oas.models.responses.ApiResponses; import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.parser.core.models.ParseOptions; -import org.openapijsonschematools.codegen.DefaultGeneratorRunner; +import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; import org.openapijsonschematools.codegen.TestUtils; -import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; +import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; import org.openapijsonschematools.codegen.model.CodegenDiscriminator; import org.openapijsonschematools.codegen.model.CodegenEncoding; import org.openapijsonschematools.codegen.model.CodegenHeader; @@ -60,8 +60,8 @@ import org.openapijsonschematools.codegen.templating.mustache.LowercaseLambda; import org.openapijsonschematools.codegen.templating.mustache.TitlecaseLambda; import org.openapijsonschematools.codegen.templating.mustache.UppercaseLambda; -import org.openapijsonschematools.codegen.utils.ModelUtils; -import org.openapijsonschematools.codegen.utils.SemVer; +import org.openapijsonschematools.codegen.common.ModelUtils; +import org.openapijsonschematools.codegen.common.SemVer; import org.testng.Assert; import org.testng.annotations.Ignore; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java index 6094848ae7c..6c55257e597 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java @@ -20,14 +20,13 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.media.*; -import org.openapijsonschematools.codegen.DefaultGeneratorRunner; +import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; import org.openapijsonschematools.codegen.cli.ClientOptInput; -import org.openapijsonschematools.codegen.generators.PythonClientGenerator; import org.openapijsonschematools.codegen.model.CodegenSchema; import org.openapijsonschematools.codegen.TestUtils; import org.openapijsonschematools.codegen.config.CodegenConfigurator; import org.openapijsonschematools.codegen.model.EnumValue; -import org.openapijsonschematools.codegen.utils.ModelUtils; +import org.openapijsonschematools.codegen.common.ModelUtils; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/AbstractJavaCodegenExampleValuesTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/AbstractJavaCodegenExampleValuesTest.java index 9e6e117e812..2598f7fe304 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/AbstractJavaCodegenExampleValuesTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/AbstractJavaCodegenExampleValuesTest.java @@ -22,7 +22,7 @@ import io.swagger.v3.oas.models.parameters.Parameter; import org.openapijsonschematools.codegen.generators.AbstractJavaGenerator; import org.openapijsonschematools.codegen.model.CodegenParameter; -import org.openapijsonschematools.codegen.codegenerator.GeneratorType; +import org.openapijsonschematools.codegen.generatorrunner.GeneratorType; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java index 31e1fd334f8..e1927cfbd63 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java @@ -18,7 +18,7 @@ package org.openapijsonschematools.codegen.options; import com.google.common.collect.ImmutableMap; -import org.openapijsonschematools.codegen.codegenerator.CodegenConstants; +import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; import org.openapijsonschematools.codegen.generators.PythonClientGenerator; import java.util.Map; From 9d49bcb398909418ec264fd23e04086ad284fce0 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 11:45:24 -0700 Subject: [PATCH 11/43] Moves models into generators and renames to openapimodels --- .../codegen/cmd/AuthorTemplate.java | 4 +- .../codegen/cmd/ConfigHelp.java | 6 +- .../codegen/cmd/Generate.java | 4 +- .../codegen/cmd/ListGenerators.java | 4 +- .../CodegenConstants.java | 2 +- .../codegen/common/ModelUtils.java | 2 +- .../codegen/common/ProcessUtils.java | 2 +- .../codegen/config/CodegenConfigurator.java | 4 +- .../DefaultGeneratorRunner.java | 27 ++++---- .../generators/AbstractJavaGenerator.java | 7 +-- .../AbstractJavaJAXRSServerGenerator.java | 6 +- .../generators/AbstractKotlinGenerator.java | 8 +-- .../generators/AbstractPythonGenerator.java | 4 +- .../codegen/generators/DefaultGenerator.java | 63 +++++++++---------- .../codegen/generators/Generator.java | 33 +++++----- .../generators/JMeterClientGenerator.java | 2 +- .../generators/JavaClientGenerator.java | 7 +-- .../generators/JavaJerseyServerGenerator.java | 4 +- .../generators/KotlinClientGenerator.java | 6 +- .../generators/PythonClientGenerator.java | 14 ++--- .../VendorExtension.java | 2 +- .../generatorloader}/GeneratorLoader.java | 2 +- .../GeneratorNotFoundException.java | 2 +- .../generatormetadata}/GeneratorLanguage.java | 2 +- .../generatormetadata}/GeneratorType.java | 2 +- .../openapimodels}/ArrayListWithContext.java | 2 +- .../openapimodels}/CodegenCallback.java | 2 +- .../openapimodels}/CodegenDiscriminator.java | 3 +- .../openapimodels}/CodegenEncoding.java | 2 +- .../openapimodels}/CodegenHeader.java | 2 +- .../openapimodels}/CodegenKey.java | 2 +- .../openapimodels}/CodegenMediaType.java | 2 +- .../openapimodels}/CodegenOauthFlow.java | 2 +- .../openapimodels}/CodegenOauthFlows.java | 4 +- .../openapimodels}/CodegenOperation.java | 2 +- .../openapimodels}/CodegenParameter.java | 2 +- .../openapimodels}/CodegenPathItem.java | 2 +- .../openapimodels}/CodegenPatternInfo.java | 2 +- .../openapimodels}/CodegenRefInfo.java | 2 +- .../openapimodels}/CodegenRequestBody.java | 3 +- .../openapimodels}/CodegenResponse.java | 2 +- .../openapimodels}/CodegenSchema.java | 2 +- .../CodegenSecurityRequirementValue.java | 2 +- .../openapimodels}/CodegenSecurityScheme.java | 2 +- .../openapimodels}/CodegenServer.java | 3 +- .../openapimodels}/CodegenTag.java | 2 +- .../openapimodels}/CodegenXml.java | 2 +- .../openapimodels}/EnumInfo.java | 2 +- .../openapimodels}/EnumValue.java | 5 +- .../openapimodels}/InlineContext.java | 2 +- .../LinkedHashMapWithContext.java | 2 +- .../openapimodels}/PairCacheKey.java | 2 +- .../openapimodels}/SchemaTestCase.java | 2 +- .../templating/handlebars/CustomHelpers.java | 2 - .../resources/codegen/generatorClass.mustache | 2 +- .../codegen/kotlin/generatorClass.mustache | 2 +- .../codegen/TestUtils.java | 2 +- .../DefaultGeneratorRunnerTest.java | 15 +++-- ...stractJavaGeneratorExampleValuesTest.java} | 8 +-- .../generators/DefaultGeneratorTest.java | 28 ++++----- .../generators/PythonClientGeneratorTest.java | 4 +- .../AbstractAnnotationAssert.java | 2 +- .../javaassertions}/ConstructorAssert.java | 2 +- .../javaassertions}/JavaFileAssert.java | 2 +- .../MethodAnnotationAssert.java | 2 +- .../javaassertions}/MethodAssert.java | 2 +- .../ParameterAnnotationAssert.java | 2 +- .../javaassertions}/ParameterAssert.java | 2 +- .../PropertyAnnotationAssert.java | 2 +- .../javaassertions}/PropertyAssert.java | 2 +- .../javaassertions}/TypeAnnotationAssert.java | 2 +- .../options/PythonClientOptionsProvider.java | 2 +- .../{ => templating}/TemplateManagerTest.java | 2 +- 73 files changed, 178 insertions(+), 192 deletions(-) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{generatorrunner => common}/CodegenConstants.java (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{generatorrunner => generators}/VendorExtension.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{generatorrunner => generators/generatorloader}/GeneratorLoader.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{generatorrunner => generators/generatorloader}/GeneratorNotFoundException.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{generatorrunner => generators/generatormetadata}/GeneratorLanguage.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{generatorrunner => generators/generatormetadata}/GeneratorType.java (95%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/ArrayListWithContext.java (90%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenCallback.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenDiscriminator.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenEncoding.java (95%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenHeader.java (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenKey.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenMediaType.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenOauthFlow.java (90%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenOauthFlows.java (87%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenOperation.java (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenParameter.java (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenPathItem.java (90%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenPatternInfo.java (80%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenRefInfo.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenRequestBody.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenResponse.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenSchema.java (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenSecurityRequirementValue.java (88%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenSecurityScheme.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenServer.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenTag.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/CodegenXml.java (87%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/EnumInfo.java (92%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/EnumValue.java (86%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/InlineContext.java (76%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/LinkedHashMapWithContext.java (90%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/PairCacheKey.java (91%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{model => generators/openapimodels}/SchemaTestCase.java (84%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{java/AbstractJavaCodegenExampleValuesTest.java => generators/AbstractJavaGeneratorExampleValuesTest.java} (94%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{java/assertions => generators/javaassertions}/AbstractAnnotationAssert.java (97%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{java/assertions => generators/javaassertions}/ConstructorAssert.java (98%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{java/assertions => generators/javaassertions}/JavaFileAssert.java (98%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{java/assertions => generators/javaassertions}/MethodAnnotationAssert.java (94%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{java/assertions => generators/javaassertions}/MethodAssert.java (98%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{java/assertions => generators/javaassertions}/ParameterAnnotationAssert.java (89%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{java/assertions => generators/javaassertions}/ParameterAssert.java (96%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{java/assertions => generators/javaassertions}/PropertyAnnotationAssert.java (89%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{java/assertions => generators/javaassertions}/PropertyAssert.java (94%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{java/assertions => generators/javaassertions}/TypeAnnotationAssert.java (88%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{ => templating}/TemplateManagerTest.java (99%) diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java index 30437fb6659..3a40e3e1014 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java @@ -4,8 +4,8 @@ import io.airlift.airline.Option; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.generators.Generator; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorLoader; -import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; +import org.openapijsonschematools.codegen.generators.generatorloader.GeneratorLoader; +import org.openapijsonschematools.codegen.common.CodegenConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java index f5c321d800c..b4b99fc15cc 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java @@ -22,9 +22,9 @@ import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; import org.openapijsonschematools.codegen.generators.Generator; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorLoader; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorNotFoundException; -import org.openapijsonschematools.codegen.generatorrunner.VendorExtension; +import org.openapijsonschematools.codegen.generators.generatorloader.GeneratorLoader; +import org.openapijsonschematools.codegen.generators.generatorloader.GeneratorNotFoundException; +import org.openapijsonschematools.codegen.generators.VendorExtension; import org.openapijsonschematools.codegen.generators.generatormetadata.FeatureSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java index c7f7961fff4..bfcb1d3f4e2 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java @@ -30,10 +30,10 @@ import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.ClientOptInput; -import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; +import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; import org.openapijsonschematools.codegen.generatorrunner.GeneratorRunner; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorNotFoundException; +import org.openapijsonschematools.codegen.generators.generatorloader.GeneratorNotFoundException; import org.openapijsonschematools.codegen.config.CodegenConfigurator; import org.openapijsonschematools.codegen.config.CodegenConfiguratorUtils; import org.slf4j.Logger; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java index 205f3325040..3f932bfff8d 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java @@ -7,8 +7,8 @@ import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.generators.Generator; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorLoader; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorType; +import org.openapijsonschematools.codegen.generators.generatorloader.GeneratorLoader; +import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorMetadata; import org.openapijsonschematools.codegen.generators.generatormetadata.Stability; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/CodegenConstants.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/CodegenConstants.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/CodegenConstants.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/CodegenConstants.java index bfe376a8eea..1ead49da6aa 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/CodegenConstants.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/CodegenConstants.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.generatorrunner; +package org.openapijsonschematools.codegen.common; /** * A class for storing constants that are used throughout the project. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ModelUtils.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ModelUtils.java index 41c5bcbd1f1..b6f0ddfebc2 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ModelUtils.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ModelUtils.java @@ -35,7 +35,7 @@ import io.swagger.v3.parser.util.RemoteUrl; import io.swagger.v3.parser.util.SchemaTypeUtil; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.model.CodegenSchema; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; import org.openapijsonschematools.codegen.config.GlobalSettings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ProcessUtils.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ProcessUtils.java index c33d6dff4fd..0cb81e801a4 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ProcessUtils.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ProcessUtils.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.security.SecurityScheme; -import org.openapijsonschematools.codegen.model.CodegenSchema; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; import java.util.Map; import java.util.TreeMap; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java index 750e5c4826f..87abb582cfa 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java @@ -32,8 +32,8 @@ import org.apache.commons.lang3.Validate; import org.openapijsonschematools.codegen.cli.ClientOptInput; import org.openapijsonschematools.codegen.generators.Generator; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorLoader; -import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; +import org.openapijsonschematools.codegen.generators.generatorloader.GeneratorLoader; +import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.templating.TemplatingEngineLoader; import org.openapijsonschematools.codegen.templating.TemplateDefinition; import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java index e31f3318bd4..249a975a7a2 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java @@ -33,23 +33,24 @@ import org.apache.commons.io.comparator.PathFileComparator; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.common.DryRunStatus; import org.openapijsonschematools.codegen.generators.Generator; import org.openapijsonschematools.codegen.config.GlobalSettings; import org.openapijsonschematools.codegen.ignore.CodegenIgnoreProcessor; -import org.openapijsonschematools.codegen.model.CodegenHeader; -import org.openapijsonschematools.codegen.model.CodegenKey; -import org.openapijsonschematools.codegen.model.CodegenMediaType; -import org.openapijsonschematools.codegen.model.CodegenOperation; -import org.openapijsonschematools.codegen.model.CodegenParameter; -import org.openapijsonschematools.codegen.model.CodegenPathItem; -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.CodegenTag; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenHeader; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenKey; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenMediaType; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenOperation; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenParameter; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenPathItem; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenRequestBody; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenResponse; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityRequirementValue; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityScheme; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenTag; import org.openapijsonschematools.codegen.templating.DryRunTemplateManager; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.common.SerializerUtils; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java index c9a1a1bc80e..b8d77fec39e 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java @@ -28,11 +28,10 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; +import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; -import org.openapijsonschematools.codegen.model.CodegenPatternInfo; -import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.generatorrunner.VendorExtension; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenPatternInfo; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; import org.openapijsonschematools.codegen.generators.features.DocumentationProviderFeatures; import org.openapijsonschematools.codegen.generators.generatormetadata.features.ClientModificationFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.DocumentationFeature; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java index 10fcf707eeb..5fbdacce10f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java @@ -23,9 +23,9 @@ import io.swagger.v3.oas.models.PathItem; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorType; -import org.openapijsonschematools.codegen.model.CodegenOperation; +import org.openapijsonschematools.codegen.common.CodegenConstants; +import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenOperation; import org.openapijsonschematools.codegen.generators.features.BeanValidationFeatures; import org.openapijsonschematools.codegen.common.URLPathUtils; import org.slf4j.Logger; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java index 1ef36eba181..45f651df137 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java @@ -21,10 +21,10 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; -import org.openapijsonschematools.codegen.model.CodegenPatternInfo; -import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorLanguage; +import org.openapijsonschematools.codegen.common.CodegenConstants; +import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorLanguage; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenPatternInfo; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; import org.openapijsonschematools.codegen.common.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractPythonGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractPythonGenerator.java index a85d2c6d694..fcf3d8768ef 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractPythonGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractPythonGenerator.java @@ -21,9 +21,9 @@ import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorLanguage; +import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.common.ModelUtils; +import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorLanguage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java index da7dc089f1b..af6bd1f4dd7 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java @@ -34,11 +34,10 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorType; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorLanguage; -import org.openapijsonschematools.codegen.generatorrunner.VendorExtension; +import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.config.GlobalSettings; +import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorLanguage; +import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; import org.openapijsonschematools.codegen.generators.generatormetadata.features.ComponentsFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.DataTypeFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.DocumentationFeature; @@ -48,33 +47,33 @@ import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.SecurityFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.WireFormatFeature; -import org.openapijsonschematools.codegen.model.ArrayListWithContext; -import org.openapijsonschematools.codegen.model.CodegenCallback; -import org.openapijsonschematools.codegen.model.CodegenDiscriminator; -import org.openapijsonschematools.codegen.model.CodegenEncoding; -import org.openapijsonschematools.codegen.model.CodegenHeader; -import org.openapijsonschematools.codegen.model.CodegenKey; -import org.openapijsonschematools.codegen.model.CodegenMediaType; -import org.openapijsonschematools.codegen.model.CodegenOauthFlow; -import org.openapijsonschematools.codegen.model.CodegenOauthFlows; -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.CodegenRefInfo; -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.CodegenTag; -import org.openapijsonschematools.codegen.model.CodegenXml; -import org.openapijsonschematools.codegen.model.EnumInfo; -import org.openapijsonschematools.codegen.model.EnumValue; -import org.openapijsonschematools.codegen.model.LinkedHashMapWithContext; -import org.openapijsonschematools.codegen.model.PairCacheKey; -import org.openapijsonschematools.codegen.model.SchemaTestCase; +import org.openapijsonschematools.codegen.generators.openapimodels.ArrayListWithContext; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenCallback; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenDiscriminator; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenEncoding; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenHeader; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenKey; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenMediaType; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenOauthFlow; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenOauthFlows; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenOperation; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenParameter; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenPathItem; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenPatternInfo; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenRefInfo; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenRequestBody; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenResponse; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityRequirementValue; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityScheme; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenTag; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenXml; +import org.openapijsonschematools.codegen.generators.openapimodels.EnumInfo; +import org.openapijsonschematools.codegen.generators.openapimodels.EnumValue; +import org.openapijsonschematools.codegen.generators.openapimodels.LinkedHashMapWithContext; +import org.openapijsonschematools.codegen.generators.openapimodels.PairCacheKey; +import org.openapijsonschematools.codegen.generators.openapimodels.SchemaTestCase; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.common.SerializerUtils; import org.openapijsonschematools.codegen.templating.MustacheEngineAdapter; @@ -85,7 +84,7 @@ import org.openapijsonschematools.codegen.templating.mustache.TitlecaseLambda; import org.openapijsonschematools.codegen.templating.mustache.UppercaseLambda; import org.openapijsonschematools.codegen.common.ModelUtils; -import org.openapijsonschematools.codegen.model.CodegenDiscriminator.MappedModel; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenDiscriminator.MappedModel; import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter; import org.openapijsonschematools.codegen.generators.generatormetadata.FeatureSet; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorMetadata; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java index 90145e42e18..7f3cd779e69 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java @@ -31,28 +31,27 @@ import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.servers.ServerVariable; -import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorLanguage; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorType; -import org.openapijsonschematools.codegen.generatorrunner.VendorExtension; +import org.openapijsonschematools.codegen.common.CodegenConstants; +import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorLanguage; +import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.cli.CliOption; -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.generators.openapimodels.CodegenHeader; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenKey; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenOperation; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenParameter; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenPathItem; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenPatternInfo; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenRequestBody; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenResponse; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityRequirementValue; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityScheme; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer; import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter; import org.openapijsonschematools.codegen.generators.generatormetadata.FeatureSet; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorMetadata; -import org.openapijsonschematools.codegen.model.CodegenTag; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenTag; import java.io.File; import java.util.HashMap; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java index efa7dad92a2..372f804ae4a 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java @@ -20,7 +20,7 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorType; +import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; import org.openapijsonschematools.codegen.generators.generatormetadata.features.ClientModificationFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.ParameterFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index ee6a3c8032c..5849e043d74 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -19,11 +19,10 @@ import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorType; -import org.openapijsonschematools.codegen.model.CodegenSchema; +import org.openapijsonschematools.codegen.common.CodegenConstants; +import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; import org.openapijsonschematools.codegen.templating.SupportingFile; -import org.openapijsonschematools.codegen.generatorrunner.VendorExtension; import org.openapijsonschematools.codegen.generators.features.BeanValidationFeatures; import org.openapijsonschematools.codegen.generators.features.GzipFeatures; import org.openapijsonschematools.codegen.generators.features.PerformBeanValidationFeatures; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java index a73cf4454eb..33fe1820a23 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java @@ -19,8 +19,8 @@ import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; -import org.openapijsonschematools.codegen.model.CodegenSchema; +import org.openapijsonschematools.codegen.common.CodegenConstants; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.generators.generatormetadata.features.DocumentationFeature; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java index 43911c6c3fb..34370585aa7 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java @@ -26,10 +26,10 @@ import java.util.stream.Stream; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; +import org.openapijsonschematools.codegen.common.CodegenConstants; +import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; -import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorType; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.generators.generatormetadata.features.ClientModificationFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.DocumentationFeature; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java index 3c985719245..5660452ca21 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java @@ -24,14 +24,14 @@ import org.apache.commons.io.FileUtils; import org.openapijsonschematools.codegen.cli.CliOption; -import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorType; +import org.openapijsonschematools.codegen.common.CodegenConstants; +import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; import org.openapijsonschematools.codegen.generators.generatormetadata.features.ComponentsFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.OperationFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; -import org.openapijsonschematools.codegen.model.CodegenDiscriminator; -import org.openapijsonschematools.codegen.model.CodegenPatternInfo; -import org.openapijsonschematools.codegen.model.CodegenSchema; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenDiscriminator; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenPatternInfo; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.templating.TemplateManager; import org.openapijsonschematools.codegen.generators.generatormetadata.features.DataTypeFeature; @@ -40,7 +40,7 @@ import org.openapijsonschematools.codegen.generators.generatormetadata.features.ParameterFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.SecurityFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.WireFormatFeature; -import org.openapijsonschematools.codegen.model.PairCacheKey; +import org.openapijsonschematools.codegen.generators.openapimodels.PairCacheKey; import org.openapijsonschematools.codegen.templating.CommonTemplateContentLocator; import org.openapijsonschematools.codegen.templating.GeneratorTemplateContentLocator; import org.openapijsonschematools.codegen.templating.HandlebarsEngineAdapter; @@ -52,7 +52,7 @@ import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.security.SecurityScheme; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.model.CodegenDiscriminator.MappedModel; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenDiscriminator.MappedModel; import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorMetadata; import org.openapijsonschematools.codegen.generators.generatormetadata.Stability; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/VendorExtension.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/VendorExtension.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/VendorExtension.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/VendorExtension.java index 0db8eb331bf..6f99c23bacc 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/VendorExtension.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/VendorExtension.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.generatorrunner; +package org.openapijsonschematools.codegen.generators; import java.util.Collections; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorLoader.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorLoader.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorLoader.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorLoader.java index aa6e2294b0d..fd0c72d4864 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorLoader.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorLoader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.generatorrunner; +package org.openapijsonschematools.codegen.generators.generatorloader; import org.openapijsonschematools.codegen.generators.Generator; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorNotFoundException.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorNotFoundException.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorNotFoundException.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorNotFoundException.java index 10931cf4003..4705e8a9d60 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorNotFoundException.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorNotFoundException.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.generatorrunner; +package org.openapijsonschematools.codegen.generators.generatorloader; /** * Typed exception exposing issues with loading generators (e.g. by name). diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorLanguage.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorLanguage.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorLanguage.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorLanguage.java index 02f25cd11c6..f79f26af0dd 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorLanguage.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorLanguage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.generatorrunner; +package org.openapijsonschematools.codegen.generators.generatormetadata; public enum GeneratorLanguage { /* diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorType.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorType.java similarity index 95% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorType.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorType.java index 6aec5622787..827e088becc 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorType.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorType.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.generatorrunner; +package org.openapijsonschematools.codegen.generators.generatormetadata; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/ArrayListWithContext.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/ArrayListWithContext.java similarity index 90% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/ArrayListWithContext.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/ArrayListWithContext.java index 3445a12d3e8..d7187312117 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/ArrayListWithContext.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/ArrayListWithContext.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import java.util.ArrayList; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenCallback.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenCallback.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenCallback.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenCallback.java index 3d82ff9ca61..757d512ba8d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenCallback.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenCallback.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import java.util.*; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenDiscriminator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenDiscriminator.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenDiscriminator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenDiscriminator.java index c36dfc35a27..3c245ffd2da 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenDiscriminator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenDiscriminator.java @@ -1,6 +1,5 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; -import java.util.LinkedHashSet; import java.util.Map; import java.util.Objects; import java.util.TreeSet; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenEncoding.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenEncoding.java similarity index 95% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenEncoding.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenEncoding.java index e196d6196dc..41f1134b1be 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenEncoding.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenEncoding.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import java.util.Map; import java.util.Objects; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenHeader.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenHeader.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenHeader.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenHeader.java index e5c55372b3b..8d19bad47a3 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenHeader.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenHeader.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import org.openapijsonschematools.codegen.common.ModelUtils; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenKey.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenKey.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenKey.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenKey.java index fdaee566130..3cb39feae96 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenKey.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenKey.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import java.util.Objects; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenMediaType.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenMediaType.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenMediaType.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenMediaType.java index 9574dcebae9..abb70259720 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenMediaType.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenMediaType.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenOauthFlow.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOauthFlow.java similarity index 90% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenOauthFlow.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOauthFlow.java index e7dbf925748..dae835cfac2 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenOauthFlow.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOauthFlow.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import io.swagger.v3.oas.models.security.Scopes; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenOauthFlows.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOauthFlows.java similarity index 87% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenOauthFlows.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOauthFlows.java index 04dd8f0128f..7b84f618c86 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenOauthFlows.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOauthFlows.java @@ -1,6 +1,4 @@ -package org.openapijsonschematools.codegen.model; - -import io.swagger.v3.oas.models.security.OAuthFlow; +package org.openapijsonschematools.codegen.generators.openapimodels; import java.util.Map; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenOperation.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOperation.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenOperation.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOperation.java index 81ba27c9bd9..e58ba9c9d9b 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenOperation.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOperation.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import io.swagger.v3.oas.models.ExternalDocumentation; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenParameter.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenParameter.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenParameter.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenParameter.java index 092981e4c2d..7598315b772 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenParameter.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenParameter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import org.openapijsonschematools.codegen.common.ModelUtils; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenPathItem.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPathItem.java similarity index 90% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenPathItem.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPathItem.java index a070194110f..d9c7ea65395 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenPathItem.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPathItem.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import java.util.List; import java.util.TreeMap; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenPatternInfo.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPatternInfo.java similarity index 80% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenPatternInfo.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPatternInfo.java index df320db4d8f..18e8754847f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenPatternInfo.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPatternInfo.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import java.util.LinkedHashSet; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenRefInfo.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenRefInfo.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenRefInfo.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenRefInfo.java index 40fefadc9c0..69cf43211b0 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenRefInfo.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenRefInfo.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenRequestBody.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenRequestBody.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenRequestBody.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenRequestBody.java index b85c5ee59a7..0b2b353733d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenRequestBody.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenRequestBody.java @@ -1,6 +1,5 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; -import java.util.HashSet; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenResponse.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenResponse.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenResponse.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenResponse.java index 6471588591c..80c6fa5c567 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenResponse.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenResponse.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import java.util.*; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenSchema.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenSchema.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java index 715c294f5c3..88b3b5f98bf 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenSchema.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import io.swagger.v3.oas.models.ExternalDocumentation; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenSecurityRequirementValue.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityRequirementValue.java similarity index 88% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenSecurityRequirementValue.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityRequirementValue.java index 1b37a35af18..e194dbb41d1 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenSecurityRequirementValue.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityRequirementValue.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import java.util.ArrayList; import java.util.TreeSet; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenSecurityScheme.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityScheme.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenSecurityScheme.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityScheme.java index d7dd5e77ccb..57ab433204c 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenSecurityScheme.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityScheme.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import java.util.Map; import java.util.Objects; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenServer.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenServer.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenServer.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenServer.java index 47ccd98eaf0..b67d0df9f3f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenServer.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenServer.java @@ -1,6 +1,5 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; -import java.util.LinkedHashMap; import java.util.Objects; public class CodegenServer { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenTag.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenTag.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenTag.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenTag.java index 22e048a101c..8eaa8c4d550 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenTag.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenTag.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import java.util.Objects; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenXml.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenXml.java similarity index 87% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenXml.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenXml.java index 16e5f1c1052..4ff9fb77018 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/CodegenXml.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenXml.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; public class CodegenXml { public final String name; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/EnumInfo.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/EnumInfo.java similarity index 92% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/EnumInfo.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/EnumInfo.java index 7c9f4251345..21429a87bf8 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/EnumInfo.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/EnumInfo.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import java.util.HashMap; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/EnumValue.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/EnumValue.java similarity index 86% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/EnumValue.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/EnumValue.java index 48364670381..7da012911a8 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/EnumValue.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/EnumValue.java @@ -1,8 +1,5 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.Map; import java.util.Objects; public class EnumValue { diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/InlineContext.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/InlineContext.java similarity index 76% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/InlineContext.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/InlineContext.java index 02330d87981..97e3a2cea7c 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/InlineContext.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/InlineContext.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; public interface InlineContext { public boolean allAreInline(); diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/LinkedHashMapWithContext.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/LinkedHashMapWithContext.java similarity index 90% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/LinkedHashMapWithContext.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/LinkedHashMapWithContext.java index b088b8674ec..fa7b102f720 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/LinkedHashMapWithContext.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/LinkedHashMapWithContext.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import java.util.LinkedHashMap; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/PairCacheKey.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/PairCacheKey.java similarity index 91% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/PairCacheKey.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/PairCacheKey.java index 137ddc9cb4c..241427c228f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/PairCacheKey.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/PairCacheKey.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; import java.util.Objects; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/SchemaTestCase.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/SchemaTestCase.java similarity index 84% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/SchemaTestCase.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/SchemaTestCase.java index ad193c0644a..fb24c16849b 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/model/SchemaTestCase.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/SchemaTestCase.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.model; +package org.openapijsonschematools.codegen.generators.openapimodels; public class SchemaTestCase { public final String description; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/handlebars/CustomHelpers.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/handlebars/CustomHelpers.java index 10edac0dd7e..d6dbb251271 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/handlebars/CustomHelpers.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/handlebars/CustomHelpers.java @@ -3,13 +3,11 @@ import com.github.jknack.handlebars.Helper; import com.github.jknack.handlebars.Options; import com.github.jknack.handlebars.TagType; -import org.openapijsonschematools.codegen.model.CodegenKey; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/modules/openapi-json-schema-generator/src/main/resources/codegen/generatorClass.mustache b/modules/openapi-json-schema-generator/src/main/resources/codegen/generatorClass.mustache index cee2e7d26a7..c45cb78d8fc 100644 --- a/modules/openapi-json-schema-generator/src/main/resources/codegen/generatorClass.mustache +++ b/modules/openapi-json-schema-generator/src/main/resources/codegen/generatorClass.mustache @@ -1,7 +1,7 @@ package {{generatorPackage}}; import org.openapijsonschematools.codegen.*; -import org.openapijsonschematools.codegen.model.*; +import org.openapijsonschematools.codegen.openapimodels.*; import io.swagger.models.properties.*; import java.util.*; diff --git a/modules/openapi-json-schema-generator/src/main/resources/codegen/kotlin/generatorClass.mustache b/modules/openapi-json-schema-generator/src/main/resources/codegen/kotlin/generatorClass.mustache index 3e3c5ca3416..e19144f3288 100644 --- a/modules/openapi-json-schema-generator/src/main/resources/codegen/kotlin/generatorClass.mustache +++ b/modules/openapi-json-schema-generator/src/main/resources/codegen/kotlin/generatorClass.mustache @@ -2,7 +2,7 @@ package {{generatorPackage}} import org.openapijsonschematools.codegen.* -import org.openapijsonschematools.codegen.model.*; +import org.openapijsonschematools.codegen.openapimodels.*; import java.util.* import java.io.File diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TestUtils.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TestUtils.java index dffd5ad9883..8f8fb47186b 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TestUtils.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TestUtils.java @@ -20,7 +20,7 @@ import org.apache.commons.io.IOUtils; import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; -import org.openapijsonschematools.codegen.java.assertions.JavaFileAssert; +import org.openapijsonschematools.codegen.generators.javaassertions.JavaFileAssert; import org.openapijsonschematools.codegen.common.ModelUtils; import org.openrewrite.maven.internal.RawPom; import org.testng.Assert; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java index 4454b907e0b..8b9936178e4 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java @@ -13,18 +13,17 @@ import io.swagger.v3.oas.models.responses.ApiResponses; import org.openapijsonschematools.codegen.TestUtils; import org.openapijsonschematools.codegen.cli.ClientOptInput; -import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; import org.openapijsonschematools.codegen.generators.DefaultGenerator; import org.openapijsonschematools.codegen.generators.Generator; -import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; +import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.config.CodegenConfigurator; import org.openapijsonschematools.codegen.config.GlobalSettings; -import org.openapijsonschematools.codegen.model.CodegenKey; -import org.openapijsonschematools.codegen.model.CodegenPathItem; -import org.openapijsonschematools.codegen.model.CodegenRequestBody; -import org.openapijsonschematools.codegen.model.CodegenResponse; -import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.model.CodegenServer; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenKey; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenPathItem; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenRequestBody; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenResponse; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer; import org.openapijsonschematools.codegen.common.ModelUtils; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/AbstractJavaCodegenExampleValuesTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/AbstractJavaGeneratorExampleValuesTest.java similarity index 94% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/AbstractJavaCodegenExampleValuesTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/AbstractJavaGeneratorExampleValuesTest.java index 2598f7fe304..cb36644171d 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/AbstractJavaCodegenExampleValuesTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/AbstractJavaGeneratorExampleValuesTest.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.java; +package org.openapijsonschematools.codegen.generators; import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; import org.openapijsonschematools.codegen.generators.AbstractJavaGenerator; -import org.openapijsonschematools.codegen.model.CodegenParameter; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorType; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenParameter; +import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; import org.testng.Assert; import org.testng.annotations.Test; import java.util.Arrays; -public class AbstractJavaCodegenExampleValuesTest { +public class AbstractJavaGeneratorExampleValuesTest { private final AbstractJavaGenerator fakeJavaCodegen = new P_AbstractJavaGenerator(); diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java index dde08ed6f41..7866d230c3f 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java @@ -41,20 +41,20 @@ import io.swagger.v3.parser.core.models.ParseOptions; import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; import org.openapijsonschematools.codegen.TestUtils; -import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; -import org.openapijsonschematools.codegen.model.CodegenDiscriminator; -import org.openapijsonschematools.codegen.model.CodegenEncoding; -import org.openapijsonschematools.codegen.model.CodegenHeader; -import org.openapijsonschematools.codegen.model.CodegenKey; -import org.openapijsonschematools.codegen.model.CodegenMediaType; -import org.openapijsonschematools.codegen.model.CodegenOperation; -import org.openapijsonschematools.codegen.model.CodegenParameter; -import org.openapijsonschematools.codegen.model.CodegenPathItem; -import org.openapijsonschematools.codegen.model.CodegenRequestBody; -import org.openapijsonschematools.codegen.model.CodegenResponse; -import org.openapijsonschematools.codegen.model.CodegenSchema; -import org.openapijsonschematools.codegen.model.CodegenSecurityScheme; -import org.openapijsonschematools.codegen.model.EnumValue; +import org.openapijsonschematools.codegen.common.CodegenConstants; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenDiscriminator; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenEncoding; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenHeader; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenKey; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenMediaType; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenOperation; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenParameter; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenPathItem; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenRequestBody; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenResponse; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSecurityScheme; +import org.openapijsonschematools.codegen.generators.openapimodels.EnumValue; import org.openapijsonschematools.codegen.templating.mustache.CamelCaseLambda; import org.openapijsonschematools.codegen.templating.mustache.IndentedLambda; import org.openapijsonschematools.codegen.templating.mustache.LowercaseLambda; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java index 6c55257e597..d898c410643 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java @@ -22,10 +22,10 @@ import io.swagger.v3.oas.models.media.*; import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; import org.openapijsonschematools.codegen.cli.ClientOptInput; -import org.openapijsonschematools.codegen.model.CodegenSchema; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; import org.openapijsonschematools.codegen.TestUtils; import org.openapijsonschematools.codegen.config.CodegenConfigurator; -import org.openapijsonschematools.codegen.model.EnumValue; +import org.openapijsonschematools.codegen.generators.openapimodels.EnumValue; import org.openapijsonschematools.codegen.common.ModelUtils; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/AbstractAnnotationAssert.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/AbstractAnnotationAssert.java similarity index 97% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/AbstractAnnotationAssert.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/AbstractAnnotationAssert.java index 385048e9f63..42a737f1866 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/AbstractAnnotationAssert.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/AbstractAnnotationAssert.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.java.assertions; +package org.openapijsonschematools.codegen.generators.javaassertions; import java.util.HashMap; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/ConstructorAssert.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ConstructorAssert.java similarity index 98% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/ConstructorAssert.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ConstructorAssert.java index 925eb9cfd0e..ad02d0662cc 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/ConstructorAssert.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ConstructorAssert.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.java.assertions; +package org.openapijsonschematools.codegen.generators.javaassertions; import com.github.javaparser.ast.body.ConstructorDeclaration; import com.github.javaparser.ast.body.Parameter; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/JavaFileAssert.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/JavaFileAssert.java similarity index 98% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/JavaFileAssert.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/JavaFileAssert.java index 431ad00f10f..d16a203bb43 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/JavaFileAssert.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/JavaFileAssert.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.java.assertions; +package org.openapijsonschematools.codegen.generators.javaassertions; import java.io.File; import java.io.IOException; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/MethodAnnotationAssert.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/MethodAnnotationAssert.java similarity index 94% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/MethodAnnotationAssert.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/MethodAnnotationAssert.java index e17ec2cc1e0..ec22f8508ae 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/MethodAnnotationAssert.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/MethodAnnotationAssert.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.java.assertions; +package org.openapijsonschematools.codegen.generators.javaassertions; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/MethodAssert.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/MethodAssert.java similarity index 98% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/MethodAssert.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/MethodAssert.java index dfb4746825c..65e444e26ed 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/MethodAssert.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/MethodAssert.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.java.assertions; +package org.openapijsonschematools.codegen.generators.javaassertions; import java.util.Arrays; import java.util.Optional; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/ParameterAnnotationAssert.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ParameterAnnotationAssert.java similarity index 89% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/ParameterAnnotationAssert.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ParameterAnnotationAssert.java index f2aaf07306b..a2674bfae50 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/ParameterAnnotationAssert.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ParameterAnnotationAssert.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.java.assertions; +package org.openapijsonschematools.codegen.generators.javaassertions; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/ParameterAssert.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ParameterAssert.java similarity index 96% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/ParameterAssert.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ParameterAssert.java index 5e0d6495eea..b6ee4bf04d4 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/ParameterAssert.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ParameterAssert.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.java.assertions; +package org.openapijsonschematools.codegen.generators.javaassertions; import org.assertj.core.api.Assertions; import org.assertj.core.api.ObjectAssert; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/PropertyAnnotationAssert.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/PropertyAnnotationAssert.java similarity index 89% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/PropertyAnnotationAssert.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/PropertyAnnotationAssert.java index d378c799c63..730752714cf 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/PropertyAnnotationAssert.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/PropertyAnnotationAssert.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.java.assertions; +package org.openapijsonschematools.codegen.generators.javaassertions; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/PropertyAssert.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/PropertyAssert.java similarity index 94% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/PropertyAssert.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/PropertyAssert.java index 4fa94f9ce59..35a163918a6 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/PropertyAssert.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/PropertyAssert.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.java.assertions; +package org.openapijsonschematools.codegen.generators.javaassertions; import org.assertj.core.api.Assertions; import org.assertj.core.api.ObjectAssert; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/TypeAnnotationAssert.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/TypeAnnotationAssert.java similarity index 88% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/TypeAnnotationAssert.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/TypeAnnotationAssert.java index 6d2ac6b674b..8466640d5bd 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/java/assertions/TypeAnnotationAssert.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/TypeAnnotationAssert.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.java.assertions; +package org.openapijsonschematools.codegen.generators.javaassertions; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java index e1927cfbd63..cb63a93b63d 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java @@ -18,7 +18,7 @@ package org.openapijsonschematools.codegen.options; import com.google.common.collect.ImmutableMap; -import org.openapijsonschematools.codegen.generatorrunner.CodegenConstants; +import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.generators.PythonClientGenerator; import java.util.Map; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TemplateManagerTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/TemplateManagerTest.java similarity index 99% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TemplateManagerTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/TemplateManagerTest.java index b71e0f3cd77..de8ea02fa67 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TemplateManagerTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/TemplateManagerTest.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.templating; import org.openapijsonschematools.codegen.templating.HandlebarsEngineAdapter; import org.openapijsonschematools.codegen.templating.MustacheEngineAdapter; From 194a79c36d2476e5d80ea186baf25a99b593e17c Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 12:12:44 -0700 Subject: [PATCH 12/43] Moves ignore int generator, removes unneeded classes for python generator --- .../DefaultGeneratorRunner.java | 19 +---------- .../codegen/generators/DefaultGenerator.java | 21 ++++++++++++ .../codegen/generators/Generator.java | 3 ++ .../generators/PythonClientGenerator.java | 33 ------------------- .../ignore/CodegenIgnoreProcessor.java | 6 ++-- .../ignore/rules/DirectoryRule.java | 2 +- .../ignore/rules/EverythingRule.java | 2 +- .../ignore/rules/FileRule.java | 2 +- .../ignore/rules/IgnoreLineParser.java | 2 +- .../ignore/rules/InvalidRule.java | 2 +- .../ignore/rules/ParserException.java | 2 +- .../{ => generators}/ignore/rules/Part.java | 2 +- .../ignore/rules/RootedFileRule.java | 2 +- .../{ => generators}/ignore/rules/Rule.java | 2 +- .../options}/AbstractOptionsTest.java | 3 +- .../options/OptionsProvider.java | 2 +- .../options/PythonClientOptionsProvider.java | 2 +- 17 files changed, 40 insertions(+), 67 deletions(-) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => generators}/ignore/CodegenIgnoreProcessor.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => generators}/ignore/rules/DirectoryRule.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => generators}/ignore/rules/EverythingRule.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => generators}/ignore/rules/FileRule.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => generators}/ignore/rules/IgnoreLineParser.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => generators}/ignore/rules/InvalidRule.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => generators}/ignore/rules/ParserException.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => generators}/ignore/rules/Part.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => generators}/ignore/rules/RootedFileRule.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{ => generators}/ignore/rules/Rule.java (99%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{ => generators/options}/AbstractOptionsTest.java (96%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{ => generators}/options/OptionsProvider.java (93%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{ => generators}/options/PythonClientOptionsProvider.java (97%) diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java index 249a975a7a2..d30c75bc6e3 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java @@ -37,7 +37,6 @@ import org.openapijsonschematools.codegen.common.DryRunStatus; import org.openapijsonschematools.codegen.generators.Generator; import org.openapijsonschematools.codegen.config.GlobalSettings; -import org.openapijsonschematools.codegen.ignore.CodegenIgnoreProcessor; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenHeader; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenKey; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenMediaType; @@ -92,7 +91,6 @@ public class DefaultGeneratorRunner implements GeneratorRunner { public Generator generator; protected ClientOptInput opts; public OpenAPI openAPI; - protected CodegenIgnoreProcessor ignoreProcessor; private Boolean generateApis = null; private Boolean generateModels = null; private Boolean generateSupportingFiles = null; @@ -148,21 +146,6 @@ public GeneratorRunner opts(ClientOptInput opts) { new TemplatePathLocator[]{generatorTemplateLocator, commonTemplateLocator} ); } - - String ignoreFileLocation = this.generator.getIgnoreFilePathOverride(); - if (ignoreFileLocation != null) { - final File ignoreFile = new File(ignoreFileLocation); - if (ignoreFile.exists() && ignoreFile.canRead()) { - this.ignoreProcessor = new CodegenIgnoreProcessor(ignoreFile); - } else { - LOGGER.warn("Ignore file specified at {} is not valid. This will fall back to an existing ignore file if present in the output directory.", ignoreFileLocation); - } - } - - if (this.ignoreProcessor == null) { - this.ignoreProcessor = new CodegenIgnoreProcessor(this.generator.getOutputDir()); - } - return this; } @@ -1587,7 +1570,7 @@ protected File processTemplateToFile(Map templateData, String te private File processTemplateToFile(Map templateData, String templateName, String outputFilename, boolean shouldGenerate, String skippedByOption, String intendedOutputDir) throws IOException { String adjustedOutputFilename = outputFilename.replaceAll("//", "/").replace('/', File.separatorChar); File target = new File(adjustedOutputFilename); - if (ignoreProcessor.allowsFile(target)) { + if (generator.getIgnoreProcessor().allowsFile(target)) { if (shouldGenerate) { Path outDir = java.nio.file.Paths.get(intendedOutputDir).toAbsolutePath(); Path absoluteTarget = target.toPath().toAbsolutePath(); diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java index af6bd1f4dd7..0a78238989f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java @@ -74,6 +74,7 @@ import org.openapijsonschematools.codegen.generators.openapimodels.LinkedHashMapWithContext; import org.openapijsonschematools.codegen.generators.openapimodels.PairCacheKey; import org.openapijsonschematools.codegen.generators.openapimodels.SchemaTestCase; +import org.openapijsonschematools.codegen.generators.ignore.CodegenIgnoreProcessor; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.common.SerializerUtils; import org.openapijsonschematools.codegen.templating.MustacheEngineAdapter; @@ -132,6 +133,8 @@ public class DefaultGenerator implements Generator { protected static Schema falseSchema; protected static Schema trueSchema = new Schema(); + protected CodegenIgnoreProcessor ignoreProcessor; + static { DefaultFeatureSet = FeatureSet.newBuilder() .includeDataTypeFeatures( @@ -333,8 +336,26 @@ public List cliOptions() { return cliOptions; } + @Override + public CodegenIgnoreProcessor getIgnoreProcessor() { + return ignoreProcessor; + } + @Override public void processOpts() { + String ignoreFileLocation = this.getIgnoreFilePathOverride(); + if (ignoreFileLocation != null) { + final File ignoreFile = new File(ignoreFileLocation); + if (ignoreFile.exists() && ignoreFile.canRead()) { + this.ignoreProcessor = new CodegenIgnoreProcessor(ignoreFile); + } else { + LOGGER.warn("Ignore file specified at {} is not valid. This will fall back to an existing ignore file if present in the output directory.", ignoreFileLocation); + } + } + + if (this.ignoreProcessor == null) { + this.ignoreProcessor = new CodegenIgnoreProcessor(this.getOutputDir()); + } if (additionalProperties.containsKey(CodegenConstants.TEMPLATE_DIR)) { this.setTemplateDir((String) additionalProperties.get(CodegenConstants.TEMPLATE_DIR)); diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java index 7f3cd779e69..297853a7f18 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java @@ -34,6 +34,7 @@ import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorLanguage; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; +import org.openapijsonschematools.codegen.generators.ignore.CodegenIgnoreProcessor; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.cli.CliOption; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenHeader; @@ -63,6 +64,8 @@ public interface Generator { String getFilesMetadataFilename(); + CodegenIgnoreProcessor getIgnoreProcessor(); + String getVersionMetadataFilename(); GeneratorMetadata getGeneratorMetadata(); diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java index 5660452ca21..a8d557eecf9 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java @@ -33,7 +33,6 @@ import org.openapijsonschematools.codegen.generators.openapimodels.CodegenPatternInfo; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; import org.openapijsonschematools.codegen.templating.SupportingFile; -import org.openapijsonschematools.codegen.templating.TemplateManager; import org.openapijsonschematools.codegen.generators.generatormetadata.features.DataTypeFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.DocumentationFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.GlobalFeature; @@ -41,13 +40,8 @@ import org.openapijsonschematools.codegen.generators.generatormetadata.features.SecurityFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.WireFormatFeature; import org.openapijsonschematools.codegen.generators.openapimodels.PairCacheKey; -import org.openapijsonschematools.codegen.templating.CommonTemplateContentLocator; -import org.openapijsonschematools.codegen.templating.GeneratorTemplateContentLocator; import org.openapijsonschematools.codegen.templating.HandlebarsEngineAdapter; -import org.openapijsonschematools.codegen.templating.TemplateManagerOptions; -import org.openapijsonschematools.codegen.templating.TemplatePathLocator; import org.openapijsonschematools.codegen.config.GlobalSettings; -import org.openapijsonschematools.codegen.ignore.CodegenIgnoreProcessor; import io.swagger.v3.oas.models.media.*; import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.security.SecurityScheme; @@ -59,7 +53,6 @@ import org.openapijsonschematools.codegen.common.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.openapijsonschematools.codegen.templating.TemplateProcessor; import java.io.File; import java.io.IOException; @@ -99,9 +92,6 @@ public class PythonClientGenerator extends AbstractPythonGenerator { private Map modelNameToSchemaCache; private final DateTimeFormatter iso8601Date = DateTimeFormatter.ISO_DATE; private final DateTimeFormatter iso8601DateTime = DateTimeFormatter.ISO_DATE_TIME; - - protected CodegenIgnoreProcessor ignoreProcessor; - protected TemplateProcessor templateProcessor = null; private boolean nonCompliantUseDiscrIfCompositionFails = false; private final HashMap modelNameCache = new HashMap<>(); @@ -341,29 +331,6 @@ public void processOpts() { throw new RuntimeException("Only the HandlebarsEngineAdapter is supported for this generator"); } - TemplatePathLocator commonTemplateLocator = new CommonTemplateContentLocator(); - TemplatePathLocator generatorTemplateLocator = new GeneratorTemplateContentLocator(this); - TemplateManagerOptions templateManagerOptions = new TemplateManagerOptions(this.isEnableMinimalUpdate(),this.isSkipOverwrite()); - templateProcessor = new TemplateManager( - templateManagerOptions, - te, - new TemplatePathLocator[]{generatorTemplateLocator, commonTemplateLocator} - ); - - String ignoreFileLocation = this.getIgnoreFilePathOverride(); - if (ignoreFileLocation != null) { - final File ignoreFile = new File(ignoreFileLocation); - if (ignoreFile.exists() && ignoreFile.canRead()) { - this.ignoreProcessor = new CodegenIgnoreProcessor(ignoreFile); - } else { - LOGGER.warn("Ignore file specified at {} is not valid. This will fall back to an existing ignore file if present in the output directory.", ignoreFileLocation); - } - } - - if (this.ignoreProcessor == null) { - this.ignoreProcessor = new CodegenIgnoreProcessor(this.getOutputDir()); - } - /* The pyi stub files exists to allow pycharm to read and use typing.overload decorators for it to see that dict_instance["someProp"] is of type SomeClass.properties.someProp diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/CodegenIgnoreProcessor.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/CodegenIgnoreProcessor.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/CodegenIgnoreProcessor.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/CodegenIgnoreProcessor.java index 762c2d65feb..1c267d7031c 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/CodegenIgnoreProcessor.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/CodegenIgnoreProcessor.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.ignore; +package org.openapijsonschematools.codegen.generators.ignore; -import org.openapijsonschematools.codegen.ignore.rules.DirectoryRule; -import org.openapijsonschematools.codegen.ignore.rules.Rule; +import org.openapijsonschematools.codegen.generators.ignore.rules.DirectoryRule; +import org.openapijsonschematools.codegen.generators.ignore.rules.Rule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/DirectoryRule.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/DirectoryRule.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/DirectoryRule.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/DirectoryRule.java index 191b29e7b99..3fbfceffba5 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/DirectoryRule.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/DirectoryRule.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.ignore.rules; +package org.openapijsonschematools.codegen.generators.ignore.rules; import java.nio.file.FileSystems; import java.nio.file.PathMatcher; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/EverythingRule.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/EverythingRule.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/EverythingRule.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/EverythingRule.java index aa4a81da04f..23f74bc3a84 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/EverythingRule.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/EverythingRule.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.ignore.rules; +package org.openapijsonschematools.codegen.generators.ignore.rules; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/FileRule.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/FileRule.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/FileRule.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/FileRule.java index edb5220ef34..7f5fab1fd32 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/FileRule.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/FileRule.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.ignore.rules; +package org.openapijsonschematools.codegen.generators.ignore.rules; import java.nio.file.FileSystems; import java.nio.file.PathMatcher; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/IgnoreLineParser.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/IgnoreLineParser.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/IgnoreLineParser.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/IgnoreLineParser.java index 17e940b8fa1..b192f91169b 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/IgnoreLineParser.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/IgnoreLineParser.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.ignore.rules; +package org.openapijsonschematools.codegen.generators.ignore.rules; import java.util.ArrayList; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/InvalidRule.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/InvalidRule.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/InvalidRule.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/InvalidRule.java index 292df4feb09..c75727068ae 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/InvalidRule.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/InvalidRule.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.ignore.rules; +package org.openapijsonschematools.codegen.generators.ignore.rules; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/ParserException.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/ParserException.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/ParserException.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/ParserException.java index 2c69a8c2df5..5fdc0f32ee3 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/ParserException.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/ParserException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.ignore.rules; +package org.openapijsonschematools.codegen.generators.ignore.rules; public class ParserException extends Exception { /** diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/Part.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/Part.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/Part.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/Part.java index 88f7e7922c9..b89a6c2700d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/Part.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/Part.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.ignore.rules; +package org.openapijsonschematools.codegen.generators.ignore.rules; class Part { private final IgnoreLineParser.Token token; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/RootedFileRule.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/RootedFileRule.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/RootedFileRule.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/RootedFileRule.java index 5b45e7bda5e..c82c2b9159f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/RootedFileRule.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/RootedFileRule.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.ignore.rules; +package org.openapijsonschematools.codegen.generators.ignore.rules; import java.util.List; import java.util.regex.Pattern; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/Rule.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/Rule.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/Rule.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/Rule.java index 4e01d639d0b..1d6230099a9 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/ignore/rules/Rule.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/Rule.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.ignore.rules; +package org.openapijsonschematools.codegen.generators.ignore.rules; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractOptionsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/AbstractOptionsTest.java similarity index 96% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractOptionsTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/AbstractOptionsTest.java index dca51b6fa9e..625e56d72d1 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractOptionsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/AbstractOptionsTest.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.generators.options; import com.google.common.base.Function; import org.apache.commons.lang3.StringUtils; import org.mockito.MockSettings; import org.openapijsonschematools.codegen.cli.CliOption; import org.openapijsonschematools.codegen.generators.Generator; -import org.openapijsonschematools.codegen.options.OptionsProvider; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/OptionsProvider.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/OptionsProvider.java similarity index 93% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/OptionsProvider.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/OptionsProvider.java index d1029a106cf..5aa717c29fc 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/OptionsProvider.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/OptionsProvider.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.options; +package org.openapijsonschematools.codegen.generators.options; import java.util.Map; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/PythonClientOptionsProvider.java similarity index 97% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/PythonClientOptionsProvider.java index cb63a93b63d..decc7660584 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/options/PythonClientOptionsProvider.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/PythonClientOptionsProvider.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.options; +package org.openapijsonschematools.codegen.generators.options; import com.google.common.collect.ImmutableMap; import org.openapijsonschematools.codegen.common.CodegenConstants; From 20edc2a30e542556b855bb2f109e8085d44a6d54 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 12:25:08 -0700 Subject: [PATCH 13/43] Moves ignore moduel into generatorrunner --- .../DefaultGeneratorRunner.java | 18 +++++++++++++++- .../ignore/CodegenIgnoreProcessor.java | 6 +++--- .../ignore/rules/DirectoryRule.java | 2 +- .../ignore/rules/EverythingRule.java | 2 +- .../ignore/rules/FileRule.java | 2 +- .../ignore/rules/IgnoreLineParser.java | 2 +- .../ignore/rules/InvalidRule.java | 2 +- .../ignore/rules/ParserException.java | 2 +- .../ignore/rules/Part.java | 2 +- .../ignore/rules/RootedFileRule.java | 2 +- .../ignore/rules/Rule.java | 2 +- .../codegen/generators/DefaultGenerator.java | 21 +------------------ .../codegen/generators/Generator.java | 3 --- .../python/.openapi-generator/VERSION | 2 +- .../openapi3/client/petstore/python/README.md | 2 +- 15 files changed, 32 insertions(+), 38 deletions(-) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{generators => generatorrunner}/ignore/CodegenIgnoreProcessor.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{generators => generatorrunner}/ignore/rules/DirectoryRule.java (95%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{generators => generatorrunner}/ignore/rules/EverythingRule.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{generators => generatorrunner}/ignore/rules/FileRule.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{generators => generatorrunner}/ignore/rules/IgnoreLineParser.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{generators => generatorrunner}/ignore/rules/InvalidRule.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{generators => generatorrunner}/ignore/rules/ParserException.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{generators => generatorrunner}/ignore/rules/Part.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{generators => generatorrunner}/ignore/rules/RootedFileRule.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{generators => generatorrunner}/ignore/rules/Rule.java (99%) diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java index d30c75bc6e3..df7cffda6a6 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java @@ -35,6 +35,7 @@ import org.openapijsonschematools.codegen.cli.ClientOptInput; import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.common.DryRunStatus; +import org.openapijsonschematools.codegen.generatorrunner.ignore.CodegenIgnoreProcessor; import org.openapijsonschematools.codegen.generators.Generator; import org.openapijsonschematools.codegen.config.GlobalSettings; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenHeader; @@ -91,6 +92,7 @@ public class DefaultGeneratorRunner implements GeneratorRunner { public Generator generator; protected ClientOptInput opts; public OpenAPI openAPI; + protected CodegenIgnoreProcessor ignoreProcessor; private Boolean generateApis = null; private Boolean generateModels = null; private Boolean generateSupportingFiles = null; @@ -146,6 +148,20 @@ public GeneratorRunner opts(ClientOptInput opts) { new TemplatePathLocator[]{generatorTemplateLocator, commonTemplateLocator} ); } + + String ignoreFileLocation = generator.getIgnoreFilePathOverride(); + if (ignoreFileLocation != null) { + final File ignoreFile = new File(ignoreFileLocation); + if (ignoreFile.exists() && ignoreFile.canRead()) { + this.ignoreProcessor = new CodegenIgnoreProcessor(ignoreFile); + } else { + LOGGER.warn("Ignore file specified at {} is not valid. This will fall back to an existing ignore file if present in the output directory.", ignoreFileLocation); + } + } + + if (this.ignoreProcessor == null) { + this.ignoreProcessor = new CodegenIgnoreProcessor(generator.getOutputDir()); + } return this; } @@ -1570,7 +1586,7 @@ protected File processTemplateToFile(Map templateData, String te private File processTemplateToFile(Map templateData, String templateName, String outputFilename, boolean shouldGenerate, String skippedByOption, String intendedOutputDir) throws IOException { String adjustedOutputFilename = outputFilename.replaceAll("//", "/").replace('/', File.separatorChar); File target = new File(adjustedOutputFilename); - if (generator.getIgnoreProcessor().allowsFile(target)) { + if (ignoreProcessor.allowsFile(target)) { if (shouldGenerate) { Path outDir = java.nio.file.Paths.get(intendedOutputDir).toAbsolutePath(); Path absoluteTarget = target.toPath().toAbsolutePath(); diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/CodegenIgnoreProcessor.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/CodegenIgnoreProcessor.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/CodegenIgnoreProcessor.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/CodegenIgnoreProcessor.java index 1c267d7031c..f3785c481a6 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/CodegenIgnoreProcessor.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/CodegenIgnoreProcessor.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.generators.ignore; +package org.openapijsonschematools.codegen.generatorrunner.ignore; -import org.openapijsonschematools.codegen.generators.ignore.rules.DirectoryRule; -import org.openapijsonschematools.codegen.generators.ignore.rules.Rule; +import org.openapijsonschematools.codegen.generatorrunner.ignore.rules.DirectoryRule; +import org.openapijsonschematools.codegen.generatorrunner.ignore.rules.Rule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/DirectoryRule.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/DirectoryRule.java similarity index 95% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/DirectoryRule.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/DirectoryRule.java index 3fbfceffba5..48f41ef0342 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/DirectoryRule.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/DirectoryRule.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.generators.ignore.rules; +package org.openapijsonschematools.codegen.generatorrunner.ignore.rules; import java.nio.file.FileSystems; import java.nio.file.PathMatcher; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/EverythingRule.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/EverythingRule.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/EverythingRule.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/EverythingRule.java index 23f74bc3a84..a97f5fc1fb1 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/EverythingRule.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/EverythingRule.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.generators.ignore.rules; +package org.openapijsonschematools.codegen.generatorrunner.ignore.rules; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/FileRule.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/FileRule.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/FileRule.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/FileRule.java index 7f5fab1fd32..36a049b25d8 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/FileRule.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/FileRule.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.generators.ignore.rules; +package org.openapijsonschematools.codegen.generatorrunner.ignore.rules; import java.nio.file.FileSystems; import java.nio.file.PathMatcher; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/IgnoreLineParser.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/IgnoreLineParser.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/IgnoreLineParser.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/IgnoreLineParser.java index b192f91169b..a096bdab14f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/IgnoreLineParser.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/IgnoreLineParser.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.generators.ignore.rules; +package org.openapijsonschematools.codegen.generatorrunner.ignore.rules; import java.util.ArrayList; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/InvalidRule.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/InvalidRule.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/InvalidRule.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/InvalidRule.java index c75727068ae..aaddc96f381 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/InvalidRule.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/InvalidRule.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.generators.ignore.rules; +package org.openapijsonschematools.codegen.generatorrunner.ignore.rules; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/ParserException.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/ParserException.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/ParserException.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/ParserException.java index 5fdc0f32ee3..6456cd3f842 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/ParserException.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/ParserException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.generators.ignore.rules; +package org.openapijsonschematools.codegen.generatorrunner.ignore.rules; public class ParserException extends Exception { /** diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/Part.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/Part.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/Part.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/Part.java index b89a6c2700d..2f7fa3c7c90 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/Part.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/Part.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.generators.ignore.rules; +package org.openapijsonschematools.codegen.generatorrunner.ignore.rules; class Part { private final IgnoreLineParser.Token token; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/RootedFileRule.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/RootedFileRule.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/RootedFileRule.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/RootedFileRule.java index c82c2b9159f..bcc9e441a7c 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/RootedFileRule.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/RootedFileRule.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.generators.ignore.rules; +package org.openapijsonschematools.codegen.generatorrunner.ignore.rules; import java.util.List; import java.util.regex.Pattern; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/Rule.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/Rule.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/Rule.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/Rule.java index 1d6230099a9..3cbe621a7e3 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/ignore/rules/Rule.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/Rule.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.generators.ignore.rules; +package org.openapijsonschematools.codegen.generatorrunner.ignore.rules; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java index 0a78238989f..f772ba9029f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java @@ -74,7 +74,7 @@ import org.openapijsonschematools.codegen.generators.openapimodels.LinkedHashMapWithContext; import org.openapijsonschematools.codegen.generators.openapimodels.PairCacheKey; import org.openapijsonschematools.codegen.generators.openapimodels.SchemaTestCase; -import org.openapijsonschematools.codegen.generators.ignore.CodegenIgnoreProcessor; +import org.openapijsonschematools.codegen.generatorrunner.ignore.CodegenIgnoreProcessor; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.common.SerializerUtils; import org.openapijsonschematools.codegen.templating.MustacheEngineAdapter; @@ -336,27 +336,8 @@ public List cliOptions() { return cliOptions; } - @Override - public CodegenIgnoreProcessor getIgnoreProcessor() { - return ignoreProcessor; - } - @Override public void processOpts() { - String ignoreFileLocation = this.getIgnoreFilePathOverride(); - if (ignoreFileLocation != null) { - final File ignoreFile = new File(ignoreFileLocation); - if (ignoreFile.exists() && ignoreFile.canRead()) { - this.ignoreProcessor = new CodegenIgnoreProcessor(ignoreFile); - } else { - LOGGER.warn("Ignore file specified at {} is not valid. This will fall back to an existing ignore file if present in the output directory.", ignoreFileLocation); - } - } - - if (this.ignoreProcessor == null) { - this.ignoreProcessor = new CodegenIgnoreProcessor(this.getOutputDir()); - } - if (additionalProperties.containsKey(CodegenConstants.TEMPLATE_DIR)) { this.setTemplateDir((String) additionalProperties.get(CodegenConstants.TEMPLATE_DIR)); } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java index 297853a7f18..7f3cd779e69 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java @@ -34,7 +34,6 @@ import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorLanguage; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; -import org.openapijsonschematools.codegen.generators.ignore.CodegenIgnoreProcessor; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.cli.CliOption; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenHeader; @@ -64,8 +63,6 @@ public interface Generator { String getFilesMetadataFilename(); - CodegenIgnoreProcessor getIgnoreProcessor(); - String getVersionMetadataFilename(); GeneratorMetadata getGeneratorMetadata(); diff --git a/samples/openapi3/client/petstore/python/.openapi-generator/VERSION b/samples/openapi3/client/petstore/python/.openapi-generator/VERSION index 56fea8a08d2..717311e32e3 100644 --- a/samples/openapi3/client/petstore/python/.openapi-generator/VERSION +++ b/samples/openapi3/client/petstore/python/.openapi-generator/VERSION @@ -1 +1 @@ -3.0.0 \ No newline at end of file +unset \ No newline at end of file diff --git a/samples/openapi3/client/petstore/python/README.md b/samples/openapi3/client/petstore/python/README.md index 42ddf3f381f..3a621e45970 100644 --- a/samples/openapi3/client/petstore/python/README.md +++ b/samples/openapi3/client/petstore/python/README.md @@ -5,7 +5,7 @@ This Python package is automatically generated by the [OpenAPI JSON Schema Gener - API version: 1.0.0 - Package version: 1.0.0 -- Build package: PythonClientCodegen +- Build package: PythonClientGenerator ## Requirements From 2a74b5f54457d848c796bfa5a140875f154a796d Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 12:36:23 -0700 Subject: [PATCH 14/43] validation module refactored to move external imports to its root level --- .../codegen/cmd/Validate.java | 6 +++--- .../validation/{oas => }/OpenApiEvaluator.java | 12 ++++++------ .../{oas => }/OpenApiOperationValidations.java | 6 +++--- .../{oas => }/OpenApiParameterValidations.java | 6 +++--- .../{oas => }/OpenApiSchemaValidations.java | 6 +++--- .../OpenApiSecuritySchemeValidations.java | 6 +++--- .../validation/{oas => }/OperationWrapper.java | 2 +- .../validation/{oas => }/ParameterWrapper.java | 2 +- .../validation/{oas => }/RuleConfiguration.java | 2 +- .../validation/{oas => }/SchemaWrapper.java | 2 +- .../{oas => }/SecuritySchemeWrapper.java | 2 +- .../validation/{oas => }/ValidationConstants.java | 2 +- .../{ => validators}/GenericValidator.java | 2 +- .../validation/{ => validators}/Invalid.java | 2 +- .../validation/{ => validators}/Severity.java | 2 +- .../codegen/validation/{ => validators}/Valid.java | 2 +- .../validation/{ => validators}/Validated.java | 2 +- .../{ => validators}/ValidationResult.java | 2 +- .../{ => validators}/ValidationRule.java | 2 +- .../validation/{ => validators}/Validator.java | 4 +--- .../{oas => }/OpenApiOperationValidationsTest.java | 12 ++++++------ .../{oas => }/OpenApiParameterValidationsTest.java | 14 +++++++------- .../{oas => }/OpenApiSchemaTypeTest.java | 10 +++++----- .../{oas => }/OpenApiSchemaValidationsTest.java | 12 ++++++------ .../OpenApiSecuritySchemeValidationsTest.java | 14 +++++++------- .../{ => validators}/GenericValidatorTest.java | 2 +- .../validation/{ => validators}/ValidatedTest.java | 4 +++- .../{ => validators}/ValidationRuleTest.java | 2 +- 28 files changed, 71 insertions(+), 71 deletions(-) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{oas => }/OpenApiEvaluator.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{oas => }/OpenApiOperationValidations.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{oas => }/OpenApiParameterValidations.java (90%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{oas => }/OpenApiSchemaValidations.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{oas => }/OpenApiSecuritySchemeValidations.java (90%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{oas => }/OperationWrapper.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{oas => }/ParameterWrapper.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{oas => }/RuleConfiguration.java (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{oas => }/SchemaWrapper.java (93%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{oas => }/SecuritySchemeWrapper.java (94%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{oas => }/ValidationConstants.java (87%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{ => validators}/GenericValidator.java (96%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{ => validators}/Invalid.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{ => validators}/Severity.java (95%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{ => validators}/Valid.java (95%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{ => validators}/Validated.java (97%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{ => validators}/ValidationResult.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{ => validators}/ValidationRule.java (99%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/{ => validators}/Validator.java (90%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/{oas => }/OpenApiOperationValidationsTest.java (92%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/{oas => }/OpenApiParameterValidationsTest.java (88%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/{oas => }/OpenApiSchemaTypeTest.java (82%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/{oas => }/OpenApiSchemaValidationsTest.java (92%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/{oas => }/OpenApiSecuritySchemeValidationsTest.java (88%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/{ => validators}/GenericValidatorTest.java (99%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/{ => validators}/ValidatedTest.java (83%) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/{ => validators}/ValidationRuleTest.java (97%) diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Validate.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Validate.java index 243890f8253..6ce714eaa14 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Validate.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Validate.java @@ -25,9 +25,9 @@ import io.swagger.v3.parser.core.models.ParseOptions; import io.swagger.v3.parser.core.models.SwaggerParseResult; import org.apache.commons.text.WordUtils; -import org.openapijsonschematools.codegen.validation.oas.OpenApiEvaluator; -import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; -import org.openapijsonschematools.codegen.validation.ValidationResult; +import org.openapijsonschematools.codegen.validation.OpenApiEvaluator; +import org.openapijsonschematools.codegen.validation.RuleConfiguration; +import org.openapijsonschematools.codegen.validation.validators.ValidationResult; import java.util.HashSet; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiEvaluator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiEvaluator.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiEvaluator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiEvaluator.java index 7033dc588db..eaf2b20fb1d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiEvaluator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiEvaluator.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validation.oas; +package org.openapijsonschematools.codegen.validation; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; @@ -8,11 +8,11 @@ import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.tags.Tag; import org.openapijsonschematools.codegen.common.ModelUtils; -import org.openapijsonschematools.codegen.validation.Severity; -import org.openapijsonschematools.codegen.validation.Validated; -import org.openapijsonschematools.codegen.validation.ValidationResult; -import org.openapijsonschematools.codegen.validation.ValidationRule; -import org.openapijsonschematools.codegen.validation.Validator; +import org.openapijsonschematools.codegen.validation.validators.Severity; +import org.openapijsonschematools.codegen.validation.validators.Validated; +import org.openapijsonschematools.codegen.validation.validators.ValidationResult; +import org.openapijsonschematools.codegen.validation.validators.ValidationRule; +import org.openapijsonschematools.codegen.validation.validators.Validator; import java.util.*; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiOperationValidations.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidations.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiOperationValidations.java index b118688e102..69acb5de523 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiOperationValidations.java @@ -1,10 +1,10 @@ -package org.openapijsonschematools.codegen.validation.oas; +package org.openapijsonschematools.codegen.validation; import io.swagger.v3.oas.models.PathItem; import io.swagger.v3.oas.models.parameters.RequestBody; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.validation.GenericValidator; -import org.openapijsonschematools.codegen.validation.ValidationRule; +import org.openapijsonschematools.codegen.validation.validators.GenericValidator; +import org.openapijsonschematools.codegen.validation.validators.ValidationRule; import java.util.ArrayList; import java.util.Locale; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiParameterValidations.java similarity index 90% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidations.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiParameterValidations.java index ee1698089ff..3ba9cdd0a0b 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiParameterValidations.java @@ -1,10 +1,10 @@ -package org.openapijsonschematools.codegen.validation.oas; +package org.openapijsonschematools.codegen.validation; import io.swagger.v3.oas.models.parameters.HeaderParameter; import io.swagger.v3.oas.models.parameters.Parameter; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.validation.GenericValidator; -import org.openapijsonschematools.codegen.validation.ValidationRule; +import org.openapijsonschematools.codegen.validation.validators.GenericValidator; +import org.openapijsonschematools.codegen.validation.validators.ValidationRule; import java.util.ArrayList; import java.util.Locale; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaValidations.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaValidations.java index 38ec3333454..a76c7bc22c8 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaValidations.java @@ -1,12 +1,12 @@ -package org.openapijsonschematools.codegen.validation.oas; +package org.openapijsonschematools.codegen.validation; import io.swagger.v3.oas.models.media.ComposedSchema; import io.swagger.v3.oas.models.media.Schema; import org.openapijsonschematools.codegen.common.ModelUtils; import org.openapijsonschematools.codegen.common.SemVer; -import org.openapijsonschematools.codegen.validation.GenericValidator; -import org.openapijsonschematools.codegen.validation.ValidationRule; +import org.openapijsonschematools.codegen.validation.validators.GenericValidator; +import org.openapijsonschematools.codegen.validation.validators.ValidationRule; import java.util.ArrayList; import java.util.Locale; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidations.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiSecuritySchemeValidations.java similarity index 90% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidations.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiSecuritySchemeValidations.java index 5f49cc82005..342fc24ad72 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidations.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiSecuritySchemeValidations.java @@ -1,9 +1,9 @@ -package org.openapijsonschematools.codegen.validation.oas; +package org.openapijsonschematools.codegen.validation; import io.swagger.v3.oas.models.security.SecurityScheme; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.validation.GenericValidator; -import org.openapijsonschematools.codegen.validation.ValidationRule; +import org.openapijsonschematools.codegen.validation.validators.GenericValidator; +import org.openapijsonschematools.codegen.validation.validators.ValidationRule; import java.util.ArrayList; import java.util.Locale; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OperationWrapper.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OperationWrapper.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OperationWrapper.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OperationWrapper.java index d4f0b698017..57c39b10521 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/OperationWrapper.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OperationWrapper.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validation.oas; +package org.openapijsonschematools.codegen.validation; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ParameterWrapper.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ParameterWrapper.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ParameterWrapper.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ParameterWrapper.java index 2e3aa615897..c81852fbe5e 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ParameterWrapper.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ParameterWrapper.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validation.oas; +package org.openapijsonschematools.codegen.validation; import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.OpenAPI; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/RuleConfiguration.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/RuleConfiguration.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/RuleConfiguration.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/RuleConfiguration.java index 089a767f3c8..a35cae1b1fc 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/RuleConfiguration.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/RuleConfiguration.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validation.oas; +package org.openapijsonschematools.codegen.validation; /** * Allows for configuration of validation rules which will be applied to a specification. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SchemaWrapper.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/SchemaWrapper.java similarity index 93% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SchemaWrapper.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/SchemaWrapper.java index 0a17f3c6388..a2f35e561bc 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SchemaWrapper.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/SchemaWrapper.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validation.oas; +package org.openapijsonschematools.codegen.validation; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.OpenAPI; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SecuritySchemeWrapper.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/SecuritySchemeWrapper.java similarity index 94% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SecuritySchemeWrapper.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/SecuritySchemeWrapper.java index 19ab305ad6b..5f06b4b03fc 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/SecuritySchemeWrapper.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/SecuritySchemeWrapper.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validation.oas; +package org.openapijsonschematools.codegen.validation; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.security.SecurityScheme; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ValidationConstants.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationConstants.java similarity index 87% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ValidationConstants.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationConstants.java index ff1e067248f..8a21cc5fccc 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/oas/ValidationConstants.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationConstants.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validation.oas; +package org.openapijsonschematools.codegen.validation; final class ValidationConstants { static String ApacheNginxUnderscoreDescription = "Apache and Nginx may fail on headers keys with underscore!"; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/GenericValidator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/GenericValidator.java similarity index 96% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/GenericValidator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/GenericValidator.java index 64f922fc26e..e93a7ca8900 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/GenericValidator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/GenericValidator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation; +package org.openapijsonschematools.codegen.validation.validators; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Invalid.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Invalid.java index c8940f7c4ee..f2774b72e50 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Invalid.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Invalid.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation; +package org.openapijsonschematools.codegen.validation.validators; /** * Represents a {@link Validated} state which is "Invalid" to some degree of {@link Severity}. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Severity.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Severity.java similarity index 95% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Severity.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Severity.java index 9be63d0f536..c13b199f564 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Severity.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Severity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation; +package org.openapijsonschematools.codegen.validation.validators; /** * Defines different levels of severity to be used during validation. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Valid.java similarity index 95% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Valid.java index b56adb806d9..14d67ee6ff9 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Valid.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Valid.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation; +package org.openapijsonschematools.codegen.validation.validators; /** * Represents a {@link Validated} state which is "valid" according to the defined rule. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Validated.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Validated.java index 9292ac4825b..b400d7a51ed 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validated.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Validated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation; +package org.openapijsonschematools.codegen.validation.validators; /** * Provides details about the state of a completed validation. diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/ValidationResult.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/ValidationResult.java index 45b98a857bf..6c99aa54896 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationResult.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/ValidationResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation; +package org.openapijsonschematools.codegen.validation.validators; import java.util.ArrayList; import java.util.Collections; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/ValidationRule.java similarity index 99% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/ValidationRule.java index 1cebb01ee30..220d0f9266e 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationRule.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/ValidationRule.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation; +package org.openapijsonschematools.codegen.validation.validators; import java.util.function.Function; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Validator.java similarity index 90% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Validator.java index 892f2636abc..a67727fc37a 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/Validator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Validator.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation; - -import org.openapijsonschematools.codegen.validation.ValidationResult; +package org.openapijsonschematools.codegen.validation.validators; /** * Defines a contract allowing some input to be validated. diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiOperationValidationsTest.java similarity index 92% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidationsTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiOperationValidationsTest.java index a334a42234e..5f3f3316677 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiOperationValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiOperationValidationsTest.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.validation.oas; +package org.openapijsonschematools.codegen.validation; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; @@ -6,11 +6,11 @@ import io.swagger.v3.oas.models.media.MediaType; import io.swagger.v3.oas.models.parameters.RequestBody; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.validation.Invalid; -import org.openapijsonschematools.codegen.validation.ValidationResult; -import org.openapijsonschematools.codegen.validation.oas.OpenApiOperationValidations; -import org.openapijsonschematools.codegen.validation.oas.OperationWrapper; -import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; +import org.openapijsonschematools.codegen.validation.OpenApiOperationValidations; +import org.openapijsonschematools.codegen.validation.OperationWrapper; +import org.openapijsonschematools.codegen.validation.RuleConfiguration; +import org.openapijsonschematools.codegen.validation.validators.Invalid; +import org.openapijsonschematools.codegen.validation.validators.ValidationResult; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiParameterValidationsTest.java similarity index 88% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidationsTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiParameterValidationsTest.java index b2e3993cdd3..f95b1c5bb8c 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiParameterValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiParameterValidationsTest.java @@ -1,12 +1,12 @@ -package org.openapijsonschematools.codegen.validation.oas; +package org.openapijsonschematools.codegen.validation; import io.swagger.v3.oas.models.parameters.Parameter; -import org.openapijsonschematools.codegen.validation.Invalid; -import org.openapijsonschematools.codegen.validation.ValidationResult; -import org.openapijsonschematools.codegen.validation.oas.OpenApiParameterValidations; -import org.openapijsonschematools.codegen.validation.oas.ParameterWrapper; -import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; -import org.openapijsonschematools.codegen.validation.oas.ValidationConstants; +import org.openapijsonschematools.codegen.validation.OpenApiParameterValidations; +import org.openapijsonschematools.codegen.validation.ParameterWrapper; +import org.openapijsonschematools.codegen.validation.RuleConfiguration; +import org.openapijsonschematools.codegen.validation.ValidationConstants; +import org.openapijsonschematools.codegen.validation.validators.Invalid; +import org.openapijsonschematools.codegen.validation.validators.ValidationResult; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaTypeTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaTypeTest.java similarity index 82% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaTypeTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaTypeTest.java index d03ea9b28f4..4a77517c096 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaTypeTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaTypeTest.java @@ -1,11 +1,11 @@ -package org.openapijsonschematools.codegen.validation.oas; +package org.openapijsonschematools.codegen.validation; import io.swagger.v3.oas.models.OpenAPI; import org.openapijsonschematools.codegen.TestUtils; -import org.openapijsonschematools.codegen.validation.Invalid; -import org.openapijsonschematools.codegen.validation.ValidationResult; -import org.openapijsonschematools.codegen.validation.oas.OpenApiEvaluator; -import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; +import org.openapijsonschematools.codegen.validation.OpenApiEvaluator; +import org.openapijsonschematools.codegen.validation.RuleConfiguration; +import org.openapijsonschematools.codegen.validation.validators.Invalid; +import org.openapijsonschematools.codegen.validation.validators.ValidationResult; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaValidationsTest.java similarity index 92% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidationsTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaValidationsTest.java index 95ab4fa706c..c40b972ae8c 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSchemaValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaValidationsTest.java @@ -1,11 +1,11 @@ -package org.openapijsonschematools.codegen.validation.oas; +package org.openapijsonschematools.codegen.validation; import io.swagger.v3.oas.models.media.*; -import org.openapijsonschematools.codegen.validation.Invalid; -import org.openapijsonschematools.codegen.validation.ValidationResult; -import org.openapijsonschematools.codegen.validation.oas.OpenApiSchemaValidations; -import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; -import org.openapijsonschematools.codegen.validation.oas.SchemaWrapper; +import org.openapijsonschematools.codegen.validation.OpenApiSchemaValidations; +import org.openapijsonschematools.codegen.validation.RuleConfiguration; +import org.openapijsonschematools.codegen.validation.SchemaWrapper; +import org.openapijsonschematools.codegen.validation.validators.Invalid; +import org.openapijsonschematools.codegen.validation.validators.ValidationResult; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidationsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSecuritySchemeValidationsTest.java similarity index 88% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidationsTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSecuritySchemeValidationsTest.java index 69c7bf3a310..4b9fa18b1e0 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/oas/OpenApiSecuritySchemeValidationsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSecuritySchemeValidationsTest.java @@ -1,12 +1,12 @@ -package org.openapijsonschematools.codegen.validation.oas; +package org.openapijsonschematools.codegen.validation; import io.swagger.v3.oas.models.security.SecurityScheme; -import org.openapijsonschematools.codegen.validation.Invalid; -import org.openapijsonschematools.codegen.validation.ValidationResult; -import org.openapijsonschematools.codegen.validation.oas.OpenApiSecuritySchemeValidations; -import org.openapijsonschematools.codegen.validation.oas.RuleConfiguration; -import org.openapijsonschematools.codegen.validation.oas.SecuritySchemeWrapper; -import org.openapijsonschematools.codegen.validation.oas.ValidationConstants; +import org.openapijsonschematools.codegen.validation.OpenApiSecuritySchemeValidations; +import org.openapijsonschematools.codegen.validation.RuleConfiguration; +import org.openapijsonschematools.codegen.validation.SecuritySchemeWrapper; +import org.openapijsonschematools.codegen.validation.ValidationConstants; +import org.openapijsonschematools.codegen.validation.validators.Invalid; +import org.openapijsonschematools.codegen.validation.validators.ValidationResult; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/validators/GenericValidatorTest.java similarity index 99% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/validators/GenericValidatorTest.java index 75120247608..56e104aacc8 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/GenericValidatorTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/validators/GenericValidatorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation; +package org.openapijsonschematools.codegen.validation.validators; import org.testng.annotations.Test; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/validators/ValidatedTest.java similarity index 83% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/validators/ValidatedTest.java index ddc780c3e2c..5bc8fa4aaa9 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidatedTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/validators/ValidatedTest.java @@ -14,8 +14,10 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation; +package org.openapijsonschematools.codegen.validation.validators; +import org.openapijsonschematools.codegen.validation.validators.Validated; +import org.openapijsonschematools.codegen.validation.validators.ValidationRule; import org.testng.annotations.Test; import static org.testng.Assert.*; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/validators/ValidationRuleTest.java similarity index 97% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/validators/ValidationRuleTest.java index d6149067cc0..a4db6f60712 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/ValidationRuleTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/validators/ValidationRuleTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.validation; +package org.openapijsonschematools.codegen.validation.validators; import org.testng.annotations.Test; From 7e9f2dcf0d01f3d108c652daa8a6d853a82584cc Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 12:42:30 -0700 Subject: [PATCH 15/43] Moves java test file --- .../codegen/{ => config}/SpecValidationExceptionTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/{ => config}/SpecValidationExceptionTest.java (82%) diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/SpecValidationExceptionTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/config/SpecValidationExceptionTest.java similarity index 82% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/SpecValidationExceptionTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/config/SpecValidationExceptionTest.java index 3d82418ca3e..d8d5d48641b 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/SpecValidationExceptionTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/config/SpecValidationExceptionTest.java @@ -1,6 +1,5 @@ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.config; -import org.openapijsonschematools.codegen.config.SpecValidationException; import org.testng.Assert; import org.testng.annotations.Test; From 8930c0a5e5bceffee411b783e9c356f3f3c1b0b1 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 13:00:58 -0700 Subject: [PATCH 16/43] Removes cli module --- .../codegen/cmd/ConfigHelp.java | 4 ++-- .../codegen/cmd/Generate.java | 2 +- .../codegen/cmd/GenerateBatch.java | 2 +- .../codegen/cli/AuthMethod.java | 24 ------------------- .../codegen/{cli => config}/AuthParser.java | 2 +- .../{cli => config}/ClientOptInput.java | 2 +- .../codegen/config/CodegenConfigurator.java | 4 +--- .../DefaultGeneratorRunner.java | 2 +- .../generatorrunner/GeneratorRunner.java | 2 +- .../generators/AbstractJavaGenerator.java | 3 ++- .../AbstractJavaJAXRSServerGenerator.java | 2 +- .../generators/AbstractKotlinGenerator.java | 2 +- .../codegen/generators/DefaultGenerator.java | 3 ++- .../codegen/generators/Generator.java | 3 ++- .../generators/JavaClientGenerator.java | 3 ++- .../generators/JavaJerseyServerGenerator.java | 2 +- .../generators/KotlinClientGenerator.java | 2 +- .../generators/PythonClientGenerator.java | 2 +- .../{cli => generators/models}/CliOption.java | 2 +- .../{ => models}/VendorExtension.java | 2 +- .../codegen/AbstractIntegrationTest.java | 2 +- .../codegen/MockDefaultGeneratorRunner.java | 2 +- .../DefaultGeneratorRunnerTest.java | 2 +- .../generators/PythonClientGeneratorTest.java | 2 +- .../options/AbstractOptionsTest.java | 2 +- 25 files changed, 29 insertions(+), 51 deletions(-) delete mode 100644 modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/AuthMethod.java rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{cli => config}/AuthParser.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{cli => config}/ClientOptInput.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/{cli => generators/models}/CliOption.java (98%) rename modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/{ => models}/VendorExtension.java (97%) diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java index b4b99fc15cc..1ec222c6ecd 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java @@ -20,11 +20,11 @@ import io.airlift.airline.Command; import io.airlift.airline.Option; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.generators.models.CliOption; import org.openapijsonschematools.codegen.generators.Generator; import org.openapijsonschematools.codegen.generators.generatorloader.GeneratorLoader; import org.openapijsonschematools.codegen.generators.generatorloader.GeneratorNotFoundException; -import org.openapijsonschematools.codegen.generators.VendorExtension; +import org.openapijsonschematools.codegen.generators.models.VendorExtension; import org.openapijsonschematools.codegen.generators.generatormetadata.FeatureSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java index bfcb1d3f4e2..e3e121a5aaf 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java @@ -29,7 +29,7 @@ import java.util.stream.Stream; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.config.ClientOptInput; import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; import org.openapijsonschematools.codegen.generatorrunner.GeneratorRunner; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java index 6e758bf8a7b..770fd5ff8a5 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java @@ -32,7 +32,7 @@ import io.airlift.airline.Option; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.config.ClientOptInput; import org.openapijsonschematools.codegen.generators.Generator; import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; import org.openapijsonschematools.codegen.config.CodegenConfigurator; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/AuthMethod.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/AuthMethod.java deleted file mode 100644 index 4bd78f201d7..00000000000 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/AuthMethod.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) - * Copyright 2018 SmartBear Software - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.openapijsonschematools.codegen.cli; - -public interface AuthMethod { - String getType(); - - void setType(String type); -} \ No newline at end of file diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/AuthParser.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/AuthParser.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/AuthParser.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/AuthParser.java index 1d12fb686e7..253abb79a0d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/AuthParser.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/AuthParser.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.cli; +package org.openapijsonschematools.codegen.config; import io.swagger.v3.parser.core.models.AuthorizationValue; import org.slf4j.Logger; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/ClientOptInput.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/ClientOptInput.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/ClientOptInput.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/ClientOptInput.java index a6c1d29ac90..de227108ef6 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/ClientOptInput.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/ClientOptInput.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.cli; +package org.openapijsonschematools.codegen.config; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.parser.core.models.AuthorizationValue; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java index 87abb582cfa..bc9cd9f35b6 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java @@ -30,14 +30,12 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; -import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.generators.Generator; import org.openapijsonschematools.codegen.generators.generatorloader.GeneratorLoader; -import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.templating.TemplatingEngineLoader; import org.openapijsonschematools.codegen.templating.TemplateDefinition; import org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter; -import org.openapijsonschematools.codegen.cli.AuthParser; import org.openapijsonschematools.codegen.common.ModelUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java index df7cffda6a6..7182c059652 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java @@ -32,7 +32,7 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.comparator.PathFileComparator; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.config.ClientOptInput; import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.common.DryRunStatus; import org.openapijsonschematools.codegen.generatorrunner.ignore.CodegenIgnoreProcessor; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorRunner.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorRunner.java index 65e4a9548eb..9878ba39183 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorRunner.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorRunner.java @@ -17,7 +17,7 @@ package org.openapijsonschematools.codegen.generatorrunner; -import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.config.ClientOptInput; import java.io.File; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java index b8d77fec39e..1de78f3ad3f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java @@ -27,9 +27,10 @@ import io.swagger.v3.oas.models.parameters.Parameter; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.generators.models.CliOption; import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; +import org.openapijsonschematools.codegen.generators.models.VendorExtension; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenPatternInfo; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; import org.openapijsonschematools.codegen.generators.features.DocumentationProviderFeatures; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java index 5fbdacce10f..f3bcbc945a8 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java @@ -22,7 +22,7 @@ import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.generators.models.CliOption; import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenOperation; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java index 45f651df137..58b0e9a8f5b 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java @@ -20,7 +20,7 @@ import io.swagger.v3.oas.models.media.Schema; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.generators.models.CliOption; import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorLanguage; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenPatternInfo; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java index f772ba9029f..ec549f6363d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java @@ -33,7 +33,7 @@ import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; -import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.generators.models.CliOption; import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.config.GlobalSettings; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorLanguage; @@ -47,6 +47,7 @@ import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.SecurityFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.WireFormatFeature; +import org.openapijsonschematools.codegen.generators.models.VendorExtension; import org.openapijsonschematools.codegen.generators.openapimodels.ArrayListWithContext; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenCallback; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenDiscriminator; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java index 7f3cd779e69..303c61d4401 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java @@ -34,8 +34,9 @@ import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorLanguage; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; +import org.openapijsonschematools.codegen.generators.models.VendorExtension; import org.openapijsonschematools.codegen.templating.SupportingFile; -import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.generators.models.CliOption; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenHeader; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenKey; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenOperation; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index 5849e043d74..1981961e5c4 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -18,9 +18,10 @@ package org.openapijsonschematools.codegen.generators; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.generators.models.CliOption; import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; +import org.openapijsonschematools.codegen.generators.models.VendorExtension; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; import org.openapijsonschematools.codegen.templating.SupportingFile; import org.openapijsonschematools.codegen.generators.features.BeanValidationFeatures; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java index 33fe1820a23..4200f67c4cc 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java @@ -18,7 +18,7 @@ package org.openapijsonschematools.codegen.generators; import org.apache.commons.lang3.StringUtils; -import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.generators.models.CliOption; import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; import org.openapijsonschematools.codegen.templating.SupportingFile; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java index 34370585aa7..42a3cfa6759 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java @@ -25,7 +25,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.generators.models.CliOption; import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java index a8d557eecf9..94ad7122d5e 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java @@ -23,7 +23,7 @@ import io.swagger.v3.oas.models.OpenAPI; import org.apache.commons.io.FileUtils; -import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.generators.models.CliOption; import org.openapijsonschematools.codegen.common.CodegenConstants; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; import org.openapijsonschematools.codegen.generators.generatormetadata.features.ComponentsFeature; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/CliOption.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/models/CliOption.java similarity index 98% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/CliOption.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/models/CliOption.java index 83bf9f4d7b0..547e9029bfa 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/cli/CliOption.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/models/CliOption.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.cli; +package org.openapijsonschematools.codegen.generators.models; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.parser.util.SchemaTypeUtil; diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/VendorExtension.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/models/VendorExtension.java similarity index 97% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/VendorExtension.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/models/VendorExtension.java index 6f99c23bacc..3a570ad8b2f 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/VendorExtension.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/models/VendorExtension.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.generators; +package org.openapijsonschematools.codegen.generators.models; import java.util.Collections; import java.util.List; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java index 14fe490a607..a8b260efb23 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java @@ -18,7 +18,7 @@ package org.openapijsonschematools.codegen; import io.swagger.v3.oas.models.OpenAPI; -import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.config.ClientOptInput; import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; import org.openapijsonschematools.codegen.generators.Generator; import org.openapijsonschematools.codegen.testutils.AssertFile; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java index b07291994e6..b61157e6c6f 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java @@ -15,7 +15,7 @@ */ package org.openapijsonschematools.codegen; -import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.config.ClientOptInput; import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; import org.openapijsonschematools.codegen.generatorrunner.GeneratorRunner; import org.openapijsonschematools.codegen.generators.DefaultGenerator; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java index 8b9936178e4..9ed4a0d7440 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java @@ -12,7 +12,7 @@ import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.responses.ApiResponses; import org.openapijsonschematools.codegen.TestUtils; -import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.config.ClientOptInput; import org.openapijsonschematools.codegen.generators.DefaultGenerator; import org.openapijsonschematools.codegen.generators.Generator; import org.openapijsonschematools.codegen.common.CodegenConstants; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java index d898c410643..e9ddd6525c7 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java @@ -21,7 +21,7 @@ import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.media.*; import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; -import org.openapijsonschematools.codegen.cli.ClientOptInput; +import org.openapijsonschematools.codegen.config.ClientOptInput; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; import org.openapijsonschematools.codegen.TestUtils; import org.openapijsonschematools.codegen.config.CodegenConfigurator; diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/AbstractOptionsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/AbstractOptionsTest.java index 625e56d72d1..5744f7356e8 100644 --- a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/AbstractOptionsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/AbstractOptionsTest.java @@ -20,7 +20,7 @@ import com.google.common.base.Function; import org.apache.commons.lang3.StringUtils; import org.mockito.MockSettings; -import org.openapijsonschematools.codegen.cli.CliOption; +import org.openapijsonschematools.codegen.generators.models.CliOption; import org.openapijsonschematools.codegen.generators.Generator; import org.testng.Assert; import org.testng.annotations.Test; From 65edc16184f595b2e48f9a846af2cda4b3016b8c Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 13:23:28 -0700 Subject: [PATCH 17/43] Refactors cli into clicommands module --- .../codegen/OpenAPIGenerator.java | 37 ++-- .../AbstractCommand.java} | 6 +- .../{cmd => clicommands}/AuthorTemplate.java | 4 +- .../Completion.java} | 4 +- .../{cmd => clicommands}/ConfigHelp.java | 4 +- .../{cmd => clicommands}/Generate.java | 4 +- .../{cmd => clicommands}/GenerateBatch.java | 4 +- .../Help.java} | 7 +- .../{cmd => clicommands}/ListGenerators.java | 4 +- .../codegen/{cmd => clicommands}/Meta.java | 4 +- .../{cmd => clicommands}/Validate.java | 4 +- .../codegen/{cmd => clicommands}/Version.java | 4 +- .../common}/BuildInfo.java | 4 +- .../{ => clicommands/common}/Constants.java | 2 +- .../common}/GlobalOptions.java | 2 +- .../AuthorTemplateTest.java | 4 +- .../GenerateBatchTest.java | 2 +- .../{cmd => clicommands}/GenerateTest.java | 2 +- .../utils/OptionUtilsTest.java | 2 +- .../codegen/DefaultGeneratorRunner.java | 198 ++++++++++++++++++ ...onschematools.codegen.generators.Generator | 1 + src/main/resources/default/api.mustache | 28 +++ src/main/resources/default/model.mustache | 1 + src/main/resources/default/myFile.mustache | 1 + .../codegen/DefaultGeneratorRunnerTest.java | 36 ++++ 25 files changed, 318 insertions(+), 51 deletions(-) rename modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/{cmd/OpenApiGeneratorCommand.java => clicommands/AbstractCommand.java} (74%) rename modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/{cmd => clicommands}/AuthorTemplate.java (98%) rename modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/{cmd/CompletionCommand.java => clicommands/Completion.java} (97%) rename modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/{cmd => clicommands}/ConfigHelp.java (99%) rename modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/{cmd => clicommands}/Generate.java (99%) rename modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/{cmd => clicommands}/GenerateBatch.java (99%) rename modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/{cmd/HelpCommand.java => clicommands/Help.java} (60%) rename modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/{cmd => clicommands}/ListGenerators.java (97%) rename modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/{cmd => clicommands}/Meta.java (98%) rename modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/{cmd => clicommands}/Validate.java (97%) rename modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/{cmd => clicommands}/Version.java (93%) rename modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/{cmd => clicommands/common}/BuildInfo.java (95%) rename modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/{ => clicommands/common}/Constants.java (83%) rename modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/{cmd => clicommands/common}/GlobalOptions.java (85%) rename modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/{cmd => clicommands}/AuthorTemplateTest.java (96%) rename modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/{cmd => clicommands}/GenerateBatchTest.java (98%) rename modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/{cmd => clicommands}/GenerateTest.java (99%) rename modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/{cmd => clicommands}/utils/OptionUtilsTest.java (97%) create mode 100644 src/main/java/org/openapijsonschematools/codegen/DefaultGeneratorRunner.java create mode 100644 src/main/resources/META-INF/services/org.openapijsonschematools.codegen.generators.Generator create mode 100644 src/main/resources/default/api.mustache create mode 100644 src/main/resources/default/model.mustache create mode 100644 src/main/resources/default/myFile.mustache create mode 100644 src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorRunnerTest.java diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java index 4393c8878ef..49bf96f5e49 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java @@ -21,18 +21,19 @@ import io.airlift.airline.ParseArgumentsUnexpectedException; import io.airlift.airline.ParseOptionMissingException; import io.airlift.airline.ParseOptionMissingValueException; -import org.openapijsonschematools.codegen.cmd.AuthorTemplate; -import org.openapijsonschematools.codegen.cmd.BuildInfo; -import org.openapijsonschematools.codegen.cmd.CompletionCommand; -import org.openapijsonschematools.codegen.cmd.ConfigHelp; -import org.openapijsonschematools.codegen.cmd.Generate; -import org.openapijsonschematools.codegen.cmd.GenerateBatch; -import org.openapijsonschematools.codegen.cmd.HelpCommand; -import org.openapijsonschematools.codegen.cmd.ListGenerators; -import org.openapijsonschematools.codegen.cmd.Meta; -import org.openapijsonschematools.codegen.cmd.OpenApiGeneratorCommand; -import org.openapijsonschematools.codegen.cmd.Validate; -import org.openapijsonschematools.codegen.cmd.Version; +import org.openapijsonschematools.codegen.clicommands.AuthorTemplate; +import org.openapijsonschematools.codegen.clicommands.common.BuildInfo; +import org.openapijsonschematools.codegen.clicommands.Completion; +import org.openapijsonschematools.codegen.clicommands.ConfigHelp; +import org.openapijsonschematools.codegen.clicommands.Generate; +import org.openapijsonschematools.codegen.clicommands.GenerateBatch; +import org.openapijsonschematools.codegen.clicommands.Help; +import org.openapijsonschematools.codegen.clicommands.ListGenerators; +import org.openapijsonschematools.codegen.clicommands.Meta; +import org.openapijsonschematools.codegen.clicommands.AbstractCommand; +import org.openapijsonschematools.codegen.clicommands.Validate; +import org.openapijsonschematools.codegen.clicommands.Version; +import org.openapijsonschematools.codegen.clicommands.common.Constants; import java.util.Locale; @@ -45,30 +46,30 @@ public class OpenAPIGenerator { public static void main(String[] args) { BuildInfo buildInfo = new BuildInfo(); - Cli.CliBuilder builder = - Cli.builder(Constants.CLI_NAME) + Cli.CliBuilder builder = + Cli.builder(Constants.CLI_NAME) .withDescription( String.format( Locale.ROOT, "OpenAPI JSON Schema GeneratorRunner CLI %s (%s).", buildInfo.getVersion(), buildInfo.getSha())) - .withDefaultCommand(HelpCommand.class) + .withDefaultCommand(Help.class) .withCommands( ListGenerators.class, Generate.class, Meta.class, - HelpCommand.class, + Help.class, ConfigHelp.class, Validate.class, Version.class, - CompletionCommand.class, + Completion.class, GenerateBatch.class ); builder.withGroup("author") .withDescription("Utilities for authoring generators or customizing templates.") - .withDefaultCommand(HelpCommand.class) + .withDefaultCommand(Help.class) .withCommands(AuthorTemplate.class); try { diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/OpenApiGeneratorCommand.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/AbstractCommand.java similarity index 74% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/OpenApiGeneratorCommand.java rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/AbstractCommand.java index 0a44803ee14..40bb4c406d7 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/OpenApiGeneratorCommand.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/AbstractCommand.java @@ -1,12 +1,14 @@ -package org.openapijsonschematools.codegen.cmd; +package org.openapijsonschematools.codegen.clicommands; import io.airlift.airline.Help; import io.airlift.airline.model.GlobalMetadata; +import org.openapijsonschematools.codegen.clicommands.common.BuildInfo; +import org.openapijsonschematools.codegen.clicommands.common.GlobalOptions; import javax.inject.Inject; @SuppressWarnings({"java:S106"}) -public abstract class OpenApiGeneratorCommand implements Runnable { +public abstract class AbstractCommand implements Runnable { @Inject public GlobalOptions globalOptions = new GlobalOptions(); diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplate.java similarity index 98% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplate.java index 3a40e3e1014..1c1c95fa7a2 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/AuthorTemplate.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplate.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.cmd; +package org.openapijsonschematools.codegen.clicommands; import io.airlift.airline.Command; import io.airlift.airline.Option; @@ -21,7 +21,7 @@ @SuppressWarnings({"FieldMayBeFinal", "FieldCanBeLocal", "unused"}) @Command(name = "template", description = "Retrieve templates for local modification") -public class AuthorTemplate extends OpenApiGeneratorCommand { +public class AuthorTemplate extends AbstractCommand { private final Logger LOGGER = LoggerFactory.getLogger(AuthorTemplate.class); diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/CompletionCommand.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Completion.java similarity index 97% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/CompletionCommand.java rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Completion.java index 08663e7fda8..c1565bfed18 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/CompletionCommand.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Completion.java @@ -19,7 +19,7 @@ * https://github.com/airlift/airline/blob/fc7a55e34b6361cb97235de5a1b21cba9b508f4b/src/main/java/io/airlift/airline/SuggestCommand.java#L1 * Modifications have been made to fit the needs of OpenAPI Tools CLI. */ -package org.openapijsonschematools.codegen.cmd; +package org.openapijsonschematools.codegen.clicommands; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; @@ -38,7 +38,7 @@ @SuppressWarnings({"java:S106"}) @Command(name = "completion", description = "Complete commands (for using in tooling such as Bash Completions).", hidden = true) -public class CompletionCommand extends OpenApiGeneratorCommand +public class Completion extends AbstractCommand implements Runnable, Callable { private static final Map> BUILTIN_SUGGESTERS = ImmutableMap.>builder() .put(Context.GLOBAL, GlobalSuggester.class) diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java similarity index 99% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java index 1ec222c6ecd..5e1fc82fe95 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ConfigHelp.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.cmd; +package org.openapijsonschematools.codegen.clicommands; import io.airlift.airline.Command; import io.airlift.airline.Option; @@ -42,7 +42,7 @@ @SuppressWarnings({"unused","java:S106", "java:S1192"}) @Command(name = "config-help", description = "Config help for chosen lang") -public class ConfigHelp extends OpenApiGeneratorCommand { +public class ConfigHelp extends AbstractCommand { private final Logger LOGGER = LoggerFactory.getLogger(ConfigHelp.class); diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java similarity index 99% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java index e3e121a5aaf..b26632da0f1 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.cmd; +package org.openapijsonschematools.codegen.clicommands; import static org.apache.commons.lang3.StringUtils.isNotEmpty; @@ -41,7 +41,7 @@ @SuppressWarnings({"java:S106"}) @Command(name = "generate", description = "Generate code with the specified generatorRunner.") -public class Generate extends OpenApiGeneratorCommand { +public class Generate extends AbstractCommand { CodegenConfigurator configurator; GeneratorRunner generatorRunner; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java similarity index 99% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java index 770fd5ff8a5..9ac1de2725b 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GenerateBatch.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.cmd; +package org.openapijsonschematools.codegen.clicommands; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.LoggerContext; @@ -58,7 +58,7 @@ @SuppressWarnings({"unused", "MismatchedQueryAndUpdateOfCollection", "java:S106"}) @Command(name = "batch", description = "Generate code in batch via external configs.") -public class GenerateBatch extends OpenApiGeneratorCommand { +public class GenerateBatch extends AbstractCommand { private static AtomicInteger failures = new AtomicInteger(0); private static AtomicInteger successes = new AtomicInteger(0); private final Logger LOGGER = LoggerFactory.getLogger(GenerateBatch.class); diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/HelpCommand.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Help.java similarity index 60% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/HelpCommand.java rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Help.java index f690f9a463a..c8688acd16c 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/HelpCommand.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Help.java @@ -1,15 +1,14 @@ -package org.openapijsonschematools.codegen.cmd; +package org.openapijsonschematools.codegen.clicommands; import io.airlift.airline.Command; -import io.airlift.airline.Help; import javax.inject.Inject; @Command(name = "help", description = "Display help information about openapi-generatorRunner") -public class HelpCommand extends OpenApiGeneratorCommand { +public class Help extends AbstractCommand { @Inject - public Help help; + public io.airlift.airline.Help help; @Override public void execute() { diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/ListGenerators.java similarity index 97% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/ListGenerators.java index 3f932bfff8d..ec7fb412d53 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/ListGenerators.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/ListGenerators.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.cmd; +package org.openapijsonschematools.codegen.clicommands; import com.google.common.base.Objects; @@ -18,7 +18,7 @@ // NOTE: List can later have subcommands such as list languages, list types, list frameworks, etc. @SuppressWarnings({"java:S106"}) @Command(name = "list", description = "Lists the available generators") -public class ListGenerators extends OpenApiGeneratorCommand { +public class ListGenerators extends AbstractCommand { @Option(name = {"-s", "--short" }, description = "shortened output (suitable for scripting)") private Boolean shortened = false; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Meta.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Meta.java similarity index 98% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Meta.java rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Meta.java index 3ad034f0d01..32d76cc7f95 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Meta.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Meta.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.cmd; +package org.openapijsonschematools.codegen.clicommands; import static ch.lambdaj.collection.LambdaCollections.with; import static com.google.common.base.Joiner.on; @@ -52,7 +52,7 @@ @Command(name = "meta", description = "MetaGenerator. GeneratorRunner for creating a new template set " + "and configuration for Codegen. The output will be based on the language you " + "specify, and includes default templates to include.") -public class Meta extends OpenApiGeneratorCommand { +public class Meta extends AbstractCommand { private static final Logger LOGGER = LoggerFactory.getLogger(Meta.class); diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Validate.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Validate.java similarity index 97% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Validate.java rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Validate.java index 6ce714eaa14..8254e98752e 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Validate.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Validate.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.cmd; +package org.openapijsonschematools.codegen.clicommands; import io.airlift.airline.Command; import io.airlift.airline.Option; @@ -35,7 +35,7 @@ @SuppressWarnings({"unused","java:S106"}) @Command(name = "validate", description = "Validate specification") -public class Validate extends OpenApiGeneratorCommand { +public class Validate extends AbstractCommand { @Option(name = {"-i", "--input-spec"}, title = "spec file", required = true, description = "location of the OpenAPI spec, as URL or file (required)") diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Version.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Version.java similarity index 93% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Version.java rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Version.java index 7228f8c22d8..7d5baee9ceb 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Version.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Version.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.cmd; +package org.openapijsonschematools.codegen.clicommands; import io.airlift.airline.Command; import io.airlift.airline.Option; @SuppressWarnings({"unused", "java:S106"}) @Command(name = "version", description = "Show version information used in tooling") -public class Version extends OpenApiGeneratorCommand { +public class Version extends AbstractCommand { @Option(name = {"--sha"}, description = "Git commit SHA version") private Boolean sha; diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/BuildInfo.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/common/BuildInfo.java similarity index 95% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/BuildInfo.java rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/common/BuildInfo.java index 3f7d56a70ee..5b6ada0fedb 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/BuildInfo.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/common/BuildInfo.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.cmd; +package org.openapijsonschematools.codegen.clicommands.common; import java.io.IOException; import java.io.InputStream; @@ -9,7 +9,7 @@ import java.util.Locale; import java.util.Properties; -import static org.openapijsonschematools.codegen.Constants.*; +import static org.openapijsonschematools.codegen.clicommands.common.Constants.*; /** * Presents build-time information diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/Constants.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/common/Constants.java similarity index 83% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/Constants.java rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/common/Constants.java index 0049af363bb..d9137be5b87 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/Constants.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/common/Constants.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen; +package org.openapijsonschematools.codegen.clicommands.common; public class Constants { private Constants(){ } diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GlobalOptions.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/common/GlobalOptions.java similarity index 85% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GlobalOptions.java rename to modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/common/GlobalOptions.java index 4290172bcdd..2d3267b1998 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/GlobalOptions.java +++ b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/common/GlobalOptions.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.cmd; +package org.openapijsonschematools.codegen.clicommands.common; import io.airlift.airline.Option; diff --git a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/AuthorTemplateTest.java b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplateTest.java similarity index 96% rename from modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/AuthorTemplateTest.java rename to modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplateTest.java index 86d18441caf..2d07470f8df 100644 --- a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/AuthorTemplateTest.java +++ b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplateTest.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.cmd; +package org.openapijsonschematools.codegen.clicommands; import io.airlift.airline.Cli; import org.testng.Assert; @@ -62,7 +62,7 @@ private Cli.CliBuilder createBuilder(){ builder.withGroup("author") .withDescription("Utilities for authoring generators or customizing templates.") - .withDefaultCommand(HelpCommand.class) + .withDefaultCommand(Help.class) .withCommands(AuthorTemplate.class); return builder; diff --git a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateBatchTest.java b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateBatchTest.java similarity index 98% rename from modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateBatchTest.java rename to modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateBatchTest.java index 88d4af49128..05225a8d92d 100644 --- a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateBatchTest.java +++ b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateBatchTest.java @@ -1,4 +1,4 @@ -package org.openapijsonschematools.codegen.cmd; +package org.openapijsonschematools.codegen.clicommands; import com.fasterxml.jackson.databind.module.SimpleModule; import org.openapijsonschematools.codegen.config.CodegenConfigurator; diff --git a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateTest.java b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateTest.java similarity index 99% rename from modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateTest.java rename to modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateTest.java index 323512abd5b..cd1c916936c 100644 --- a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/GenerateTest.java +++ b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.cmd; +package org.openapijsonschematools.codegen.clicommands; import io.airlift.airline.Cli; import org.apache.commons.lang3.ArrayUtils; diff --git a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/utils/OptionUtilsTest.java b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/utils/OptionUtilsTest.java similarity index 97% rename from modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/utils/OptionUtilsTest.java rename to modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/utils/OptionUtilsTest.java index 406fdefc1d3..458b1026c64 100644 --- a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/cmd/utils/OptionUtilsTest.java +++ b/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/utils/OptionUtilsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.cmd.utils; +package org.openapijsonschematools.codegen.clicommands.utils; import org.openapijsonschematools.codegen.common.OptionUtils; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/org/openapijsonschematools/codegen/DefaultGeneratorRunner.java b/src/main/java/org/openapijsonschematools/codegen/DefaultGeneratorRunner.java new file mode 100644 index 00000000000..52823d5908a --- /dev/null +++ b/src/main/java/org/openapijsonschematools/codegen/DefaultGeneratorRunner.java @@ -0,0 +1,198 @@ +package org.openapijsonschematools.codegen; + +import org.openapijsonschematools.codegen.*; +import org.openapijsonschematools.codegen.openapimodels.*; +import io.swagger.models.properties.*; + +import java.util.*; +import java.io.File; + +public class DefaultGeneratorRunner extends DefaultCodegen implements CodegenConfig { + + // source folder where to write the files + protected String sourceFolder = "src"; + protected String apiVersion = "1.0.0"; + + /** + * Configures the type of generator. + * + * @return the CodegenType for this generator + * @see CodegenType + */ + public CodegenType getTag() { + return CodegenType.OTHER; + } + + /** + * Configures a friendly name for the generator. This will be used by the generator + * to select the library with the -g flag. + * + * @return the friendly name for the generator + */ + public String getName() { + return "default"; + } + + /** + * Provides an opportunity to inspect and modify operation data before the code is generated. + */ + @Override + public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List allModels) { + + // to try debugging your code generator: + // set a break point on the next line. + // then debug the JUnit test called LaunchGeneratorInDebugger + + OperationsMap results = super.postProcessOperationsWithModels(objs, allModels); + + OperationMap ops = results.getOperations(); + List opList = ops.getOperation(); + + // iterate over the operation and perhaps modify something + for(CodegenOperation co : opList){ + // example: + // co.httpMethod = co.httpMethod.toLowerCase(); + } + + return results; + } + + /** + * Returns human-friendly help for the generator. Provide the consumer with help + * tips, parameters here + * + * @return A string value for the help message + */ + public String getHelp() { + return "Generates a default client library."; + } + + public DefaultGeneratorRunner() { + super(); + + // set the output folder here + outputFolder = "generated-code/default"; + + /** + * Models. You can write model files using the modelTemplateFiles map. + * if you want to create one template for file, you can do so here. + * for multiple files for model, just put another entry in the `modelTemplateFiles` with + * a different extension + */ + modelTemplateFiles.put( + "model.mustache", // the template to use + ".sample"); // the extension for each file to write + + /** + * Api classes. You can write classes for each Api file with the apiTemplateFiles map. + * as with models, add multiple entries with different extensions for multiple files per + * class + */ + apiTemplateFiles.put( + "api.mustache", // the template to use + ".sample"); // the extension for each file to write + + /** + * Template Location. This is the location which templates will be read from. The generator + * will use the resource stream to attempt to read the templates. + */ + templateDir = "default"; + + /** + * Api Package. Optional, if needed, this can be used in templates + */ + apiPackage = "org.openapijsonschematools.api"; + + /** + * Model Package. Optional, if needed, this can be used in templates + */ + modelPackage = "org.openapijsonschematools.model"; + + /** + * Reserved words. Override this with reserved words specific to your language + */ + reservedWords = new HashSet ( + Arrays.asList( + "sample1", // replace with static values + "sample2") + ); + + /** + * Additional Properties. These values can be passed to the templates and + * are available in models, apis, and supporting files + */ + additionalProperties.put("apiVersion", apiVersion); + + /** + * Supporting Files. You can write single files for the generator with the + * entire object tree available. If the input file has a suffix of `.mustache + * it will be processed by the template engine. Otherwise, it will be copied + */ + supportingFiles.add(new SupportingFile("myFile.mustache", // the input template or file + "", // the destination folder, relative `outputFolder` + "myFile.sample") // the output file + ); + + /** + * Language Specific Primitives. These types will not trigger imports by + * the client generator + */ + languageSpecificPrimitives = new HashSet( + Arrays.asList( + "Type1", // replace these with your types + "Type2") + ); + } + + /** + * Escapes a reserved word as defined in the `reservedWords` array. Handle escaping + * those terms here. This logic is only called if a variable matches the reserved words + * + * @return the escaped term + */ + @Override + public String escapeReservedWord(String name) { + return "_" + name; // add an underscore to the name + } + + /** + * Location to write model files. You can use the modelPackage() as defined when the class is + * instantiated + */ + public String modelFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); + } + + /** + * Location to write api files. You can use the apiPackage() as defined when the class is + * instantiated + */ + @Override + public String apiFileFolder() { + return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); + } + + /** + * override with any special text escaping logic to handle unsafe + * characters so as to avoid code injection + * + * @param input String to be cleaned up + * @return string with unsafe characters removed or escaped + */ + @Override + public String escapeUnsafeCharacters(String input) { + //TODO: check that this logic is safe to escape unsafe characters to avoid code injection + return input; + } + + /** + * Escape single and/or double quote to avoid code injection + * + * @param input String to be cleaned up + * @return string with quotation mark removed or escaped + */ + public String escapeQuotationMark(String input) { + //TODO: check that this logic is safe to escape quotation mark to avoid code injection + return input.replace("\"", "\\\""); + } +} diff --git a/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.generators.Generator b/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.generators.Generator new file mode 100644 index 00000000000..16e410af479 --- /dev/null +++ b/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.generators.Generator @@ -0,0 +1 @@ +org.openapijsonschematools.codegen.DefaultGeneratorRunner \ No newline at end of file diff --git a/src/main/resources/default/api.mustache b/src/main/resources/default/api.mustache new file mode 100644 index 00000000000..d61bde58c9d --- /dev/null +++ b/src/main/resources/default/api.mustache @@ -0,0 +1,28 @@ + +# This is a sample api mustache template. It is representing a fictitious +# language and won't be usable or compile to anything without lots of changes. +# Use it as an example. You can access the variables in the generator object +# like such: + +# use the package from the `apiPackage` variable +package: {{package}} + +# operations block +{{#operations}} +classname: {{classname}} + +# loop over each operation in the API: +{{#operation}} + +# each operation has an `operationId`: +operationId: {{operationId}} + +# and parameters: +{{#allParams}} +{{paramName}}: {{dataType}} +{{/allParams}} + +{{/operation}} + +# end of operations block +{{/operations}} \ No newline at end of file diff --git a/src/main/resources/default/model.mustache b/src/main/resources/default/model.mustache new file mode 100644 index 00000000000..143f30f5be0 --- /dev/null +++ b/src/main/resources/default/model.mustache @@ -0,0 +1 @@ +# This is a sample model mustache template. \ No newline at end of file diff --git a/src/main/resources/default/myFile.mustache b/src/main/resources/default/myFile.mustache new file mode 100644 index 00000000000..6421ab03f86 --- /dev/null +++ b/src/main/resources/default/myFile.mustache @@ -0,0 +1 @@ +# This is a sample supporting file mustache template. \ No newline at end of file diff --git a/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorRunnerTest.java b/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorRunnerTest.java new file mode 100644 index 00000000000..c71ca58dd3b --- /dev/null +++ b/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorRunnerTest.java @@ -0,0 +1,36 @@ +package org.openapijsonschematools.codegen; + +import org.junit.Test; +import ClientOptInput; +import DefaultGenerator; +import CodegenConfigurator; + +/*** + * This test allows you to easily launch your code generation software under a debugger. + * Then run this test under debug mode. You will be able to step through your java code + * and then see the results in the out directory. + * + * To experiment with debugging your code generator: + * 1) Set a break point in DefaultGeneratorRunner.java in the postProcessOperationsWithModels() method. + * 2) To launch this test in Eclipse: right-click | Debug As | JUnit Test + * + */ +public class DefaultGeneratorRunnerTest { + + // use this test to launch you code generator in the debugger. + // this allows you to easily set break points in MyclientcodegenGenerator. + @Test + public void launchCodeGenerator() { + // to understand how the 'openapi-generator-cli' module is using 'CodegenConfigurator', have a look at the 'Generate' class: + // https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java + final CodegenConfigurator configurator = new CodegenConfigurator() + .setGeneratorName("default") // use this codegen library + .setInputSpec("../../../modules/openapi-generator/src/test/resources/2_0/petstore.yaml") // sample OpenAPI file + // .setInputSpec("https://raw.githubusercontent.com/openapi-json-schema-tools/openapi-json-schema-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml") // or from the server + .setOutputDir("out/default"); // output directory + + final ClientOptInput clientOptInput = configurator.toClientOptInput(); + DefaultGenerator generator = new DefaultGenerator(); + generator.opts(clientOptInput).generate(); + } +} \ No newline at end of file From b7a6ccd2b11a09fc015114cc6c3b1019d206ece0 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 14:20:49 -0700 Subject: [PATCH 18/43] Collapses cli module into remaining module --- .../Dockerfile | 9 - .../openapi-json-schema-generator-cli/pom.xml | 157 -------------- .../clicommands/common/GlobalOptions.java | 13 -- modules/openapi-json-schema-generator/pom.xml | 16 ++ .../codegen/OpenAPIGenerator.java | 0 .../codegen/clicommands/AbstractCommand.java | 0 .../codegen/clicommands/AuthorTemplate.java | 0 .../codegen/clicommands/Completion.java | 2 +- .../codegen/clicommands/ConfigHelp.java | 0 .../codegen/clicommands/Generate.java | 0 .../codegen/clicommands/GenerateBatch.java | 0 .../codegen/clicommands/Help.java | 0 .../codegen/clicommands/ListGenerators.java | 0 .../codegen/clicommands/Meta.java | 4 +- .../codegen/clicommands/Validate.java | 0 .../codegen/clicommands/Version.java | 0 .../codegen/clicommands/common/BuildInfo.java | 0 .../codegen/clicommands/common/Constants.java | 0 .../clicommands/common/GlobalOptions.java | 12 ++ .../src/main/resources/logback.xml | 0 .../clicommands/AuthorTemplateTest.java | 2 + .../clicommands/GenerateBatchTest.java | 1 + .../codegen/clicommands/GenerateTest.java | 1 + .../codegen/clicommands}/OptionUtilsTest.java | 2 +- .../batch/common/jaxrs-datelib-j8.json | 0 .../batch/common/jaxrs-datelib-j8.yaml | 0 .../batch/jaxrs-datelib-j8-double.json | 0 .../batch/jaxrs-datelib-j8-double.yaml | 0 .../batch/jaxrs-datelib-j8-json-include.yaml | 0 ...elib-j8-nested-include-property-merge.yaml | 0 .../jaxrs-datelib-j8-nested-include.json | 0 .../jaxrs-datelib-j8-nested-include.yaml | 0 ...axrs-datelib-j8-nested-property-merge.yaml | 0 .../batch/jaxrs-datelib-j8-nested.json | 0 .../batch/jaxrs-datelib-j8-nested.yaml | 0 .../batch/jaxrs-datelib-j8-yaml-include.json | 0 .../resources/batch/jaxrs-datelib-j8.json | 0 .../resources/batch/jaxrs-datelib-j8.yaml | 0 .../test/resources/batch/specs/petstore.yaml | 0 .../src/test/resources/logback.xml | 94 +++++++++ .../test/resources/npe-test-spec-file.yaml | 0 .../src/test/resources/npe-test.yaml | 0 .../src/test/resources/swagger.yaml | 0 pom.xml | 1 - .../codegen/DefaultGeneratorRunner.java | 198 ------------------ ...onschematools.codegen.generators.Generator | 1 - src/main/resources/default/api.mustache | 28 --- src/main/resources/default/model.mustache | 1 - src/main/resources/default/myFile.mustache | 1 - .../codegen/DefaultGeneratorRunnerTest.java | 36 ---- 50 files changed, 130 insertions(+), 449 deletions(-) delete mode 100644 modules/openapi-json-schema-generator-cli/Dockerfile delete mode 100644 modules/openapi-json-schema-generator-cli/pom.xml delete mode 100644 modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/common/GlobalOptions.java rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/clicommands/AbstractCommand.java (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplate.java (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/clicommands/Completion.java (97%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/clicommands/Help.java (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/clicommands/ListGenerators.java (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/clicommands/Meta.java (98%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/clicommands/Validate.java (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/clicommands/Version.java (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/clicommands/common/BuildInfo.java (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/main/java/org/openapijsonschematools/codegen/clicommands/common/Constants.java (100%) create mode 100644 modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/common/GlobalOptions.java rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/main/resources/logback.xml (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplateTest.java (95%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateBatchTest.java (98%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateTest.java (99%) rename modules/{openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/utils => openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands}/OptionUtilsTest.java (97%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/resources/batch/common/jaxrs-datelib-j8.json (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/resources/batch/common/jaxrs-datelib-j8.yaml (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/resources/batch/jaxrs-datelib-j8-double.json (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/resources/batch/jaxrs-datelib-j8-double.yaml (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/resources/batch/jaxrs-datelib-j8-json-include.yaml (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/resources/batch/jaxrs-datelib-j8-nested-include-property-merge.yaml (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/resources/batch/jaxrs-datelib-j8-nested-include.json (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/resources/batch/jaxrs-datelib-j8-nested-include.yaml (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/resources/batch/jaxrs-datelib-j8-nested-property-merge.yaml (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/resources/batch/jaxrs-datelib-j8-nested.json (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/resources/batch/jaxrs-datelib-j8-nested.yaml (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/resources/batch/jaxrs-datelib-j8-yaml-include.json (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/resources/batch/jaxrs-datelib-j8.json (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/resources/batch/jaxrs-datelib-j8.yaml (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/resources/batch/specs/petstore.yaml (100%) create mode 100644 modules/openapi-json-schema-generator/src/test/resources/logback.xml rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/resources/npe-test-spec-file.yaml (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/resources/npe-test.yaml (100%) rename modules/{openapi-json-schema-generator-cli => openapi-json-schema-generator}/src/test/resources/swagger.yaml (100%) delete mode 100644 src/main/java/org/openapijsonschematools/codegen/DefaultGeneratorRunner.java delete mode 100644 src/main/resources/META-INF/services/org.openapijsonschematools.codegen.generators.Generator delete mode 100644 src/main/resources/default/api.mustache delete mode 100644 src/main/resources/default/model.mustache delete mode 100644 src/main/resources/default/myFile.mustache delete mode 100644 src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorRunnerTest.java diff --git a/modules/openapi-json-schema-generator-cli/Dockerfile b/modules/openapi-json-schema-generator-cli/Dockerfile deleted file mode 100644 index b4533066a0a..00000000000 --- a/modules/openapi-json-schema-generator-cli/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM openjdk:11.0-jre-buster - -ADD target/openapi-json-schema-generator-cli.jar /opt/openapi-json-schema-generator/modules/openapi-json-schema-generator-cli/target/openapi-json-schema-generator-cli.jar - -COPY docker-entrypoint.sh /usr/local/bin/ - -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD ["help"] diff --git a/modules/openapi-json-schema-generator-cli/pom.xml b/modules/openapi-json-schema-generator-cli/pom.xml deleted file mode 100644 index d47a802d896..00000000000 --- a/modules/openapi-json-schema-generator-cli/pom.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - org.openapijsonschematools - openapi-json-schema-generator-project - ${revision} - ../.. - - 4.0.0 - - openapi-json-schema-generator-cli - jar - - openapi-json-schema-generator (executable) - - - openapi-json-schema-generator-cli - - - src/main/resources - true - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - ${project.parent.basedir}${file.separator}google_checkstyle.xml - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven-jar-plugin.version} - - - - org.openapijsonschematools.codegen.OpenAPIGenerator - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.0 - - - process-resources - package - - shade - - - false - true - - ${java.io.tmpdir}/dependency-reduced-pom.xml - - - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - - - - - static-analysis - - - - com.github.spotbugs - spotbugs-maven-plugin - - ${project.parent.basedir}${file.separator}spotbugs-exclude.xml - - - - org.apache.maven.plugins - maven-pmd-plugin - - - se.bjurr.violations - violations-maven-plugin - - - - - - - - - - org.openapijsonschematools - openapi-json-schema-generator - ${project.version} - - - org.slf4j - slf4j-simple - - - - - - io.airlift - airline - 0.8 - - - com.googlecode.lambdaj - lambdaj - 2.3.3 - - - ch.qos.logback - logback-classic - 1.2.10 - - - org.codehaus.janino - janino - 3.1.0 - - - org.testng - testng - ${testng.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - - - - diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/common/GlobalOptions.java b/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/common/GlobalOptions.java deleted file mode 100644 index 2d3267b1998..00000000000 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/common/GlobalOptions.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.openapijsonschematools.codegen.clicommands.common; - -import io.airlift.airline.Option; - -import static io.airlift.airline.OptionType.GLOBAL; - -public class GlobalOptions { - @Option(type = GLOBAL, name = "--version", description = "Display full version output", hidden = true) - public boolean version; - - @Option(type = GLOBAL, name = "--help", description = "Display help about the tool", hidden = true) - public boolean help; -} diff --git a/modules/openapi-json-schema-generator/pom.xml b/modules/openapi-json-schema-generator/pom.xml index 2f061cce6e6..6d40c8f018a 100644 --- a/modules/openapi-json-schema-generator/pom.xml +++ b/modules/openapi-json-schema-generator/pom.xml @@ -427,6 +427,22 @@ 3.19.0 test + + + io.airlift + airline + 0.8 + + + com.googlecode.lambdaj + lambdaj + 2.3.3 + + + ch.qos.logback + logback-classic + 1.2.10 + diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/AbstractCommand.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/AbstractCommand.java similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/AbstractCommand.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/AbstractCommand.java diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplate.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplate.java similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplate.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplate.java diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Completion.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Completion.java similarity index 97% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Completion.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Completion.java index c1565bfed18..e30d4e782b2 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Completion.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Completion.java @@ -79,7 +79,7 @@ public Iterable generateSuggestions() { bindings.put(CommandMetadata.class, state.getCommand()); } - Suggester suggester = createInstance(suggesterMetadata.getSuggesterClass(), + Suggester suggester = ParserUtil.createInstance(suggesterMetadata.getSuggesterClass(), ImmutableList.of(), null, null, diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Help.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Help.java similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Help.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Help.java diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/ListGenerators.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/ListGenerators.java similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/ListGenerators.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/ListGenerators.java diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Meta.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Meta.java similarity index 98% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Meta.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Meta.java index 32d76cc7f95..110d8bdf643 100644 --- a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Meta.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Meta.java @@ -17,7 +17,7 @@ package org.openapijsonschematools.codegen.clicommands; -import static ch.lambdaj.collection.LambdaCollections.with; +import ch.lambdaj.collection.LambdaCollections; import static com.google.common.base.Joiner.on; import com.google.common.base.CaseFormat; @@ -126,7 +126,7 @@ public void execute() { .put("openapiGeneratorVersion", currentVersion).build(); - with(supportingFiles).convert(processFiles(targetDir, data)); + LambdaCollections.with(supportingFiles).convert(processFiles(targetDir, data)); } /** diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Validate.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Validate.java similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Validate.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Validate.java diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Version.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Version.java similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/Version.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Version.java diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/common/BuildInfo.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/common/BuildInfo.java similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/common/BuildInfo.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/common/BuildInfo.java diff --git a/modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/common/Constants.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/common/Constants.java similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/main/java/org/openapijsonschematools/codegen/clicommands/common/Constants.java rename to modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/common/Constants.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/common/GlobalOptions.java b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/common/GlobalOptions.java new file mode 100644 index 00000000000..149e9582c83 --- /dev/null +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/common/GlobalOptions.java @@ -0,0 +1,12 @@ +package org.openapijsonschematools.codegen.clicommands.common; + +import io.airlift.airline.Option; +import io.airlift.airline.OptionType; + +public class GlobalOptions { + @Option(type = OptionType.GLOBAL, name = "--version", description = "Display full version output", hidden = true) + public boolean version; + + @Option(type = OptionType.GLOBAL, name = "--help", description = "Display help about the tool", hidden = true) + public boolean help; +} diff --git a/modules/openapi-json-schema-generator-cli/src/main/resources/logback.xml b/modules/openapi-json-schema-generator/src/main/resources/logback.xml similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/main/resources/logback.xml rename to modules/openapi-json-schema-generator/src/main/resources/logback.xml diff --git a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplateTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplateTest.java similarity index 95% rename from modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplateTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplateTest.java index 2d07470f8df..017fcdad008 100644 --- a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplateTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplateTest.java @@ -1,6 +1,8 @@ package org.openapijsonschematools.codegen.clicommands; import io.airlift.airline.Cli; +import org.openapijsonschematools.codegen.clicommands.AuthorTemplate; +import org.openapijsonschematools.codegen.clicommands.Help; import org.testng.Assert; import org.testng.ITestContext; import org.testng.annotations.BeforeTest; diff --git a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateBatchTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateBatchTest.java similarity index 98% rename from modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateBatchTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateBatchTest.java index 05225a8d92d..fc6e3debe59 100644 --- a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateBatchTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateBatchTest.java @@ -1,6 +1,7 @@ package org.openapijsonschematools.codegen.clicommands; import com.fasterxml.jackson.databind.module.SimpleModule; +import org.openapijsonschematools.codegen.clicommands.GenerateBatch; import org.openapijsonschematools.codegen.config.CodegenConfigurator; import org.openapijsonschematools.codegen.config.Context; import org.openapijsonschematools.codegen.config.GeneratorSettings; diff --git a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateTest.java similarity index 99% rename from modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateTest.java index cd1c916936c..6a196fdee94 100644 --- a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateTest.java @@ -20,6 +20,7 @@ import io.airlift.airline.Cli; import org.apache.commons.lang3.ArrayUtils; import org.mockito.MockSettings; +import org.openapijsonschematools.codegen.clicommands.Generate; import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; import org.openapijsonschematools.codegen.generatorrunner.GeneratorRunner; import org.openapijsonschematools.codegen.config.CodegenConfigurator; diff --git a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/utils/OptionUtilsTest.java b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/OptionUtilsTest.java similarity index 97% rename from modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/utils/OptionUtilsTest.java rename to modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/OptionUtilsTest.java index 458b1026c64..d9673fc78ab 100644 --- a/modules/openapi-json-schema-generator-cli/src/test/java/org/openapijsonschematools/codegen/clicommands/utils/OptionUtilsTest.java +++ b/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/OptionUtilsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.openapijsonschematools.codegen.clicommands.utils; +package org.openapijsonschematools.codegen.clicommands; import org.openapijsonschematools.codegen.common.OptionUtils; import org.apache.commons.lang3.tuple.Pair; diff --git a/modules/openapi-json-schema-generator-cli/src/test/resources/batch/common/jaxrs-datelib-j8.json b/modules/openapi-json-schema-generator/src/test/resources/batch/common/jaxrs-datelib-j8.json similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/test/resources/batch/common/jaxrs-datelib-j8.json rename to modules/openapi-json-schema-generator/src/test/resources/batch/common/jaxrs-datelib-j8.json diff --git a/modules/openapi-json-schema-generator-cli/src/test/resources/batch/common/jaxrs-datelib-j8.yaml b/modules/openapi-json-schema-generator/src/test/resources/batch/common/jaxrs-datelib-j8.yaml similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/test/resources/batch/common/jaxrs-datelib-j8.yaml rename to modules/openapi-json-schema-generator/src/test/resources/batch/common/jaxrs-datelib-j8.yaml diff --git a/modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-double.json b/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-double.json similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-double.json rename to modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-double.json diff --git a/modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-double.yaml b/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-double.yaml similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-double.yaml rename to modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-double.yaml diff --git a/modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-json-include.yaml b/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-json-include.yaml similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-json-include.yaml rename to modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-json-include.yaml diff --git a/modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-nested-include-property-merge.yaml b/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested-include-property-merge.yaml similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-nested-include-property-merge.yaml rename to modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested-include-property-merge.yaml diff --git a/modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-nested-include.json b/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested-include.json similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-nested-include.json rename to modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested-include.json diff --git a/modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-nested-include.yaml b/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested-include.yaml similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-nested-include.yaml rename to modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested-include.yaml diff --git a/modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-nested-property-merge.yaml b/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested-property-merge.yaml similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-nested-property-merge.yaml rename to modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested-property-merge.yaml diff --git a/modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-nested.json b/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested.json similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-nested.json rename to modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested.json diff --git a/modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-nested.yaml b/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested.yaml similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-nested.yaml rename to modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested.yaml diff --git a/modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-yaml-include.json b/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-yaml-include.json similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8-yaml-include.json rename to modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-yaml-include.json diff --git a/modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8.json b/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8.json similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8.json rename to modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8.json diff --git a/modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8.yaml b/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8.yaml similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/test/resources/batch/jaxrs-datelib-j8.yaml rename to modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8.yaml diff --git a/modules/openapi-json-schema-generator-cli/src/test/resources/batch/specs/petstore.yaml b/modules/openapi-json-schema-generator/src/test/resources/batch/specs/petstore.yaml similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/test/resources/batch/specs/petstore.yaml rename to modules/openapi-json-schema-generator/src/test/resources/batch/specs/petstore.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/logback.xml b/modules/openapi-json-schema-generator/src/test/resources/logback.xml new file mode 100644 index 00000000000..f6a72cfc9d8 --- /dev/null +++ b/modules/openapi-json-schema-generator/src/test/resources/logback.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + System.out + + ${noColorPattern} + + + ERROR + DENY + NEUTRAL + + + + System.err + + ${noColorPattern} + + + ERROR + + + + System.out + true + + ${colorPattern} + + + ERROR + DENY + NEUTRAL + + + + System.err + true + + ${colorPattern} + + + ERROR + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/openapi-json-schema-generator-cli/src/test/resources/npe-test-spec-file.yaml b/modules/openapi-json-schema-generator/src/test/resources/npe-test-spec-file.yaml similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/test/resources/npe-test-spec-file.yaml rename to modules/openapi-json-schema-generator/src/test/resources/npe-test-spec-file.yaml diff --git a/modules/openapi-json-schema-generator-cli/src/test/resources/npe-test.yaml b/modules/openapi-json-schema-generator/src/test/resources/npe-test.yaml similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/test/resources/npe-test.yaml rename to modules/openapi-json-schema-generator/src/test/resources/npe-test.yaml diff --git a/modules/openapi-json-schema-generator-cli/src/test/resources/swagger.yaml b/modules/openapi-json-schema-generator/src/test/resources/swagger.yaml similarity index 100% rename from modules/openapi-json-schema-generator-cli/src/test/resources/swagger.yaml rename to modules/openapi-json-schema-generator/src/test/resources/swagger.yaml diff --git a/pom.xml b/pom.xml index 2d93bd91b4a..55f416d5a15 100644 --- a/pom.xml +++ b/pom.xml @@ -1198,7 +1198,6 @@ modules/openapi-json-schema-generator - modules/openapi-json-schema-generator-cli diff --git a/src/main/java/org/openapijsonschematools/codegen/DefaultGeneratorRunner.java b/src/main/java/org/openapijsonschematools/codegen/DefaultGeneratorRunner.java deleted file mode 100644 index 52823d5908a..00000000000 --- a/src/main/java/org/openapijsonschematools/codegen/DefaultGeneratorRunner.java +++ /dev/null @@ -1,198 +0,0 @@ -package org.openapijsonschematools.codegen; - -import org.openapijsonschematools.codegen.*; -import org.openapijsonschematools.codegen.openapimodels.*; -import io.swagger.models.properties.*; - -import java.util.*; -import java.io.File; - -public class DefaultGeneratorRunner extends DefaultCodegen implements CodegenConfig { - - // source folder where to write the files - protected String sourceFolder = "src"; - protected String apiVersion = "1.0.0"; - - /** - * Configures the type of generator. - * - * @return the CodegenType for this generator - * @see CodegenType - */ - public CodegenType getTag() { - return CodegenType.OTHER; - } - - /** - * Configures a friendly name for the generator. This will be used by the generator - * to select the library with the -g flag. - * - * @return the friendly name for the generator - */ - public String getName() { - return "default"; - } - - /** - * Provides an opportunity to inspect and modify operation data before the code is generated. - */ - @Override - public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List allModels) { - - // to try debugging your code generator: - // set a break point on the next line. - // then debug the JUnit test called LaunchGeneratorInDebugger - - OperationsMap results = super.postProcessOperationsWithModels(objs, allModels); - - OperationMap ops = results.getOperations(); - List opList = ops.getOperation(); - - // iterate over the operation and perhaps modify something - for(CodegenOperation co : opList){ - // example: - // co.httpMethod = co.httpMethod.toLowerCase(); - } - - return results; - } - - /** - * Returns human-friendly help for the generator. Provide the consumer with help - * tips, parameters here - * - * @return A string value for the help message - */ - public String getHelp() { - return "Generates a default client library."; - } - - public DefaultGeneratorRunner() { - super(); - - // set the output folder here - outputFolder = "generated-code/default"; - - /** - * Models. You can write model files using the modelTemplateFiles map. - * if you want to create one template for file, you can do so here. - * for multiple files for model, just put another entry in the `modelTemplateFiles` with - * a different extension - */ - modelTemplateFiles.put( - "model.mustache", // the template to use - ".sample"); // the extension for each file to write - - /** - * Api classes. You can write classes for each Api file with the apiTemplateFiles map. - * as with models, add multiple entries with different extensions for multiple files per - * class - */ - apiTemplateFiles.put( - "api.mustache", // the template to use - ".sample"); // the extension for each file to write - - /** - * Template Location. This is the location which templates will be read from. The generator - * will use the resource stream to attempt to read the templates. - */ - templateDir = "default"; - - /** - * Api Package. Optional, if needed, this can be used in templates - */ - apiPackage = "org.openapijsonschematools.api"; - - /** - * Model Package. Optional, if needed, this can be used in templates - */ - modelPackage = "org.openapijsonschematools.model"; - - /** - * Reserved words. Override this with reserved words specific to your language - */ - reservedWords = new HashSet ( - Arrays.asList( - "sample1", // replace with static values - "sample2") - ); - - /** - * Additional Properties. These values can be passed to the templates and - * are available in models, apis, and supporting files - */ - additionalProperties.put("apiVersion", apiVersion); - - /** - * Supporting Files. You can write single files for the generator with the - * entire object tree available. If the input file has a suffix of `.mustache - * it will be processed by the template engine. Otherwise, it will be copied - */ - supportingFiles.add(new SupportingFile("myFile.mustache", // the input template or file - "", // the destination folder, relative `outputFolder` - "myFile.sample") // the output file - ); - - /** - * Language Specific Primitives. These types will not trigger imports by - * the client generator - */ - languageSpecificPrimitives = new HashSet( - Arrays.asList( - "Type1", // replace these with your types - "Type2") - ); - } - - /** - * Escapes a reserved word as defined in the `reservedWords` array. Handle escaping - * those terms here. This logic is only called if a variable matches the reserved words - * - * @return the escaped term - */ - @Override - public String escapeReservedWord(String name) { - return "_" + name; // add an underscore to the name - } - - /** - * Location to write model files. You can use the modelPackage() as defined when the class is - * instantiated - */ - public String modelFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar); - } - - /** - * Location to write api files. You can use the apiPackage() as defined when the class is - * instantiated - */ - @Override - public String apiFileFolder() { - return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar); - } - - /** - * override with any special text escaping logic to handle unsafe - * characters so as to avoid code injection - * - * @param input String to be cleaned up - * @return string with unsafe characters removed or escaped - */ - @Override - public String escapeUnsafeCharacters(String input) { - //TODO: check that this logic is safe to escape unsafe characters to avoid code injection - return input; - } - - /** - * Escape single and/or double quote to avoid code injection - * - * @param input String to be cleaned up - * @return string with quotation mark removed or escaped - */ - public String escapeQuotationMark(String input) { - //TODO: check that this logic is safe to escape quotation mark to avoid code injection - return input.replace("\"", "\\\""); - } -} diff --git a/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.generators.Generator b/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.generators.Generator deleted file mode 100644 index 16e410af479..00000000000 --- a/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.generators.Generator +++ /dev/null @@ -1 +0,0 @@ -org.openapijsonschematools.codegen.DefaultGeneratorRunner \ No newline at end of file diff --git a/src/main/resources/default/api.mustache b/src/main/resources/default/api.mustache deleted file mode 100644 index d61bde58c9d..00000000000 --- a/src/main/resources/default/api.mustache +++ /dev/null @@ -1,28 +0,0 @@ - -# This is a sample api mustache template. It is representing a fictitious -# language and won't be usable or compile to anything without lots of changes. -# Use it as an example. You can access the variables in the generator object -# like such: - -# use the package from the `apiPackage` variable -package: {{package}} - -# operations block -{{#operations}} -classname: {{classname}} - -# loop over each operation in the API: -{{#operation}} - -# each operation has an `operationId`: -operationId: {{operationId}} - -# and parameters: -{{#allParams}} -{{paramName}}: {{dataType}} -{{/allParams}} - -{{/operation}} - -# end of operations block -{{/operations}} \ No newline at end of file diff --git a/src/main/resources/default/model.mustache b/src/main/resources/default/model.mustache deleted file mode 100644 index 143f30f5be0..00000000000 --- a/src/main/resources/default/model.mustache +++ /dev/null @@ -1 +0,0 @@ -# This is a sample model mustache template. \ No newline at end of file diff --git a/src/main/resources/default/myFile.mustache b/src/main/resources/default/myFile.mustache deleted file mode 100644 index 6421ab03f86..00000000000 --- a/src/main/resources/default/myFile.mustache +++ /dev/null @@ -1 +0,0 @@ -# This is a sample supporting file mustache template. \ No newline at end of file diff --git a/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorRunnerTest.java b/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorRunnerTest.java deleted file mode 100644 index c71ca58dd3b..00000000000 --- a/src/test/java/org/openapijsonschematools/codegen/DefaultGeneratorRunnerTest.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.openapijsonschematools.codegen; - -import org.junit.Test; -import ClientOptInput; -import DefaultGenerator; -import CodegenConfigurator; - -/*** - * This test allows you to easily launch your code generation software under a debugger. - * Then run this test under debug mode. You will be able to step through your java code - * and then see the results in the out directory. - * - * To experiment with debugging your code generator: - * 1) Set a break point in DefaultGeneratorRunner.java in the postProcessOperationsWithModels() method. - * 2) To launch this test in Eclipse: right-click | Debug As | JUnit Test - * - */ -public class DefaultGeneratorRunnerTest { - - // use this test to launch you code generator in the debugger. - // this allows you to easily set break points in MyclientcodegenGenerator. - @Test - public void launchCodeGenerator() { - // to understand how the 'openapi-generator-cli' module is using 'CodegenConfigurator', have a look at the 'Generate' class: - // https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-cli/src/main/java/org/openapijsonschematools/codegen/cmd/Generate.java - final CodegenConfigurator configurator = new CodegenConfigurator() - .setGeneratorName("default") // use this codegen library - .setInputSpec("../../../modules/openapi-generator/src/test/resources/2_0/petstore.yaml") // sample OpenAPI file - // .setInputSpec("https://raw.githubusercontent.com/openapi-json-schema-tools/openapi-json-schema-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml") // or from the server - .setOutputDir("out/default"); // output directory - - final ClientOptInput clientOptInput = configurator.toClientOptInput(); - DefaultGenerator generator = new DefaultGenerator(); - generator.opts(clientOptInput).generate(); - } -} \ No newline at end of file From 7501ba36247ae3886379d52471d56de63c04a58a Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 14:42:03 -0700 Subject: [PATCH 19/43] Updates dockerfile --- Dockerfile | 5 +- modules/openapi-json-schema-generator/pom.xml | 456 ------ .../opeanpi_feature_info_3_0_X.yaml | 1024 ------------- pom.xml | 1360 ++++------------- .../codegen/OpenAPIGenerator.java | 0 .../codegen/clicommands/AbstractCommand.java | 0 .../codegen/clicommands/AuthorTemplate.java | 0 .../codegen/clicommands/Completion.java | 0 .../codegen/clicommands/ConfigHelp.java | 0 .../codegen/clicommands/Generate.java | 0 .../codegen/clicommands/GenerateBatch.java | 0 .../codegen/clicommands/Help.java | 0 .../codegen/clicommands/ListGenerators.java | 0 .../codegen/clicommands/Meta.java | 0 .../codegen/clicommands/Validate.java | 0 .../codegen/clicommands/Version.java | 0 .../codegen/clicommands/common/BuildInfo.java | 0 .../codegen/clicommands/common/Constants.java | 0 .../clicommands/common/GlobalOptions.java | 0 .../codegen/common/CodegenConstants.java | 0 .../codegen/common/DryRunStatus.java | 0 .../codegen/common/ImplementationVersion.java | 0 .../codegen/common/JsonCache.java | 0 .../codegen/common/JsonCacheImpl.java | 0 .../codegen/common/Markdown.java | 0 .../codegen/common/ModelUtils.java | 0 .../codegen/common/OnceLogger.java | 0 .../codegen/common/OpenAPISerializer.java | 0 .../codegen/common/OptionUtils.java | 0 .../codegen/common/ProcessUtils.java | 0 .../codegen/common/SemVer.java | 0 .../codegen/common/SerializerUtils.java | 0 .../codegen/common/StringUtils.java | 0 .../codegen/common/URLPathUtils.java | 0 .../codegen/config/AuthParser.java | 0 .../codegen/config/ClientOptInput.java | 0 .../codegen/config/CodegenConfigurator.java | 0 .../config/CodegenConfiguratorUtils.java | 0 .../codegen/config/Context.java | 0 .../codegen/config/DynamicSettings.java | 0 .../codegen/config/GeneratorSettings.java | 0 .../codegen/config/GlobalSettings.java | 0 .../config/SpecValidationException.java | 0 .../codegen/config/WorkflowSettings.java | 0 .../DefaultGeneratorRunner.java | 0 .../generatorrunner/GeneratorRunner.java | 0 .../ignore/CodegenIgnoreProcessor.java | 0 .../ignore/rules/DirectoryRule.java | 0 .../ignore/rules/EverythingRule.java | 0 .../ignore/rules/FileRule.java | 0 .../ignore/rules/IgnoreLineParser.java | 0 .../ignore/rules/InvalidRule.java | 0 .../ignore/rules/ParserException.java | 0 .../generatorrunner/ignore/rules/Part.java | 0 .../ignore/rules/RootedFileRule.java | 0 .../generatorrunner/ignore/rules/Rule.java | 0 .../generators/AbstractJavaGenerator.java | 0 .../AbstractJavaJAXRSServerGenerator.java | 0 .../generators/AbstractKotlinGenerator.java | 0 .../generators/AbstractPythonGenerator.java | 0 .../codegen/generators/DefaultGenerator.java | 0 .../codegen/generators/Generator.java | 0 .../generators/JMeterClientGenerator.java | 0 .../generators/JavaClientGenerator.java | 0 .../generators/JavaJerseyServerGenerator.java | 0 .../generators/KotlinClientGenerator.java | 0 .../generators/PythonClientGenerator.java | 0 .../BeanValidationExtendedFeatures.java | 0 .../features/BeanValidationFeatures.java | 0 .../features/CXFExtServerFeatures.java | 0 .../generators/features/CXFFeatures.java | 0 .../features/CXFServerFeatures.java | 0 .../DocumentationProviderFeatures.java | 0 .../generators/features/GzipFeatures.java | 0 .../generators/features/GzipTestFeatures.java | 0 .../generators/features/JbossFeature.java | 0 .../generators/features/LoggingFeatures.java | 0 .../features/LoggingTestFeatures.java | 0 .../generators/features/OptionalFeatures.java | 0 .../PerformBeanValidationFeatures.java | 0 .../generators/features/SpringFeatures.java | 0 .../generators/features/SwaggerFeatures.java | 0 .../features/SwaggerUIFeatures.java | 0 .../features/UseGenericResponseFeatures.java | 0 .../generatorloader/GeneratorLoader.java | 0 .../GeneratorNotFoundException.java | 0 .../generatormetadata/FeatureSet.java | 0 .../generatormetadata/GeneratorLanguage.java | 0 .../generatormetadata/GeneratorMetadata.java | 0 .../generatormetadata/GeneratorType.java | 0 .../generatormetadata/Stability.java | 0 .../features/ClientModificationFeature.java | 0 .../features/ComponentsFeature.java | 0 .../features/DataTypeFeature.java | 0 .../features/DocumentationFeature.java | 0 .../features/GlobalFeature.java | 0 .../features/OperationFeature.java | 0 .../features/ParameterFeature.java | 0 .../features/SchemaFeature.java | 0 .../features/SecurityFeature.java | 0 .../features/WireFormatFeature.java | 0 .../features/annotations/AnnotationType.java | 0 .../features/annotations/OAS2.java | 0 .../features/annotations/OAS3.java | 0 .../annotations/ToolingExtension.java | 0 .../codegen/generators/models/CliOption.java | 0 .../generators/models/VendorExtension.java | 0 .../openapimodels/ArrayListWithContext.java | 0 .../openapimodels/CodegenCallback.java | 0 .../openapimodels/CodegenDiscriminator.java | 0 .../openapimodels/CodegenEncoding.java | 0 .../openapimodels/CodegenHeader.java | 0 .../generators/openapimodels/CodegenKey.java | 0 .../openapimodels/CodegenMediaType.java | 0 .../openapimodels/CodegenOauthFlow.java | 0 .../openapimodels/CodegenOauthFlows.java | 0 .../openapimodels/CodegenOperation.java | 0 .../openapimodels/CodegenParameter.java | 0 .../openapimodels/CodegenPathItem.java | 0 .../openapimodels/CodegenPatternInfo.java | 0 .../openapimodels/CodegenRefInfo.java | 0 .../openapimodels/CodegenRequestBody.java | 0 .../openapimodels/CodegenResponse.java | 0 .../openapimodels/CodegenSchema.java | 0 .../CodegenSecurityRequirementValue.java | 0 .../openapimodels/CodegenSecurityScheme.java | 0 .../openapimodels/CodegenServer.java | 0 .../generators/openapimodels/CodegenTag.java | 0 .../generators/openapimodels/CodegenXml.java | 0 .../generators/openapimodels/EnumInfo.java | 0 .../generators/openapimodels/EnumValue.java | 0 .../openapimodels/InlineContext.java | 0 .../LinkedHashMapWithContext.java | 0 .../openapimodels/PairCacheKey.java | 0 .../openapimodels/SchemaTestCase.java | 0 .../AbstractTemplatingEngineAdapter.java | 0 .../CommonTemplateContentLocator.java | 0 .../templating/DryRunTemplateManager.java | 0 .../GeneratorTemplateContentLocator.java | 0 .../templating/HandlebarsEngineAdapter.java | 0 .../templating/MustacheEngineAdapter.java | 0 .../codegen/templating/SupportingFile.java | 0 .../templating/TemplateDefinition.java | 0 .../codegen/templating/TemplateFileType.java | 0 .../codegen/templating/TemplateManager.java | 0 .../templating/TemplateManagerOptions.java | 0 .../templating/TemplateNotFoundException.java | 0 .../templating/TemplatePathLocator.java | 0 .../codegen/templating/TemplateProcessor.java | 0 .../templating/TemplatingEngineAdapter.java | 0 .../templating/TemplatingEngineLoader.java | 0 .../templating/TemplatingExecutor.java | 0 .../templating/TemplatingGenerator.java | 0 .../templating/handlebars/CustomHelpers.java | 0 .../templating/handlebars/StringHelpers.java | 0 .../templating/mustache/CamelCaseLambda.java | 0 .../templating/mustache/CaseFormatLambda.java | 0 .../templating/mustache/IndentedLambda.java | 0 .../mustache/JoinWithCommaLambda.java | 0 .../templating/mustache/LowercaseLambda.java | 0 .../templating/mustache/OnChangeLambda.java | 0 .../mustache/OptionalParameterLambda.java | 0 .../mustache/PrefixWithHashLambda.java | 0 .../mustache/RequiredParameterLambda.java | 0 .../templating/mustache/SnakecaseLambda.java | 0 .../mustache/SplitStringLambda.java | 0 .../templating/mustache/TitlecaseLambda.java | 0 .../mustache/TrimWhitespaceLambda.java | 0 .../templating/mustache/UppercaseLambda.java | 0 .../codegen/validation/OpenApiEvaluator.java | 0 .../OpenApiOperationValidations.java | 0 .../OpenApiParameterValidations.java | 0 .../validation/OpenApiSchemaValidations.java | 0 .../OpenApiSecuritySchemeValidations.java | 0 .../codegen/validation/OperationWrapper.java | 0 .../codegen/validation/ParameterWrapper.java | 0 .../codegen/validation/RuleConfiguration.java | 0 .../codegen/validation/SchemaWrapper.java | 0 .../validation/SecuritySchemeWrapper.java | 0 .../validation/ValidationConstants.java | 0 .../validators/GenericValidator.java | 0 .../validation/validators/Invalid.java | 0 .../validation/validators/Severity.java | 0 .../codegen/validation/validators/Valid.java | 0 .../validation/validators/Validated.java | 0 .../validators/ValidationResult.java | 0 .../validation/validators/ValidationRule.java | 0 .../validation/validators/Validator.java | 0 .../main/resources/Java/ApiClient.mustache | 0 .../Java/BeanValidationException.mustache | 0 .../resources/Java/Configuration.mustache | 0 .../Java/CustomInstantDeserializer.mustache | 0 .../main/resources/Java/JSON.mustache | 0 .../resources/Java/JavaTimeFormatter.mustache | 0 .../main/resources/Java/Pair.mustache | 0 .../main/resources/Java/README.mustache | 0 .../resources/Java/RFC3339DateFormat.mustache | 0 .../Java/ServerConfiguration.mustache | 0 .../resources/Java/ServerVariable.mustache | 0 .../main/resources/Java/StringUtil.mustache | 0 .../additionalEnumTypeAnnotations.mustache | 0 .../additionalModelTypeAnnotations.mustache | 0 .../main/resources/Java/api.mustache | 0 .../main/resources/Java/apiException.mustache | 0 .../main/resources/Java/apiOperation.mustache | 0 .../main/resources/Java/api_doc.mustache | 0 .../main/resources/Java/api_test.mustache | 0 .../resources/Java/auth/ApiKeyAuth.mustache | 0 .../Java/auth/Authentication.mustache | 0 .../Java/auth/HttpBasicAuth.mustache | 0 .../Java/auth/HttpBearerAuth.mustache | 0 .../main/resources/Java/auth/OAuth.mustache | 0 .../resources/Java/auth/OAuthFlow.mustache | 0 .../resources/Java/beanValidation.mustache | 0 .../Java/beanValidationCore.mustache | 0 .../Java/beanValidationQueryParams.mustache | 0 .../main/resources/Java/build.gradle.mustache | 0 .../main/resources/Java/build.sbt.mustache | 0 .../resources/Java/enum_outer_doc.mustache | 0 .../Java/generatedAnnotation.mustache | 0 .../main/resources/Java/git_push.sh.mustache | 0 .../main/resources/Java/gitignore.mustache | 0 .../main/resources/Java/gradle-wrapper.jar | Bin .../Java/gradle-wrapper.properties.mustache | 0 .../resources/Java/gradle.properties.mustache | 0 .../main/resources/Java/gradlew.bat.mustache | 0 .../main/resources/Java/gradlew.mustache | 0 .../Java/jackson_annotations.mustache | 0 .../apache-httpclient/ApiClient.mustache | 0 .../apache-httpclient/README.mustache | 0 .../libraries/apache-httpclient/api.mustache | 0 .../apache-httpclient/api_test.mustache | 0 .../apache-httpclient/build.gradle.mustache | 0 .../libraries/apache-httpclient/pom.mustache | 0 .../Java/libraries/feign/ApiClient.mustache | 0 .../feign/ApiResponseDecoder.mustache | 0 .../libraries/feign/EncodingUtils.mustache | 0 .../libraries/feign/ParamExpander.mustache | 0 .../Java/libraries/feign/README.mustache | 0 .../Java/libraries/feign/api.mustache | 0 .../Java/libraries/feign/api_test.mustache | 0 .../feign/auth/ApiErrorDecoder.mustache | 0 .../libraries/feign/auth/ApiKeyAuth.mustache | 0 .../feign/auth/DefaultApi20Impl.mustache | 0 .../feign/auth/HttpBasicAuth.mustache | 0 .../feign/auth/HttpBearerAuth.mustache | 0 .../Java/libraries/feign/auth/OAuth.mustache | 0 .../auth/OauthClientCredentialsGrant.mustache | 0 .../feign/auth/OauthPasswordGrant.mustache | 0 .../libraries/feign/build.gradle.mustache | 0 .../Java/libraries/feign/build.sbt.mustache | 0 .../feign/model/ApiResponse.mustache | 0 .../Java/libraries/feign/model_test.mustache | 0 .../Java/libraries/feign/pom.mustache | 0 .../google-api-client/ApiClient.mustache | 0 .../libraries/google-api-client/api.mustache | 0 .../google-api-client/api_test.mustache | 0 .../google-api-client/build.gradle.mustache | 0 .../google-api-client/build.sbt.mustache | 0 .../libraries/google-api-client/pom.mustache | 0 .../jersey2/AbstractOpenApiSchema.mustache | 0 .../Java/libraries/jersey2/ApiClient.mustache | 0 .../libraries/jersey2/ApiResponse.mustache | 0 .../Java/libraries/jersey2/JSON.mustache | 0 .../jersey2/additional_properties.mustache | 0 .../libraries/jersey2/anyof_model.mustache | 0 .../Java/libraries/jersey2/api.mustache | 0 .../libraries/jersey2/apiException.mustache | 0 .../Java/libraries/jersey2/api_doc.mustache | 0 .../Java/libraries/jersey2/api_test.mustache | 0 .../jersey2/auth/ApiKeyAuth.mustache | 0 .../jersey2/auth/Authentication.mustache | 0 .../jersey2/auth/HttpBasicAuth.mustache | 0 .../jersey2/auth/HttpBearerAuth.mustache | 0 .../jersey2/auth/HttpSignatureAuth.mustache | 0 .../libraries/jersey2/auth/OAuth.mustache | 0 .../libraries/jersey2/auth/OAuthFlow.mustache | 0 .../libraries/jersey2/build.gradle.mustache | 0 .../Java/libraries/jersey2/build.sbt.mustache | 0 .../Java/libraries/jersey2/model.mustache | 0 .../jersey2/model_anyof_doc.mustache | 0 .../Java/libraries/jersey2/model_doc.mustache | 0 .../jersey2/model_oneof_doc.mustache | 0 .../libraries/jersey2/model_test.mustache | 0 .../libraries/jersey2/oneof_model.mustache | 0 .../Java/libraries/jersey2/pojo.mustache | 0 .../Java/libraries/jersey2/pom.mustache | 0 .../jersey3/AbstractOpenApiSchema.mustache | 0 .../Java/libraries/jersey3/ApiClient.mustache | 0 .../libraries/jersey3/ApiResponse.mustache | 0 .../Java/libraries/jersey3/JSON.mustache | 0 .../jersey3/additional_properties.mustache | 0 .../libraries/jersey3/anyof_model.mustache | 0 .../Java/libraries/jersey3/api.mustache | 0 .../libraries/jersey3/apiException.mustache | 0 .../Java/libraries/jersey3/api_doc.mustache | 0 .../Java/libraries/jersey3/api_test.mustache | 0 .../jersey3/auth/ApiKeyAuth.mustache | 0 .../jersey3/auth/Authentication.mustache | 0 .../jersey3/auth/HttpBasicAuth.mustache | 0 .../jersey3/auth/HttpBearerAuth.mustache | 0 .../jersey3/auth/HttpSignatureAuth.mustache | 0 .../libraries/jersey3/auth/OAuth.mustache | 0 .../libraries/jersey3/auth/OAuthFlow.mustache | 0 .../libraries/jersey3/build.gradle.mustache | 0 .../Java/libraries/jersey3/build.sbt.mustache | 0 .../jersey3/generatedAnnotation.mustache | 0 .../Java/libraries/jersey3/model.mustache | 0 .../jersey3/model_anyof_doc.mustache | 0 .../Java/libraries/jersey3/model_doc.mustache | 0 .../jersey3/model_oneof_doc.mustache | 0 .../libraries/jersey3/model_test.mustache | 0 .../libraries/jersey3/oneof_model.mustache | 0 .../Java/libraries/jersey3/pojo.mustache | 0 .../Java/libraries/jersey3/pom.mustache | 0 .../libraries/microprofile/README.mustache | 0 .../Java/libraries/microprofile/api.mustache | 0 .../microprofile/api_exception.mustache | 0 .../api_exception_mapper.mustache | 0 .../libraries/microprofile/api_test.mustache | 0 .../microprofile/beanValidation.mustache | 0 .../microprofile/beanValidationCore.mustache | 0 .../beanValidationHeaderParams.mustache | 0 .../beanValidationPathParams.mustache | 0 .../beanValidationQueryParams.mustache | 0 .../microprofile/bodyParams.mustache | 0 .../microprofile/bodyParamsImpl.mustache | 0 .../libraries/microprofile/enumClass.mustache | 0 .../microprofile/enumOuterClass.mustache | 0 .../microprofile/formParams.mustache | 0 .../microprofile/formParamsImpl.mustache | 0 .../microprofile/generatedAnnotation.mustache | 0 .../microprofile/headerParams.mustache | 0 .../microprofile/headerParamsImpl.mustache | 0 .../microprofile/kumuluzee.beans.xml.mustache | 0 .../kumuluzee.config.yaml.mustache | 0 .../microprofile/kumuluzee.pom.mustache | 0 .../microprofile/licenseInfo.mustache | 0 .../libraries/microprofile/model.mustache | 0 .../microprofile/pathParams.mustache | 0 .../microprofile/pathParamsImpl.mustache | 0 .../Java/libraries/microprofile/pojo.mustache | 0 .../Java/libraries/microprofile/pom.mustache | 0 .../libraries/microprofile/pom_3.0.mustache | 0 .../microprofile/queryParams.mustache | 0 .../microprofile/queryParamsImpl.mustache | 0 .../microprofile/returnTypes.mustache | 0 .../native/AbstractOpenApiSchema.mustache | 0 .../Java/libraries/native/ApiClient.mustache | 0 .../libraries/native/ApiResponse.mustache | 0 .../Java/libraries/native/JSON.mustache | 0 .../Java/libraries/native/README.mustache | 0 .../native/additional_properties.mustache | 0 .../libraries/native/anyof_model.mustache | 0 .../Java/libraries/native/api.mustache | 0 .../libraries/native/apiException.mustache | 0 .../Java/libraries/native/api_doc.mustache | 0 .../Java/libraries/native/api_test.mustache | 0 .../libraries/native/build.gradle.mustache | 0 .../native/generatedAnnotation.mustache | 0 .../native/gradle.properties.mustache | 0 .../Java/libraries/native/model.mustache | 0 .../libraries/native/model_anyof_doc.mustache | 0 .../Java/libraries/native/model_doc.mustache | 0 .../libraries/native/model_oneof_doc.mustache | 0 .../libraries/native/oneof_model.mustache | 0 .../Java/libraries/native/pojo.mustache | 0 .../Java/libraries/native/pom.mustache | 0 .../Java/libraries/native/travis.mustache | 0 .../AbstractOpenApiSchema.mustache | 0 .../okhttp-gson/ApiCallback.mustache | 0 .../libraries/okhttp-gson/ApiClient.mustache | 0 .../okhttp-gson/ApiResponse.mustache | 0 .../GzipRequestInterceptor.mustache | 0 .../Java/libraries/okhttp-gson/JSON.mustache | 0 .../okhttp-gson/ProgressRequestBody.mustache | 0 .../okhttp-gson/ProgressResponseBody.mustache | 0 .../libraries/okhttp-gson/README.mustache | 0 .../additional_properties.mustache | 0 .../okhttp-gson/anyof_model.mustache | 0 .../Java/libraries/okhttp-gson/api.mustache | 0 .../okhttp-gson/apiException.mustache | 0 .../libraries/okhttp-gson/api_doc.mustache | 0 .../libraries/okhttp-gson/api_test.mustache | 0 .../okhttp-gson/auth/ApiKeyAuth.mustache | 0 .../okhttp-gson/auth/Authentication.mustache | 0 .../okhttp-gson/auth/HttpBasicAuth.mustache | 0 .../okhttp-gson/auth/HttpBearerAuth.mustache | 0 .../libraries/okhttp-gson/auth/OAuth.mustache | 0 .../auth/OAuthOkHttpClient.mustache | 0 .../okhttp-gson/auth/RetryingOAuth.mustache | 0 .../okhttp-gson/build.gradle.mustache | 0 .../libraries/okhttp-gson/build.sbt.mustache | 0 .../Java/libraries/okhttp-gson/model.mustache | 0 .../libraries/okhttp-gson/model_test.mustache | 0 .../okhttp-gson/oneof_model.mustache | 0 .../Java/libraries/okhttp-gson/pojo.mustache | 0 .../Java/libraries/okhttp-gson/pom.mustache | 0 .../libraries/rest-assured/ApiClient.mustache | 0 .../rest-assured/GsonObjectMapper.mustache | 0 .../rest-assured/JacksonObjectMapper.mustache | 0 .../Java/libraries/rest-assured/Oper.mustache | 0 .../libraries/rest-assured/README.mustache | 0 .../ResponseSpecBuilders.mustache | 0 .../Java/libraries/rest-assured/api.mustache | 0 .../libraries/rest-assured/api_doc.mustache | 0 .../libraries/rest-assured/api_test.mustache | 0 .../rest-assured/build.gradle.mustache | 0 .../libraries/rest-assured/build.sbt.mustache | 0 .../Java/libraries/rest-assured/pom.mustache | 0 .../libraries/resteasy/ApiClient.mustache | 0 .../Java/libraries/resteasy/JSON.mustache | 0 .../Java/libraries/resteasy/api.mustache | 0 .../libraries/resteasy/build.gradle.mustache | 0 .../libraries/resteasy/build.sbt.mustache | 0 .../Java/libraries/resteasy/pom.mustache | 0 .../libraries/resttemplate/ApiClient.mustache | 0 .../Java/libraries/resttemplate/api.mustache | 0 .../libraries/resttemplate/api_test.mustache | 0 .../resttemplate/auth/ApiKeyAuth.mustache | 0 .../resttemplate/auth/Authentication.mustache | 0 .../resttemplate/auth/HttpBasicAuth.mustache | 0 .../resttemplate/auth/HttpBearerAuth.mustache | 0 .../resttemplate/auth/OAuth.mustache | 0 .../resttemplate/auth/OAuthFlow.mustache | 0 .../resttemplate/build.gradle.mustache | 0 .../Java/libraries/resttemplate/pom.mustache | 0 .../libraries/retrofit/ApiClient.mustache | 0 .../retrofit/CollectionFormats.mustache | 0 .../Java/libraries/retrofit/README.mustache | 0 .../Java/libraries/retrofit/api.mustache | 0 .../Java/libraries/retrofit/api_test.mustache | 0 .../retrofit/auth/ApiKeyAuth.mustache | 0 .../retrofit/auth/HttpBasicAuth.mustache | 0 .../retrofit/auth/HttpBearerAuth.mustache | 0 .../libraries/retrofit/auth/OAuth.mustache | 0 .../retrofit/auth/OAuthOkHttpClient.mustache | 0 .../libraries/retrofit/bodyParams.mustache | 0 .../libraries/retrofit/build.gradle.mustache | 0 .../libraries/retrofit/build.sbt.mustache | 0 .../libraries/retrofit/formParams.mustache | 0 .../libraries/retrofit/headerParams.mustache | 0 .../libraries/retrofit/pathParams.mustache | 0 .../Java/libraries/retrofit/pom.mustache | 0 .../libraries/retrofit/queryParams.mustache | 0 .../libraries/retrofit2/ApiClient.mustache | 0 .../retrofit2/CollectionFormats.mustache | 0 .../Java/libraries/retrofit2/JSON.mustache | 0 .../Java/libraries/retrofit2/README.mustache | 0 .../Java/libraries/retrofit2/api.mustache | 0 .../libraries/retrofit2/api_test.mustache | 0 .../retrofit2/auth/ApiKeyAuth.mustache | 0 .../retrofit2/auth/HttpBasicAuth.mustache | 0 .../retrofit2/auth/HttpBearerAuth.mustache | 0 .../libraries/retrofit2/auth/OAuth.mustache | 0 .../retrofit2/auth/OAuthOkHttpClient.mustache | 0 .../libraries/retrofit2/bodyParams.mustache | 0 .../libraries/retrofit2/build.gradle.mustache | 0 .../libraries/retrofit2/build.sbt.mustache | 0 .../libraries/retrofit2/formParams.mustache | 0 .../retrofit2/formParams.mustache.save | 0 .../libraries/retrofit2/headerParams.mustache | 0 .../libraries/retrofit2/pathParams.mustache | 0 .../play-common/auth/ApiKeyAuth.mustache | 0 .../retrofit2/play24/ApiClient.mustache | 0 .../play24/Play24CallAdapterFactory.mustache | 0 .../play24/Play24CallFactory.mustache | 0 .../libraries/retrofit2/play24/api.mustache | 0 .../retrofit2/play25/ApiClient.mustache | 0 .../play25/Play25CallAdapterFactory.mustache | 0 .../play25/Play25CallFactory.mustache | 0 .../libraries/retrofit2/play25/api.mustache | 0 .../retrofit2/play26/ApiClient.mustache | 0 .../play26/Play26CallAdapterFactory.mustache | 0 .../play26/Play26CallFactory.mustache | 0 .../libraries/retrofit2/play26/api.mustache | 0 .../Java/libraries/retrofit2/pom.mustache | 0 .../libraries/retrofit2/queryParams.mustache | 0 .../Java/libraries/vertx/ApiClient.mustache | 0 .../libraries/vertx/Configuration.mustache | 0 .../Java/libraries/vertx/api.mustache | 0 .../libraries/vertx/apiException.mustache | 0 .../Java/libraries/vertx/apiImpl.mustache | 0 .../Java/libraries/vertx/api_test.mustache | 0 .../libraries/vertx/auth/ApiKeyAuth.mustache | 0 .../vertx/auth/Authentication.mustache | 0 .../vertx/auth/HttpBasicAuth.mustache | 0 .../vertx/auth/HttpBearerAuth.mustache | 0 .../Java/libraries/vertx/auth/OAuth.mustache | 0 .../libraries/vertx/auth/OAuthFlow.mustache | 0 .../libraries/vertx/build.gradle.mustache | 0 .../Java/libraries/vertx/pom.mustache | 0 .../Java/libraries/vertx/rxApiImpl.mustache | 0 .../libraries/webclient/ApiClient.mustache | 0 .../Java/libraries/webclient/api.mustache | 0 .../libraries/webclient/api_test.mustache | 0 .../webclient/auth/ApiKeyAuth.mustache | 0 .../webclient/auth/Authentication.mustache | 0 .../webclient/auth/HttpBasicAuth.mustache | 0 .../webclient/auth/HttpBearerAuth.mustache | 0 .../libraries/webclient/auth/OAuth.mustache | 0 .../webclient/auth/OAuthFlow.mustache | 0 .../libraries/webclient/build.gradle.mustache | 0 .../Java/libraries/webclient/pom.mustache | 0 .../main/resources/Java/licenseInfo.mustache | 0 .../main/resources/Java/manifest.mustache | 0 .../main/resources/Java/maven.yml.mustache | 0 .../main/resources/Java/model.mustache | 0 .../main/resources/Java/modelEnum.mustache | 0 .../resources/Java/modelInnerEnum.mustache | 0 .../main/resources/Java/model_doc.mustache | 0 .../main/resources/Java/model_test.mustache | 0 .../resources/Java/oneof_interface.mustache | 0 .../main/resources/Java/openapi.mustache | 0 .../main/resources/Java/pojo.mustache | 0 .../main/resources/Java/pojo_doc.mustache | 0 .../main/resources/Java/pom.mustache | 0 .../resources/Java/settings.gradle.mustache | 0 .../main/resources/Java/travis.mustache | 0 .../Java/typeInfoAnnotation.mustache | 0 .../resources/Java/xmlAnnotation.mustache | 0 ...onschematools.codegen.generators.Generator | 0 ...codegen.templating.TemplatingEngineAdapter | 0 .../main/resources/_common/.gitignore | 0 .../_common/.openapi-generator-ignore | 0 .../main/resources/codegen/README.mustache | 0 .../main/resources/codegen/api.template | 0 .../resources/codegen/generatorClass.mustache | 0 .../codegen/generatorClassTest.mustache | 0 .../resources/codegen/kotlin/README.mustache | 0 .../codegen/kotlin/build_gradle.mustache | 0 .../codegen/kotlin/generatorClass.mustache | 0 .../kotlin/generatorClassTest.mustache | 0 .../codegen/kotlin/gradle.properties | 0 .../codegen/kotlin/settings.mustache | 0 .../main/resources/codegen/model.template | 0 .../main/resources/codegen/myFile.template | 0 .../main/resources/codegen/pom.mustache | 0 .../main/resources/codegen/services.mustache | 0 .../resources/kotlin-client/README.mustache | 0 .../resources/kotlin-client/api_doc.mustache | 0 .../kotlin-client/build.gradle.mustache | 0 .../kotlin-client/class_doc.mustache | 0 .../kotlin-client/data_class.mustache | 0 .../kotlin-client/data_class_opt_var.mustache | 0 .../kotlin-client/data_class_req_var.mustache | 0 .../kotlin-client/enum_class.mustache | 0 .../resources/kotlin-client/enum_doc.mustache | 0 .../kotlin-client/gradle-wrapper.jar | Bin .../gradle-wrapper.properties.mustache | 0 .../kotlin-client/gradlew.bat.mustache | 0 .../resources/kotlin-client/gradlew.mustache | 0 .../ApiAbstractions.kt.mustache | 0 .../infrastructure/PartConfig.kt.mustache | 0 .../infrastructure/RequestConfig.kt.mustache | 0 .../infrastructure/RequestMethod.kt.mustache | 0 .../kotlin-client/interface_opt_var.mustache | 0 .../kotlin-client/interface_req_var.mustache | 0 .../AtomicBooleanAdapter.kt.mustache | 0 .../AtomicIntegerAdapter.kt.mustache | 0 .../AtomicLongAdapter.kt.mustache | 0 .../BigDecimalAdapter.kt.mustache | 0 .../BigIntegerAdapter.kt.mustache | 0 .../ByteArrayAdapter.kt.mustache | 0 .../LocalDateAdapter.kt.mustache | 0 .../LocalDateTimeAdapter.kt.mustache | 0 .../OffsetDateTimeAdapter.kt.mustache | 0 .../infrastructure/Serializer.kt.mustache | 0 .../SerializerHelper.kt.mustache | 0 .../StringBuilderAdapter.kt.mustache | 0 .../infrastructure/URIAdapter.kt.mustache | 0 .../infrastructure/URLAdapter.kt.mustache | 0 .../infrastructure/UUIDAdapter.kt.mustache | 0 .../proguard-rules.pro.mustache | 0 .../libraries/jvm-ktor/api.mustache | 0 .../jvm-ktor/auth/ApiKeyAuth.kt.mustache | 0 .../jvm-ktor/auth/Authentication.kt.mustache | 0 .../jvm-ktor/auth/HttpBasicAuth.kt.mustache | 0 .../jvm-ktor/auth/HttpBearerAuth.kt.mustache | 0 .../libraries/jvm-ktor/auth/OAuth.kt.mustache | 0 .../infrastructure/ApiClient.kt.mustache | 0 .../infrastructure/HttpResponse.kt.mustache | 0 .../libraries/jvm-okhttp/api.mustache | 0 .../infrastructure/ApiClient.kt.mustache | 0 .../infrastructure/ApiResponse.kt.mustache | 0 .../infrastructure/Errors.kt.mustache | 0 .../ResponseExtensions.kt.mustache | 0 .../libraries/jvm-retrofit2/api.mustache | 0 .../libraries/jvm-retrofit2/api_doc.mustache | 0 .../jvm-retrofit2/auth/ApiKeyAuth.kt.mustache | 0 .../auth/HttpBasicAuth.kt.mustache | 0 .../auth/HttpBearerAuth.kt.mustache | 0 .../jvm-retrofit2/auth/OAuth.kt.mustache | 0 .../jvm-retrofit2/auth/OAuthFlow.kt.mustache | 0 .../auth/OAuthOkHttpClient.kt.mustache | 0 .../jvm-retrofit2/bodyParams.mustache | 0 .../jvm-retrofit2/explodedQueryParam.mustache | 0 .../jvm-retrofit2/formParams.mustache | 0 .../jvm-retrofit2/headerParams.mustache | 0 .../infrastructure/ApiClient.kt.mustache | 0 .../CollectionFormats.kt.mustache | 0 .../infrastructure/ResponseExt.kt.mustache | 0 .../jvm-retrofit2/paramJavadoc.mustache | 0 .../jvm-retrofit2/pathParams.mustache | 0 .../jvm-retrofit2/queryParam.mustache | 0 .../jvm-retrofit2/queryParams.mustache | 0 .../libraries/jvm-volley/README.mustache | 0 .../libraries/jvm-volley/api.mustache | 0 .../libraries/jvm-volley/api_doc.mustache | 0 .../jvm-volley/auth/apikeyauth.mustache | 0 .../jvm-volley/auth/authentication.mustache | 0 .../jvm-volley/auth/httpbasicauth.mustache | 0 .../libraries/jvm-volley/auth/oauth.mustache | 0 .../libraries/jvm-volley/bodyParams.mustache | 0 .../libraries/jvm-volley/build.mustache | 0 .../libraries/jvm-volley/formParams.mustache | 0 .../jvm-volley/gradle.properties.mustache | 0 .../jvm-volley/headerParams.mustache | 0 .../CollectionFormats.kt.mustache | 0 .../ITransformForStorage.mustache | 0 .../libraries/jvm-volley/manifest.mustache | 0 .../libraries/jvm-volley/pathParams.mustache | 0 .../libraries/jvm-volley/queryParams.mustache | 0 .../jvm-volley/request/GsonRequest.mustache | 0 .../request/IRequestFactory.mustache | 0 .../request/RequestFactory.mustache | 0 .../libraries/multiplatform/api.mustache | 0 .../multiplatform/auth/ApiKeyAuth.kt.mustache | 0 .../auth/Authentication.kt.mustache | 0 .../auth/HttpBasicAuth.kt.mustache | 0 .../auth/HttpBearerAuth.kt.mustache | 0 .../multiplatform/auth/OAuth.kt.mustache | 0 .../multiplatform/build.gradle.kts.mustache | 0 .../commonTest/Coroutine.kt.mustache | 0 .../infrastructure/ApiClient.kt.mustache | 0 .../Base64ByteArray.kt.mustache | 0 .../infrastructure/Bytes.kt.mustache | 0 .../infrastructure/HttpResponse.kt.mustache | 0 .../infrastructure/OctetByteArray.kt.mustache | 0 .../iosTest/Coroutine.kt.mustache | 0 .../jsTest/Coroutine.kt.mustache | 0 .../jvmTest/Coroutine.kt.mustache | 0 .../libraries/multiplatform/pom.mustache | 0 .../serial_wrapper_request_list.mustache | 0 .../serial_wrapper_request_map.mustache | 0 .../serial_wrapper_response_list.mustache | 0 .../serial_wrapper_response_map.mustache | 0 .../settings.gradle.kts.mustache | 0 .../kotlin-client/licenseInfo.mustache | 0 .../resources/kotlin-client/model.mustache | 0 .../kotlin-client/modelMutable.mustache | 0 .../kotlin-client/model_doc.mustache | 0 .../kotlin-client/model_room.mustache | 0 .../model_room_init_var.mustache | 0 .../kotlin-client/settings.gradle.mustache | 0 .../kotlin-client/typeInfoAnnotation.mustache | 0 .../src => src}/main/resources/logback.xml | 0 .../main/resources/python/README.hbs | 0 .../resources/python/README_onlypackage.hbs | 0 .../main/resources/python/__init__.hbs | 0 .../main/resources/python/__init__package.hbs | 0 .../resources/python/__init__test_paths.hbs | 0 .../resources/python/_helper_footer_links.hbs | 0 .../main/resources/python/_helper_header.hbs | 0 .../main/resources/python/_helper_imports.hbs | 0 .../python/_helper_readme_common.hbs | 0 .../python/_helper_required_libraries.hbs | 0 .../_helper_schema_python_type_newline.hbs | 0 .../python/_helper_schema_python_types.hbs | 0 .../_helper_schema_python_types_newline.hbs | 0 .../main/resources/python/api_client.hbs | 0 .../main/resources/python/api_response.hbs | 0 .../main/resources/python/apis/__init__.hbs | 0 .../python/apis/apis_path_to_api.hbs | 0 .../resources/python/apis/apis_tag_to_api.hbs | 0 .../resources/python/apis/paths/__init__.hbs | 0 .../main/resources/python/apis/paths/api.hbs | 0 .../resources/python/apis/tags/__init__.hbs | 0 .../main/resources/python/apis/tags/api.hbs | 0 .../resources/python/apis/tags/api_doc.hbs | 0 .../python/components/_helper_anchor_id.hbs | 0 .../_helper_content_schema_output_type.hbs | 0 .../_helper_content_schema_type.hbs | 0 .../_helper_header_from_identifier_pieces.hbs | 0 .../_helper_param_or_header_instance.hbs | 0 .../_helper_schema_accessed_types.hbs | 0 .../python/components/headers/header.hbs | 0 .../python/components/headers/header_doc.hbs | 0 .../components/parameters/parameter.hbs | 0 .../components/parameters/parameter_doc.hbs | 0 .../request_bodies/request_body.hbs | 0 .../request_bodies/request_body_doc.hbs | 0 .../python/components/responses/response.hbs | 0 .../components/responses/response_doc.hbs | 0 .../components/schemas/__init__schema.hbs | 0 .../components/schemas/__init__schemas.hbs | 0 .../components/schemas/_helper_allof_type.hbs | 0 .../components/schemas/_helper_anyof_type.hbs | 0 .../schemas/_helper_array_input_type.hbs | 0 .../schemas/_helper_array_output_type.hbs | 0 .../schemas/_helper_composed_schemas.hbs | 0 .../schemas/_helper_dict_partial.hbs | 0 .../components/schemas/_helper_enum_class.hbs | 0 .../components/schemas/_helper_getschemas.hbs | 0 .../schemas/_helper_identifier_suffix.hbs | 0 .../schemas/_helper_list_partial.hbs | 0 .../python/components/schemas/_helper_new.hbs | 0 .../components/schemas/_helper_notes_msg.hbs | 0 .../schemas/_helper_object_get_property.hbs | 0 .../_helper_object_output_properties.hbs | 0 .../schemas/_helper_object_output_type.hbs | 0 .../components/schemas/_helper_oneof_type.hbs | 0 ..._helper_optional_properties_input_type.hbs | 0 .../schemas/_helper_payload_renderer.hbs | 0 .../_helper_prefix_property_value_type.hbs | 0 ..._helper_prefix_ref_property_value_type.hbs | 0 .../schemas/_helper_properties_input_type.hbs | 0 .../schemas/_helper_properties_type.hbs | 0 .../schemas/_helper_property_value_type.hbs | 0 .../schemas/_helper_refclass_partial.hbs | 0 ..._helper_required_properties_input_type.hbs | 0 .../_helper_schema_composed_or_anytype.hbs | 0 .../schemas/_helper_schema_dict.hbs | 0 .../schemas/_helper_schema_enum.hbs | 0 .../schemas/_helper_schema_input_ref_type.hbs | 0 .../schemas/_helper_schema_input_type.hbs | 0 .../_helper_schema_input_type_base.hbs | 0 .../schemas/_helper_schema_list.hbs | 0 .../_helper_schema_output_ref_single.hbs | 0 .../_helper_schema_output_ref_type.hbs | 0 .../schemas/_helper_schema_output_type.hbs | 0 .../_helper_schema_output_type_base.hbs | 0 .../_helper_schema_output_type_single.hbs | 0 .../_helper_schema_python_base_types.hbs | 0 ...elper_schema_python_base_types_newline.hbs | 0 .../schemas/_helper_schema_simple.hbs | 0 .../schemas/_helper_schema_switch_case.hbs | 0 .../components/schemas/_helper_types.hbs | 0 .../_helper_types_all_accessed_oneline.hbs | 0 .../_helper_types_all_incl_schema_oneline.hbs | 0 .../components/schemas/_helper_validate.hbs | 0 .../schemas/_helper_validate_args.hbs | 0 .../_helper_validate_bool_overload.hbs | 0 .../schemas/_helper_validate_int_overload.hbs | 0 .../schemas/_helper_validate_str_overload.hbs | 0 .../schemas/_helper_validations.hbs | 0 .../schemas/_helper_var_equals_cls.hbs | 0 .../schemas/_helper_xbase_one_type.hbs | 0 .../python/components/schemas/schema.hbs | 0 .../python/components/schemas/schema_doc.hbs | 0 .../python/components/schemas/schema_test.hbs | 0 .../security_schemes/security_scheme.hbs | 0 .../security_schemes/security_scheme_doc.hbs | 0 .../configurations/api_configuration.hbs | 0 .../configurations/schema_configuration.hbs | 0 .../main/resources/python/exceptions.hbs | 0 .../main/resources/python/git_push.hbs | 0 .../main/resources/python/gitignore.hbs | 0 .../main/resources/python/gitlab-ci.hbs | 0 .../main/resources/python/migration_2_0_0.hbs | 0 .../main/resources/python/migration_3_0_0.hbs | 0 .../migration_other_python_generators.hbs | 0 .../resources/python/paths/__init__paths.hbs | 0 .../python/paths/path/__init__path.hbs | 0 .../path/verb/_helper_operation_args.hbs | 0 .../path/verb/_helper_operation_args_body.hbs | 0 .../verb/_helper_operation_args_optional.hbs | 0 .../verb/_helper_operation_args_passed.hbs | 0 .../verb/_helper_operation_args_required.hbs | 0 .../_helper_operation_body_serialization.hbs | 0 ...er_operation_doc_configuration_partial.hbs | 0 .../verb/_helper_operation_doc_example.hbs | 0 ...ation_doc_security_scheme_info_partial.hbs | 0 .../verb/_helper_operation_docs_xparams.hbs | 0 .../_helper_operation_response_type_hint.hbs | 0 .../verb/_helper_operation_test_partial.hbs | 0 ...helper_operation_test_response_content.hbs | 0 .../python/paths/path/verb/operation.hbs | 0 .../python/paths/path/verb/operation_doc.hbs | 0 .../python/paths/path/verb/operation_test.hbs | 0 .../main/resources/python/pyproject.hbs | 0 .../main/resources/python/rest.hbs | 0 .../resources/python/schemas/__init__.hbs | 0 .../main/resources/python/schemas/format.hbs | 0 .../python/schemas/original_immutabledict.hbs | 0 .../main/resources/python/schemas/schema.hbs | 0 .../main/resources/python/schemas/schemas.hbs | 0 .../resources/python/schemas/validation.hbs | 0 .../resources/python/security/security.hbs | 0 .../resources/python/security_schemes.hbs | 0 .../main/resources/python/server.hbs | 0 .../main/resources/python/servers/server.hbs | 0 .../resources/python/servers/server_doc.hbs | 0 .../python/shared_imports/header_imports.hbs | 0 .../shared_imports/operation_imports.hbs | 0 .../shared_imports/response_imports.hbs | 0 .../python/shared_imports/schema_imports.hbs | 0 .../security_scheme_imports.hbs | 0 .../python/shared_imports/server_imports.hbs | 0 .../main/resources/python/signing.hbs | 0 .../resources/python/test-requirements.hbs | 0 .../src => src}/main/resources/python/tox.hbs | 0 .../main/resources/python/travis.hbs | 0 .../main/resources/validator/index.mustache | 0 .../codegen/AbstractIntegrationTest.java | 0 .../codegen/ArchUnitRulesTest.java | 0 .../codegen/MockDefaultGeneratorRunner.java | 0 .../codegen/TestUtils.java | 0 .../clicommands/AuthorTemplateTest.java | 0 .../clicommands/GenerateBatchTest.java | 0 .../codegen/clicommands/GenerateTest.java | 0 .../codegen/clicommands/OptionUtilsTest.java | 0 .../codegen/common/JsonCacheTest.java | 0 .../codegen/common/ModelUtilsTest.java | 0 .../codegen/common/OnceLoggerTest.java | 0 .../codegen/common/SerializerUtilsTest.java | 0 .../codegen/common/StringUtilsTest.java | 0 .../codegen/common/URLPathUtilsTest.java | 0 .../config/SpecValidationExceptionTest.java | 0 .../codegen/config/WorkflowSettingsTest.java | 0 .../DefaultGeneratorRunnerTest.java | 0 ...bstractJavaGeneratorExampleValuesTest.java | 0 .../generators/DefaultGeneratorTest.java | 0 .../generators/PythonClientGeneratorTest.java | 0 .../DocumentationProviderFeaturesTest.java | 0 .../generatormetadata/FeatureSetTest.java | 0 .../AbstractAnnotationAssert.java | 0 .../javaassertions/ConstructorAssert.java | 0 .../javaassertions/JavaFileAssert.java | 0 .../MethodAnnotationAssert.java | 0 .../javaassertions/MethodAssert.java | 0 .../ParameterAnnotationAssert.java | 0 .../javaassertions/ParameterAssert.java | 0 .../PropertyAnnotationAssert.java | 0 .../javaassertions/PropertyAssert.java | 0 .../javaassertions/TypeAnnotationAssert.java | 0 .../options/AbstractOptionsTest.java | 0 .../generators/options/OptionsProvider.java | 0 .../options/PythonClientOptionsProvider.java | 0 .../HandlebarsEngineAdapterTest.java | 0 .../templating/TemplateManagerTest.java | 0 .../handlebars/StringHelpersTest.java | 0 .../mustache/CamelCaseLambdaTest.java | 0 .../mustache/IndentedLambdaTest.java | 0 .../templating/mustache/LambdaTest.java | 0 .../mustache/LowercaseLambdaTest.java | 0 .../mustache/OnChangeLambdaTest.java | 0 .../mustache/PascalCaseLambdaTest.java | 0 .../mustache/SnakecaseLambdaTest.java | 0 .../mustache/SplitStringLambdaTest.java | 0 .../mustache/TitlecaseLambdaTest.java | 0 .../mustache/TrimWhitespaceLambdaTest.java | 0 .../mustache/UppercaseLambdaTest.java | 0 .../codegen/testutils/AssertFile.java | 0 .../testutils/IntegrationTestPathsConfig.java | 0 .../OpenApiOperationValidationsTest.java | 0 .../OpenApiParameterValidationsTest.java | 0 .../validation/OpenApiSchemaTypeTest.java | 0 .../OpenApiSchemaValidationsTest.java | 0 .../OpenApiSecuritySchemeValidationsTest.java | 0 .../validators/GenericValidatorTest.java | 0 .../validation/validators/ValidatedTest.java | 0 .../validators/ValidationRuleTest.java | 0 .../test/resources/1_2/petstore-1.2/api-docs | 0 .../test/resources/1_2/petstore-1.2/pet | 0 .../test/resources/1_2/petstore-1.2/store | 0 .../test/resources/1_2/petstore-1.2/user | 0 .../additional-properties-for-testing.yaml | 0 .../test/resources/2_0/allOfTest.yaml | 0 .../test/resources/2_0/arrayRefBody.yaml | 0 .../test/resources/2_0/bash-config.json | 0 .../test/resources/2_0/binaryDataTest.json | 0 .../test/resources/2_0/composed-allof.yaml | 0 .../test/resources/2_0/datePropertyTest.json | 0 .../test/resources/2_0/discriminatorTest.json | 0 .../resources/2_0/duplicateOperationIds.yaml | 0 .../test/resources/2_0/emptyBaseModel.yaml | 0 .../2_0/globalConsumesAndProduces.json | 0 .../2_0/globalProducesConsumesTest.yaml | 0 .../test/resources/2_0/globalSecurity.json | 0 .../test/resources/2_0/issue1226.yaml | 0 .../test/resources/2_0/issue_9086.yaml | 0 .../resources/2_0/issue_9086_expected.yaml | 0 .../2_0/long_description_issue_7839.json | 0 .../test/resources/2_0/mapArgs.yaml | 0 .../test/resources/2_0/markdown.yaml | 0 .../src => src}/test/resources/2_0/npe1.yaml | 0 .../resources/2_0/pathWithHtmlEntity.yaml | 0 .../test/resources/2_0/petstore-bash.json | 0 .../test/resources/2_0/petstore-nullable.yaml | 0 .../test/resources/2_0/petstore-orig.json | 0 .../test/resources/2_0/petstore-proto.yaml | 0 .../resources/2_0/petstore-security-test.yaml | 0 .../resources/2_0/petstore-vendor-mime.yaml | 0 .../2_0/petstore-with-date-field.yaml | 0 ...r-testing-playframework-with-security.yaml | 0 ...s-models-for-testing-saga-and-records.yaml | 0 ...dels-for-testing-with-spring-pageable.yaml | 0 ...ith-fake-endpoints-models-for-testing.yaml | 0 ...th-operations-without-required-params.yaml | 0 .../2_0/petstore-with-spring-pageable.yaml | 0 .../test/resources/2_0/petstore.json | 0 .../test/resources/2_0/petstore.yaml | 0 .../resources/2_0/petstore_issue_7999.json | 0 .../test/resources/2_0/postBodyTest.json | 0 ...ith-fake-endpoints-models-for-testing.yaml | 0 .../2_0/refAliasedPrimitiveWithValidation.yml | 0 .../test/resources/2_0/regression_6905.yaml | 0 .../test/resources/2_0/requiredTest.json | 0 .../test/resources/2_0/responseCodeTest.yaml | 0 .../resources/2_0/responseHeaderTest.yaml | 0 .../resources/2_0/responseSelectionTest.json | 0 ...ith-fake-endpoints-models-for-testing.yaml | 0 .../2_0/rust-server/rust-server-test.yaml | 0 ...ith-fake-endpoints-models-for-testing.yaml | 0 .../test/resources/2_0/swift4Test.json | 0 .../test/resources/2_0/swift5Test.json | 0 .../2_0/templates/Java/ApiClient.mustache | 0 .../Java/libraries/jersey2/ApiClient.mustache | 0 .../Java/libraries/jersey2/JSON.mustache | 0 .../Java/libraries/jersey2/api.mustache | 0 .../libraries/jersey2/build.gradle.mustache | 0 .../Java/libraries/jersey2/build.sbt.mustache | 0 .../Java/libraries/jersey2/pom.mustache | 0 .../2_0/templates/Java/model.mustache | 0 .../test/resources/2_0/v1beta3.json | 0 .../test/resources/2_0/wordnik.json | 0 .../test/resources/2_0/wordnik.yaml | 0 .../resources/2_0/x-discriminator-value.yaml | 0 .../test/resources/3_0/11_regex.yaml | 0 .../test/resources/3_0/3134-regression.yaml | 0 .../resources/3_0/3248-regression-dates.yaml | 0 .../test/resources/3_0/3248-regression.yaml | 0 .../resources/3_0/6150_model_json_inline.yaml | 0 .../resources/3_0/70_schema_enum_names.yaml | 0 .../additional-properties-deeply-nested.yaml | 0 .../test/resources/3_0/allOf-readonly.yaml | 0 .../resources/3_0/allOf-required-parent.yaml | 0 .../test/resources/3_0/allOf-required.yaml | 0 .../src => src}/test/resources/3_0/allOf.yaml | 0 .../3_0/allOfDuplicatedProperties.yaml | 0 .../3_0/allOfMappingDuplicatedProperties.yaml | 0 .../test/resources/3_0/allOfMultiParent.yaml | 0 .../test/resources/3_0/allOf_composition.yaml | 0 .../3_0/allOf_composition_discriminator.yaml | 0 ...f_composition_discriminator_recursive.yaml | 0 .../test/resources/3_0/allOf_nullable.yaml | 0 .../src => src}/test/resources/3_0/anyOf.yaml | 0 .../resources/3_0/anyOfDiscriminator.yaml | 0 .../test/resources/3_0/any_type.yaml | 0 .../test/resources/3_0/arrayParameter.yaml | 0 .../test/resources/3_0/arrayRefBody.yaml | 0 .../test/resources/3_0/asciidoc/api-docs.json | 0 .../rest/project/GET/GET.json | 0 .../rest/project/GET/curl-request.adoc | 0 .../rest/project/GET/http-request.adoc | 0 .../rest/project/GET/http-response.adoc | 0 .../rest/project/GET/httpie-request.adoc | 0 .../rest/project/GET/request-body.adoc | 0 .../rest/project/GET/response-body.adoc | 0 .../rest/project/GET/implementation.adoc | 0 .../asciidoc/specs/rest/project/GET/spec.adoc | 0 .../resources/3_0/aspnetcore/petstore.yaml | 0 .../resources/3_0/avro-schema/petstore.yaml | 0 .../test/resources/3_0/callbacks.yaml | 0 .../resources/3_0/component-deprecated.yml | 0 .../test/resources/3_0/composed-oneof.yaml | 0 .../test/resources/3_0/composed-schemas.yaml | 0 .../resources/3_0/conflictingParameter.yaml | 0 .../resources/3_0/container-type-import.yaml | 0 .../test/resources/3_0/content-data.yaml | 0 .../test/resources/3_0/cpp-qt/petstore.yaml | 0 ...odels-for-testing-with-http-signature.yaml | 0 .../3_0/deepobject-array-with-pattern.yaml | 0 .../test/resources/3_0/deepobject.yaml | 0 .../src => src}/test/resources/3_0/elm.yaml | 0 .../resources/3_0/example_generator_test.yaml | 0 .../test/resources/3_0/examples.yaml | 0 .../3_0/extensions/x-auth-id-alias.yaml | 0 .../3_0/features/dynamic-servers.yaml | 0 .../3_0/features/generate-alias-as-model.yaml | 0 .../3_0/form-duplicated-parameter.yaml | 0 .../3_0/form-multipart-binary-array.yaml | 0 .../test/resources/3_0/fromParameter.yaml | 0 .../test/resources/3_0/generic.yaml | 0 ...odels-for-testing-with-http-signature.yaml | 0 .../resources/3_0/inline_model_resolver.yaml | 0 .../inline_request_body_no_components.yaml | 0 .../test/resources/3_0/issue-11340.yaml | 0 .../test/resources/3_0/issue-4062.yaml | 0 .../test/resources/3_0/issue11242.yaml | 0 .../issue13146_file_abstraction_response.yaml | 0 .../test/resources/3_0/issue392.yaml | 0 .../test/resources/3_0/issue4584.yaml | 0 .../test/resources/3_0/issue4808.yaml | 0 .../test/resources/3_0/issue677.yaml | 0 .../test/resources/3_0/issue7262.yaml | 0 .../test/resources/3_0/issue7356.yaml | 0 .../test/resources/3_0/issue7506.yaml | 0 .../test/resources/3_0/issue796.yaml | 0 .../test/resources/3_0/issue8352.yaml | 0 .../test/resources/3_0/issue855.yaml | 0 .../test/resources/3_0/issue8986.yaml | 0 .../test/resources/3_0/issue_10056.yaml | 0 .../test/resources/3_0/issue_10330.yaml | 0 .../test/resources/3_0/issue_10725.yaml | 0 .../test/resources/3_0/issue_10792.yaml | 0 .../3_0/issue_10865_default_values.yaml | 0 .../3_0/issue_10866_bigdecimal_default.yaml | 0 .../test/resources/3_0/issue_11521.yaml | 0 .../test/resources/3_0/issue_11772.yml | 0 .../test/resources/3_0/issue_12196.yaml | 0 .../test/resources/3_0/issue_12445.yaml | 0 .../test/resources/3_0/issue_12857.yaml | 0 .../test/resources/3_0/issue_13025.yaml | 0 ...043_geometry_collection_expected_value.txt | 0 .../3_0/issue_13043_recursive_model.yaml | 0 ...e_13043_recursive_model_expected_value.txt | 0 .../test/resources/3_0/issue_1347.yaml | 0 .../test/resources/3_0/issue_1517.yaml | 0 .../test/resources/3_0/issue_1997.yaml | 0 .../test/resources/3_0/issue_2053.yaml | 0 .../test/resources/3_0/issue_241.yaml | 0 .../test/resources/3_0/issue_2908.yaml | 0 .../test/resources/3_0/issue_3248.yaml | 0 .../test/resources/3_0/issue_4832.yaml | 0 .../3_0/issue_4876_format_email.yaml | 0 .../test/resources/3_0/issue_5381.yaml | 0 .../test/resources/3_0/issue_5386.yaml | 0 .../test/resources/3_0/issue_5436.yml | 0 .../test/resources/3_0/issue_6762.yaml | 0 .../test/resources/3_0/issue_7193.yaml | 0 .../3_0/issue_7199_array_simple_string.yaml | 0 .../test/resources/3_0/issue_7361.yaml | 0 .../test/resources/3_0/issue_7372.yaml | 0 .../test/resources/3_0/issue_7532.yaml | 0 ...issue_7532_tree_example_value_expected.txt | 0 .../test/resources/3_0/issue_7533.yaml | 0 .../test/resources/3_0/issue_7613.yaml | 0 .../test/resources/3_0/issue_7614.yaml | 0 .../test/resources/3_0/issue_7651.yaml | 0 .../test/resources/3_0/issue_7791.yaml | 0 .../3_0/issue_8052_recursive_model.yaml | 0 ...ue_8052_recursive_model_expected_value.txt | 0 .../test/resources/3_0/issue_8535.yaml | 0 .../test/resources/3_0/issue_8906.yaml | 0 .../test/resources/3_0/issue_8945.yaml | 0 .../test/resources/3_0/issue_9282.yaml | 0 .../test/resources/3_0/issue_9447.yaml | 0 .../test/resources/3_0/issue_9848.yaml | 0 .../issue______kotlinArrayEnumEmbedded.yaml | 0 .../test/resources/3_0/issues_13069.yaml | 0 .../3_0/java/petstore-group-parameter.yaml | 0 ...sting-with-http-signature-okhttp-gson.yaml | 0 ...odels-for-testing-with-http-signature.yaml | 0 ...ith-fake-endpoints-models-for-testing.yaml | 0 .../resources/3_0/kotlin/bean-qualifiers.yaml | 0 .../kotlin/issue10591-enum-defaultValue.yaml | 0 ...ue11088-model-mutable-with-containers.yaml | 0 .../issue13506-defaultValue-numbers.yaml | 0 .../3_0/kotlin/issue5497-use-tags-kotlin.yaml | 0 ...325-use-delegate-reactive-tags-kotlin.yaml | 0 .../resources/3_0/kotlin/reserved_words.yaml | 0 .../test/resources/3_0/mapSchemas.yaml | 0 .../3_0/markdown/expected/Models/Object.md | 0 .../expected/Models/Object_InlinedObject.md | 0 .../expected/Models/ReferencedObject.md | 0 .../3_0/markdown/expected/Models/String.md | 0 .../resources/3_0/markdown/expected/README.md | 0 .../resources/3_0/markdown/issue_6096.yaml | 0 .../resources/3_0/micronaut/content-type.yaml | 0 .../3_0/micronaut/multi-tags-test.yaml | 0 .../test/resources/3_0/micronaut/oauth2.yaml | 0 .../3_0/micronaut/roles-extension-test.yaml | 0 .../test/resources/3_0/model-deprecated.yaml | 0 ...antUseDiscriminatorIfCompositionFails.yaml | 0 .../test/resources/3_0/objectQueryParam.yaml | 0 .../src => src}/test/resources/3_0/oneOf.yaml | 0 .../resources/3_0/oneOfArrayMapImport.yaml | 0 .../resources/3_0/oneOfDiscriminator.yaml | 0 .../test/resources/3_0/oneOf_primitive.yaml | 0 .../oneof_polymorphism_and_inheritance.yaml | 0 ...ired-properties-has-same-oneOf-object.yaml | 0 .../3_0/petstore-with-complex-headers.yaml | 0 .../3_0/petstore-with-depreacted-fields.yaml | 0 ...odels-for-testing-with-http-signature.yaml | 0 ...ith-fake-endpoints-models-for-testing.yaml | 0 .../3_0/petstore-with-nullable-required.yaml | 0 .../petstore-with-object-as-parameter.yaml | 0 .../test/resources/3_0/petstore.json | 0 .../test/resources/3_0/petstore.yaml | 0 .../resources/3_0/petstore_oas3_test.yaml | 0 .../test/resources/3_0/php/issue_10244.yaml | 0 .../src => src}/test/resources/3_0/ping.yaml | 0 .../test/resources/3_0/pingBearerAuth.yaml | 0 .../test/resources/3_0/pingSomeObj.yaml | 0 ...odels-for-testing-with-http-signature.yaml | 0 .../resources/3_0/powershell/petstore.yaml | 0 .../test/resources/3_0/produces.yaml | 0 .../resources/3_0/property-deprecated.yaml | 0 .../resources/3_0/protobuf-schema/pet.proto | 0 .../test/resources/3_0/protobuf/petstore.yaml | 0 ...odels-for-testing-with-http-signature.yaml | 0 .../3_0/python/petstore_customized.yaml | 0 .../test/resources/3_0/r/petstore.yaml | 0 .../test/resources/3_0/recursion.yaml | 0 .../test/resources/3_0/regression-6734.yaml | 0 .../test/resources/3_0/response-tests.yaml | 0 .../test/resources/3_0/rootOperation.yaml | 0 .../3_0/rust-server/multipart-v3.yaml | 0 .../3_0/rust-server/no-example-v3.yaml | 0 .../resources/3_0/rust-server/openapi-v3.yaml | 0 .../resources/3_0/rust-server/ops-v3.yaml | 0 .../3_0/rust-server/ping-bearer-auth.yaml | 0 .../test/resources/3_0/rust/petstore.yaml | 0 .../resources/3_0/scala-akka/petstore.yaml | 0 .../3_0/scala/issue_10187_operatorName.yaml | 0 .../test/resources/3_0/scala/petstore.yaml | 0 .../resources/3_0/scala/stripModelName.yaml | 0 .../resources/3_0/scala_reserved_words.yaml | 0 .../resources/3_0/schema-unalias-test.yml | 0 .../3_0/schema-with-nullable-arrays.yaml | 0 .../3_0/schema-with-special-characters.yaml | 0 .../test/resources/3_0/security.yaml | 0 .../test/resources/3_0/server-required.yaml | 0 .../test/resources/3_0/setParameter.yaml | 0 .../test/resources/3_0/setResponse.yaml | 0 .../3_0/spring/10167-nullable-set.yml | 0 .../date-time-parameter-types-for-testing.yml | 0 .../resources/3_0/spring/issue_10278.yaml | 0 .../test/resources/3_0/spring/issue_11323.yml | 0 .../resources/3_0/spring/issue_5026-b.yaml | 0 .../test/resources/3_0/spring/issue_5026.yaml | 0 .../test/resources/3_0/spring/issue_8045.yaml | 0 .../test/resources/3_0/streaming.yaml | 0 .../src => src}/test/resources/3_0/tags.yaml | 0 .../test/resources/3_0/test_regex.yaml | 0 .../test/resources/3_0/two-responses.yaml | 0 .../test/resources/3_0/type-alias.yaml | 0 .../test/resources/3_0/type_alias.yaml | 0 .../test/resources/3_0/type_mapping_test.yaml | 0 ...h-separate-models-and-api-inheritance.yaml | 0 .../resources/3_0/typescript-fetch/enum.yaml | 0 .../3_0/typescript/unique_items.yaml | 0 .../resources/3_0/unit_test_spec/.gitignore | 0 .../unit_test_spec/3_0_3_unit_test_spec.yaml | 0 .../3_0/unit_test_spec/draft6/LICENSE | 0 .../draft6/additionalItems.json | 0 .../draft6/additionalProperties.json | 0 .../3_0/unit_test_spec/draft6/allOf.json | 0 .../3_0/unit_test_spec/draft6/anyOf.json | 0 .../unit_test_spec/draft6/boolean_schema.json | 0 .../3_0/unit_test_spec/draft6/const.json | 0 .../3_0/unit_test_spec/draft6/contains.json | 0 .../3_0/unit_test_spec/draft6/default.json | 0 .../unit_test_spec/draft6/definitions.json | 0 .../unit_test_spec/draft6/dependencies.json | 0 .../3_0/unit_test_spec/draft6/enum.json | 0 .../draft6/exclusiveMaximum.json | 0 .../draft6/exclusiveMinimum.json | 0 .../3_0/unit_test_spec/draft6/format.json | 0 .../3_0/unit_test_spec/draft6/id.json | 0 .../draft6/infinite-loop-detection.json | 0 .../3_0/unit_test_spec/draft6/items.json | 0 .../3_0/unit_test_spec/draft6/maxItems.json | 0 .../3_0/unit_test_spec/draft6/maxLength.json | 0 .../unit_test_spec/draft6/maxProperties.json | 0 .../3_0/unit_test_spec/draft6/maximum.json | 0 .../3_0/unit_test_spec/draft6/minItems.json | 0 .../3_0/unit_test_spec/draft6/minLength.json | 0 .../unit_test_spec/draft6/minProperties.json | 0 .../3_0/unit_test_spec/draft6/minimum.json | 0 .../3_0/unit_test_spec/draft6/multipleOf.json | 0 .../3_0/unit_test_spec/draft6/not.json | 0 .../3_0/unit_test_spec/draft6/oneOf.json | 0 .../draft6/optional/bignum.json | 0 .../draft6/optional/ecmascript-regex.json | 0 .../draft6/optional/float-overflow.json | 0 .../draft6/optional/format/date-time.json | 0 .../draft6/optional/format/email.json | 0 .../draft6/optional/format/hostname.json | 0 .../draft6/optional/format/ipv4.json | 0 .../draft6/optional/format/ipv6.json | 0 .../draft6/optional/format/json-pointer.json | 0 .../draft6/optional/format/unknown.json | 0 .../draft6/optional/format/uri-reference.json | 0 .../draft6/optional/format/uri-template.json | 0 .../draft6/optional/format/uri.json | 0 .../draft6/optional/future-keywords.json | 0 .../draft6/optional/non-bmp-regex.json | 0 .../3_0/unit_test_spec/draft6/pattern.json | 0 .../draft6/patternProperties.json | 0 .../3_0/unit_test_spec/draft6/properties.json | 0 .../unit_test_spec/draft6/propertyNames.json | 0 .../3_0/unit_test_spec/draft6/ref.json | 0 .../3_0/unit_test_spec/draft6/refRemote.json | 0 .../3_0/unit_test_spec/draft6/required.json | 0 .../3_0/unit_test_spec/draft6/type.json | 0 .../unit_test_spec/draft6/uniqueItems.json | 0 .../unit_test_spec/draft6/unknownKeyword.json | 0 .../additionalProperties.json | 0 .../openapi_additions/multipleOf.json | 0 .../unit_test_spec/openapi_additions/ref.json | 0 .../openapi_additions/type.json | 0 .../3_0/unit_test_spec/spec_writer.py | 0 .../test/resources/3_0/unusedSchemas.yaml | 0 .../test/resources/3_0/wsdl/petstore.yaml | 0 .../3_1/null-types-with-type-array.yaml | 0 .../test/resources/3_1/null-types.yaml | 0 .../test/resources/3_1/petstore.yaml | 0 .../resources/archunit_ignore_patterns.txt | 0 .../batch/common/jaxrs-datelib-j8.json | 0 .../batch/common/jaxrs-datelib-j8.yaml | 0 .../batch/jaxrs-datelib-j8-double.json | 0 .../batch/jaxrs-datelib-j8-double.yaml | 0 .../batch/jaxrs-datelib-j8-json-include.yaml | 0 ...elib-j8-nested-include-property-merge.yaml | 0 .../jaxrs-datelib-j8-nested-include.json | 0 .../jaxrs-datelib-j8-nested-include.yaml | 0 ...axrs-datelib-j8-nested-property-merge.yaml | 0 .../batch/jaxrs-datelib-j8-nested.json | 0 .../batch/jaxrs-datelib-j8-nested.yaml | 0 .../batch/jaxrs-datelib-j8-yaml-include.json | 0 .../resources/batch/jaxrs-datelib-j8.json | 0 .../resources/batch/jaxrs-datelib-j8.yaml | 0 .../test/resources/batch/specs/petstore.yaml | 0 .../bugs/Swift5CodeGenerationBug2.yaml | 0 ...wift5CodeGenerationStackOverflow#2966.yaml | 0 ...11304_kotlin_backticks_reserved_words.yaml | 0 .../test/resources/bugs/issue_11464.yaml | 0 .../test/resources/bugs/issue_11731.yaml | 0 .../test/resources/bugs/issue_11897.yaml | 0 .../test/resources/bugs/issue_11957.yaml | 0 .../test/resources/bugs/issue_12457.yaml | 0 .../test/resources/bugs/issue_12494.yaml | 0 .../test/resources/bugs/issue_12622.json | 0 .../test/resources/bugs/issue_12692.yml | 0 .../test/resources/bugs/issue_12790.yaml | 0 .../test/resources/bugs/issue_7125.json | 0 .../test/resources/bugs/issue_9719.yaml | 0 .../resources/bugs/recursion-bug-4650.yaml | 0 .../codegen/scala/JavaTimeObj.scala.txt | 0 .../resources/codegen/scala/SomeObj.scala.txt | 0 .../csharp/general/enum-support-spec.json | 0 .../csharp/general/enum-support.ignore | 0 .../csharp/general/enum-support.sh | 0 .../client/required-attributes-spec.json | 0 .../scala/client/required-attributes.sh | 0 .../additional-properties-expected/.gitignore | 0 .../additional-properties-expected/README.md | 0 .../api.module.ts | 0 .../additional-properties-expected/api/api.ts | 0 .../api/user.service.ts | 0 .../configuration.ts | 0 .../additional-properties-expected/encoder.ts | 0 .../git_push.sh | 0 .../additional-properties-expected/index.ts | 0 .../model/models.ts | 0 .../model/user.ts | 0 .../ng-package.json | 0 .../package.json | 0 .../additional-properties-expected/param.ts | 0 .../tsconfig.json | 0 .../variables.ts | 0 .../additional-properties-spec.json | 0 .../array-and-object-expected/.gitignore | 0 .../array-and-object-expected/README.md | 0 .../array-and-object-expected/api.module.ts | 0 .../array-and-object-expected/api/api.ts | 0 .../api/project.service.ts | 0 .../configuration.ts | 0 .../array-and-object-expected/encoder.ts | 0 .../array-and-object-expected/git_push.sh | 0 .../array-and-object-expected/index.ts | 0 .../array-and-object-expected/model/models.ts | 0 .../model/projectEntity.ts | 0 .../model/projectEntityLocation.ts | 0 .../model/projectList.ts | 0 .../array-and-object-expected/ng-package.json | 0 .../array-and-object-expected/package.json | 0 .../array-and-object-expected/param.ts | 0 .../array-and-object-expected/tsconfig.json | 0 .../array-and-object-expected/variables.ts | 0 .../typescript/array-and-object-spec.json | 0 .../custom-path-params-expected/.gitignore | 0 .../custom-path-params-expected/README.md | 0 .../custom-path-params-expected/api.module.ts | 0 .../custom-path-params-expected/api/api.ts | 0 .../api/matrixParams.service.ts | 0 .../configuration.ts | 0 .../custom-path-params-expected/encoder.ts | 0 .../custom-path-params-expected/git_push.sh | 0 .../custom-path-params-expected/index.ts | 0 .../model/complexParams.ts | 0 .../model/models.ts | 0 .../ng-package.json | 0 .../custom-path-params-expected/package.json | 0 .../custom-path-params-expected/param.ts | 0 .../custom-path-params-expected/tsconfig.json | 0 .../custom-path-params-expected/variables.ts | 0 .../typescript/custom-path-params-spec.json | 0 .../typescript/node-es5-expected/.gitignore | 0 .../.openapi-generator-ignore | 0 .../typescript/node-es5-expected/LICENSE | 0 .../typescript/node-es5-expected/api.ts | 0 .../typescript/node-es5-expected/git_push.sh | 0 .../typescript/node-es5-expected/package.json | 0 .../node-es5-expected/tsconfig.json | 0 .../typescript/node-es5-expected/typings.json | 0 .../typescript/node-es5-spec.json | 0 .../objectsWithEnums-expected/.gitignore | 0 .../.openapi-generator-ignore | 0 .../.openapi-generator/VERSION | 0 .../objectsWithEnums-expected/api.ts | 0 .../objectsWithEnums-expected/api/apis.ts | 0 .../api/defaultApi.ts | 0 .../objectsWithEnums-expected/git_push.sh | 0 .../model/externalEnum.ts | 0 .../objectsWithEnums-expected/model/models.ts | 0 .../model/objectWithEnums.ts | 0 .../objectsWithEnums-expected/package.json | 0 .../objectsWithEnums-expected/tsconfig.json | 0 .../typescript/objectsWithEnums-spec.json | 0 .../typescript/petstore-expected/.gitignore | 0 .../typescript/petstore-expected/README.md | 0 .../petstore-expected/api.module.ts | 0 .../typescript/petstore-expected/api/api.ts | 0 .../petstore-expected/api/pet.service.ts | 0 .../petstore-expected/api/store.service.ts | 0 .../petstore-expected/api/user.service.ts | 0 .../petstore-expected/configuration.ts | 0 .../typescript/petstore-expected/encoder.ts | 0 .../typescript/petstore-expected/git_push.sh | 0 .../typescript/petstore-expected/index.ts | 0 .../petstore-expected/model/apiResponse.ts | 0 .../petstore-expected/model/category.ts | 0 .../petstore-expected/model/models.ts | 0 .../petstore-expected/model/order.ts | 0 .../typescript/petstore-expected/model/pet.ts | 0 .../typescript/petstore-expected/model/tag.ts | 0 .../petstore-expected/model/user.ts | 0 .../petstore-expected/ng-package.json | 0 .../typescript/petstore-expected/package.json | 0 .../typescript/petstore-expected/param.ts | 0 .../petstore-expected/tsconfig.json | 0 .../typescript/petstore-expected/variables.ts | 0 .../typescript/petstore-spec.json | 0 .../test/resources/jsoncodable.yaml | 0 .../src => src}/test/resources/logback.xml | 0 .../test/resources/npe-test-spec-file.yaml | 0 .../src => src}/test/resources/npe-test.yaml | 0 .../badPack/com/example/SimpleClass.kt | 0 .../normalPack/com/example/SimpleClass.kt | 0 .../src => src}/test/resources/petstore.json | 0 .../test/resources/sampleConfig.json | 0 .../test/resources/split-import.json | 0 .../src => src}/test/resources/swagger.yaml | 0 .../resources/templating/templates/.gitignore | 0 .../resources/templating/templates/README.md | 0 .../templating/templates/jmeter/api.hbs | 0 .../templates/jmeter/testdata-localhost.hbs | 0 .../templating/templates/numbers.handlebars | 0 .../templating/templates/simple.mustache | 0 1363 files changed, 260 insertions(+), 2585 deletions(-) delete mode 100644 modules/openapi-json-schema-generator/pom.xml delete mode 100644 openapi_feature_info/opeanpi_feature_info_3_0_X.yaml rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/clicommands/AbstractCommand.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplate.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/clicommands/Completion.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/clicommands/Help.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/clicommands/ListGenerators.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/clicommands/Meta.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/clicommands/Validate.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/clicommands/Version.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/clicommands/common/BuildInfo.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/clicommands/common/Constants.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/clicommands/common/GlobalOptions.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/common/CodegenConstants.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/common/DryRunStatus.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/common/ImplementationVersion.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/common/JsonCache.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/common/JsonCacheImpl.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/common/Markdown.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/common/ModelUtils.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/common/OnceLogger.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/common/OpenAPISerializer.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/common/OptionUtils.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/common/ProcessUtils.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/common/SemVer.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/common/SerializerUtils.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/common/StringUtils.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/common/URLPathUtils.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/config/AuthParser.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/config/ClientOptInput.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/config/CodegenConfiguratorUtils.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/config/Context.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/config/DynamicSettings.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/config/GeneratorSettings.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/config/GlobalSettings.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/config/SpecValidationException.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorRunner.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/CodegenIgnoreProcessor.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/DirectoryRule.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/EverythingRule.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/FileRule.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/IgnoreLineParser.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/InvalidRule.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/ParserException.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/Part.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/RootedFileRule.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/Rule.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/AbstractPythonGenerator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/Generator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/features/BeanValidationExtendedFeatures.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/features/BeanValidationFeatures.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/features/CXFExtServerFeatures.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/features/CXFFeatures.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/features/CXFServerFeatures.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/features/DocumentationProviderFeatures.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/features/GzipFeatures.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/features/GzipTestFeatures.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/features/JbossFeature.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/features/LoggingFeatures.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/features/LoggingTestFeatures.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/features/OptionalFeatures.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/features/PerformBeanValidationFeatures.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/features/SpringFeatures.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/features/SwaggerFeatures.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/features/SwaggerUIFeatures.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/features/UseGenericResponseFeatures.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorLoader.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorNotFoundException.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSet.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorLanguage.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorMetadata.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorType.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/Stability.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ClientModificationFeature.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ComponentsFeature.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/DataTypeFeature.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/DocumentationFeature.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/GlobalFeature.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/OperationFeature.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ParameterFeature.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/SchemaFeature.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/SecurityFeature.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/WireFormatFeature.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/AnnotationType.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/OAS2.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/OAS3.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/ToolingExtension.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/models/CliOption.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/models/VendorExtension.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/ArrayListWithContext.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenCallback.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenDiscriminator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenEncoding.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenHeader.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenKey.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenMediaType.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOauthFlow.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOauthFlows.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOperation.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenParameter.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPathItem.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPatternInfo.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenRefInfo.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenRequestBody.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenResponse.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityRequirementValue.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityScheme.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenServer.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenTag.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenXml.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/EnumInfo.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/EnumValue.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/InlineContext.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/LinkedHashMapWithContext.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/PairCacheKey.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/generators/openapimodels/SchemaTestCase.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/AbstractTemplatingEngineAdapter.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/CommonTemplateContentLocator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/DryRunTemplateManager.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/GeneratorTemplateContentLocator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/HandlebarsEngineAdapter.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/MustacheEngineAdapter.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/SupportingFile.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/TemplateDefinition.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/TemplateFileType.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/TemplateManager.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/TemplateManagerOptions.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/TemplateNotFoundException.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/TemplatePathLocator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/TemplateProcessor.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineAdapter.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineLoader.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/TemplatingExecutor.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/TemplatingGenerator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/handlebars/CustomHelpers.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/handlebars/StringHelpers.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/mustache/CaseFormatLambda.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/mustache/IndentedLambda.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/mustache/JoinWithCommaLambda.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambda.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/mustache/OnChangeLambda.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/mustache/OptionalParameterLambda.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/mustache/PrefixWithHashLambda.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/mustache/RequiredParameterLambda.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/mustache/SnakecaseLambda.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/mustache/SplitStringLambda.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/mustache/TitlecaseLambda.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/mustache/TrimWhitespaceLambda.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/templating/mustache/UppercaseLambda.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/OpenApiEvaluator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/OpenApiOperationValidations.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/OpenApiParameterValidations.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaValidations.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/OpenApiSecuritySchemeValidations.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/OperationWrapper.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/ParameterWrapper.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/RuleConfiguration.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/SchemaWrapper.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/SecuritySchemeWrapper.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/ValidationConstants.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/validators/GenericValidator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/validators/Invalid.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/validators/Severity.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/validators/Valid.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/validators/Validated.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/validators/ValidationResult.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/validators/ValidationRule.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/java/org/openapijsonschematools/codegen/validation/validators/Validator.java (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/BeanValidationException.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/Configuration.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/CustomInstantDeserializer.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/JSON.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/JavaTimeFormatter.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/Pair.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/README.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/RFC3339DateFormat.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/ServerConfiguration.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/ServerVariable.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/StringUtil.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/additionalEnumTypeAnnotations.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/additionalModelTypeAnnotations.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/apiException.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/apiOperation.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/api_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/api_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/auth/ApiKeyAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/auth/Authentication.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/auth/HttpBasicAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/auth/HttpBearerAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/auth/OAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/auth/OAuthFlow.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/beanValidation.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/beanValidationCore.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/beanValidationQueryParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/build.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/build.sbt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/enum_outer_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/generatedAnnotation.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/git_push.sh.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/gitignore.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/gradle-wrapper.jar (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/gradle-wrapper.properties.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/gradle.properties.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/gradlew.bat.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/gradlew.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/jackson_annotations.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/apache-httpclient/README.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/apache-httpclient/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/apache-httpclient/api_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/apache-httpclient/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/ApiResponseDecoder.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/EncodingUtils.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/ParamExpander.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/README.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/api_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/auth/ApiErrorDecoder.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/auth/ApiKeyAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/auth/DefaultApi20Impl.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/auth/HttpBasicAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/auth/HttpBearerAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/auth/OAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/auth/OauthClientCredentialsGrant.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/auth/OauthPasswordGrant.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/build.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/build.sbt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/model/ApiResponse.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/model_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/feign/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/google-api-client/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/google-api-client/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/google-api-client/api_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/google-api-client/build.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/google-api-client/build.sbt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/google-api-client/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/ApiResponse.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/JSON.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/additional_properties.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/anyof_model.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/apiException.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/api_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/api_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/auth/ApiKeyAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/auth/Authentication.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/auth/HttpBasicAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/auth/HttpBearerAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/auth/HttpSignatureAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/auth/OAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/auth/OAuthFlow.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/build.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/build.sbt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/model.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/model_anyof_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/model_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/model_oneof_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/model_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/oneof_model.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/pojo.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey2/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/AbstractOpenApiSchema.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/ApiResponse.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/JSON.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/additional_properties.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/anyof_model.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/apiException.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/api_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/api_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/auth/ApiKeyAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/auth/Authentication.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/auth/HttpBasicAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/auth/HttpBearerAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/auth/HttpSignatureAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/auth/OAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/auth/OAuthFlow.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/build.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/build.sbt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/generatedAnnotation.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/model.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/model_anyof_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/model_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/model_oneof_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/model_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/oneof_model.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/pojo.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/jersey3/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/README.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/api_exception.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/api_exception_mapper.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/api_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/beanValidation.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/beanValidationCore.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/beanValidationHeaderParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/beanValidationPathParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/beanValidationQueryParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/bodyParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/bodyParamsImpl.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/enumClass.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/enumOuterClass.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/formParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/formParamsImpl.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/generatedAnnotation.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/headerParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/headerParamsImpl.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/kumuluzee.beans.xml.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/kumuluzee.config.yaml.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/kumuluzee.pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/licenseInfo.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/model.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/pathParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/pathParamsImpl.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/pojo.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/pom_3.0.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/queryParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/queryParamsImpl.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/microprofile/returnTypes.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/AbstractOpenApiSchema.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/ApiResponse.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/JSON.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/README.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/additional_properties.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/anyof_model.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/apiException.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/api_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/api_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/build.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/generatedAnnotation.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/gradle.properties.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/model.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/model_anyof_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/model_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/model_oneof_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/oneof_model.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/pojo.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/native/travis.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/AbstractOpenApiSchema.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/ApiCallback.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/ApiResponse.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/GzipRequestInterceptor.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/JSON.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/ProgressResponseBody.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/README.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/additional_properties.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/anyof_model.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/apiException.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/api_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/api_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/auth/ApiKeyAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/auth/Authentication.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/auth/HttpBearerAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/auth/OAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/auth/OAuthOkHttpClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/auth/RetryingOAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/model.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/model_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/oneof_model.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/pojo.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/okhttp-gson/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/rest-assured/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/rest-assured/GsonObjectMapper.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/rest-assured/JacksonObjectMapper.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/rest-assured/Oper.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/rest-assured/README.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/rest-assured/ResponseSpecBuilders.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/rest-assured/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/rest-assured/api_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/rest-assured/api_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/rest-assured/build.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/rest-assured/build.sbt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/rest-assured/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/resteasy/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/resteasy/JSON.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/resteasy/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/resteasy/build.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/resteasy/build.sbt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/resteasy/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/resttemplate/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/resttemplate/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/resttemplate/api_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/resttemplate/auth/ApiKeyAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/resttemplate/auth/Authentication.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/resttemplate/auth/HttpBasicAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/resttemplate/auth/HttpBearerAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/resttemplate/auth/OAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/resttemplate/auth/OAuthFlow.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/resttemplate/build.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/resttemplate/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit/CollectionFormats.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit/README.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit/api_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit/auth/ApiKeyAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit/auth/HttpBasicAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit/auth/HttpBearerAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit/auth/OAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit/auth/OAuthOkHttpClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit/bodyParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit/build.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit/build.sbt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit/formParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit/headerParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit/pathParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit/queryParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/CollectionFormats.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/JSON.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/README.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/api_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/auth/ApiKeyAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/auth/HttpBasicAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/auth/HttpBearerAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/auth/OAuthOkHttpClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/bodyParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/build.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/build.sbt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/formParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/formParams.mustache.save (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/headerParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/pathParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/play-common/auth/ApiKeyAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/play24/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/play24/Play24CallAdapterFactory.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/play24/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/play25/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/play25/Play25CallAdapterFactory.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/play25/Play25CallFactory.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/play25/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/play26/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/play26/Play26CallAdapterFactory.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/play26/Play26CallFactory.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/play26/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/retrofit2/queryParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/vertx/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/vertx/Configuration.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/vertx/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/vertx/apiException.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/vertx/apiImpl.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/vertx/api_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/vertx/auth/ApiKeyAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/vertx/auth/Authentication.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/vertx/auth/HttpBasicAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/vertx/auth/HttpBearerAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/vertx/auth/OAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/vertx/auth/OAuthFlow.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/vertx/build.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/vertx/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/vertx/rxApiImpl.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/webclient/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/webclient/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/webclient/api_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/webclient/auth/ApiKeyAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/webclient/auth/Authentication.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/webclient/auth/HttpBasicAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/webclient/auth/HttpBearerAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/webclient/auth/OAuth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/webclient/auth/OAuthFlow.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/webclient/build.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/libraries/webclient/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/licenseInfo.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/manifest.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/maven.yml.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/model.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/modelEnum.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/modelInnerEnum.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/model_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/model_test.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/oneof_interface.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/openapi.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/pojo.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/pojo_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/settings.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/travis.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/typeInfoAnnotation.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/Java/xmlAnnotation.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/META-INF/services/org.openapijsonschematools.codegen.generators.Generator (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/META-INF/services/org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/_common/.gitignore (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/_common/.openapi-generator-ignore (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/codegen/README.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/codegen/api.template (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/codegen/generatorClass.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/codegen/generatorClassTest.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/codegen/kotlin/README.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/codegen/kotlin/build_gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/codegen/kotlin/generatorClass.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/codegen/kotlin/generatorClassTest.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/codegen/kotlin/gradle.properties (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/codegen/kotlin/settings.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/codegen/model.template (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/codegen/myFile.template (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/codegen/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/codegen/services.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/README.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/api_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/build.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/class_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/data_class.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/data_class_opt_var.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/data_class_req_var.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/enum_class.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/enum_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/gradle-wrapper.jar (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/gradle-wrapper.properties.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/gradlew.bat.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/gradlew.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/infrastructure/ApiAbstractions.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/infrastructure/PartConfig.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/infrastructure/RequestConfig.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/infrastructure/RequestMethod.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/interface_opt_var.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/interface_req_var.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/jvm-common/infrastructure/AtomicBooleanAdapter.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/jvm-common/infrastructure/AtomicIntegerAdapter.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/jvm-common/infrastructure/AtomicLongAdapter.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/jvm-common/infrastructure/BigDecimalAdapter.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/jvm-common/infrastructure/BigIntegerAdapter.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/jvm-common/infrastructure/ByteArrayAdapter.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/jvm-common/infrastructure/LocalDateAdapter.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/jvm-common/infrastructure/LocalDateTimeAdapter.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/jvm-common/infrastructure/OffsetDateTimeAdapter.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/jvm-common/infrastructure/Serializer.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/jvm-common/infrastructure/SerializerHelper.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/jvm-common/infrastructure/StringBuilderAdapter.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/jvm-common/infrastructure/URIAdapter.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/jvm-common/infrastructure/URLAdapter.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/jvm-common/infrastructure/UUIDAdapter.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/jvm-common/infrastructure/proguard-rules.pro.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-ktor/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-ktor/auth/ApiKeyAuth.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-ktor/auth/Authentication.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-ktor/auth/HttpBasicAuth.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-ktor/auth/HttpBearerAuth.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-ktor/auth/OAuth.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-ktor/infrastructure/ApiClient.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-ktor/infrastructure/HttpResponse.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiResponse.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/Errors.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ResponseExtensions.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/api_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/ApiKeyAuth.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBasicAuth.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBearerAuth.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuth.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuthFlow.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuthOkHttpClient.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/bodyParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/explodedQueryParam.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/formParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/headerParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/CollectionFormats.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ResponseExt.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/paramJavadoc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/pathParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/queryParam.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-retrofit2/queryParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/README.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/api_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/auth/apikeyauth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/auth/authentication.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/auth/httpbasicauth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/auth/oauth.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/bodyParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/build.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/formParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/gradle.properties.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/headerParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/infrastructure/CollectionFormats.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/infrastructure/ITransformForStorage.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/manifest.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/pathParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/queryParams.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/request/GsonRequest.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/request/IRequestFactory.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/jvm-volley/request/RequestFactory.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/auth/ApiKeyAuth.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/auth/Authentication.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/auth/HttpBasicAuth.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/auth/HttpBearerAuth.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/auth/OAuth.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/commonTest/Coroutine.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/infrastructure/ApiClient.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/infrastructure/Base64ByteArray.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/infrastructure/Bytes.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/infrastructure/HttpResponse.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/infrastructure/OctetByteArray.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/iosTest/Coroutine.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/jsTest/Coroutine.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/jvmTest/Coroutine.kt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_request_list.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_request_map.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_response_list.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_response_map.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/libraries/multiplatform/settings.gradle.kts.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/licenseInfo.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/model.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/modelMutable.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/model_doc.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/model_room.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/model_room_init_var.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/settings.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/kotlin-client/typeInfoAnnotation.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/logback.xml (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/README.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/README_onlypackage.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/__init__.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/__init__package.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/__init__test_paths.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/_helper_footer_links.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/_helper_header.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/_helper_imports.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/_helper_readme_common.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/_helper_required_libraries.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/_helper_schema_python_type_newline.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/_helper_schema_python_types.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/_helper_schema_python_types_newline.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/api_client.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/api_response.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/apis/__init__.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/apis/apis_path_to_api.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/apis/apis_tag_to_api.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/apis/paths/__init__.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/apis/paths/api.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/apis/tags/__init__.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/apis/tags/api.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/apis/tags/api_doc.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/_helper_anchor_id.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/_helper_content_schema_output_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/_helper_content_schema_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/_helper_header_from_identifier_pieces.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/_helper_param_or_header_instance.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/_helper_schema_accessed_types.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/headers/header.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/headers/header_doc.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/parameters/parameter.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/parameters/parameter_doc.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/request_bodies/request_body.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/request_bodies/request_body_doc.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/responses/response.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/responses/response_doc.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/__init__schema.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/__init__schemas.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_allof_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_anyof_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_array_input_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_array_output_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_composed_schemas.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_dict_partial.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_enum_class.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_getschemas.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_identifier_suffix.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_list_partial.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_new.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_notes_msg.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_object_get_property.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_object_output_properties.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_object_output_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_oneof_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_optional_properties_input_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_payload_renderer.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_prefix_property_value_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_prefix_ref_property_value_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_properties_input_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_properties_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_property_value_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_refclass_partial.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_required_properties_input_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_schema_composed_or_anytype.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_schema_dict.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_schema_enum.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_schema_input_ref_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_schema_input_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_schema_input_type_base.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_schema_list.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_schema_output_ref_single.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_schema_output_ref_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_schema_output_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_schema_output_type_base.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_schema_output_type_single.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_schema_python_base_types.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_schema_python_base_types_newline.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_schema_simple.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_schema_switch_case.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_types.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_types_all_accessed_oneline.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_types_all_incl_schema_oneline.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_validate.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_validate_args.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_validate_bool_overload.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_validate_int_overload.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_validate_str_overload.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_validations.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_var_equals_cls.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/_helper_xbase_one_type.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/schema.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/schema_doc.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/schemas/schema_test.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/security_schemes/security_scheme.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/components/security_schemes/security_scheme_doc.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/configurations/api_configuration.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/configurations/schema_configuration.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/exceptions.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/git_push.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/gitignore.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/gitlab-ci.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/migration_2_0_0.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/migration_3_0_0.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/migration_other_python_generators.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/paths/__init__paths.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/paths/path/__init__path.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/paths/path/verb/_helper_operation_args.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/paths/path/verb/_helper_operation_args_body.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/paths/path/verb/_helper_operation_args_optional.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/paths/path/verb/_helper_operation_args_passed.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/paths/path/verb/_helper_operation_args_required.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/paths/path/verb/_helper_operation_body_serialization.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/paths/path/verb/_helper_operation_doc_configuration_partial.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/paths/path/verb/_helper_operation_doc_example.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/paths/path/verb/_helper_operation_doc_security_scheme_info_partial.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/paths/path/verb/_helper_operation_docs_xparams.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/paths/path/verb/_helper_operation_response_type_hint.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/paths/path/verb/_helper_operation_test_partial.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/paths/path/verb/_helper_operation_test_response_content.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/paths/path/verb/operation.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/paths/path/verb/operation_doc.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/paths/path/verb/operation_test.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/pyproject.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/rest.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/schemas/__init__.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/schemas/format.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/schemas/original_immutabledict.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/schemas/schema.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/schemas/schemas.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/schemas/validation.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/security/security.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/security_schemes.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/server.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/servers/server.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/servers/server_doc.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/shared_imports/header_imports.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/shared_imports/operation_imports.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/shared_imports/response_imports.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/shared_imports/schema_imports.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/shared_imports/security_scheme_imports.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/shared_imports/server_imports.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/signing.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/test-requirements.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/tox.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/python/travis.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/main/resources/validator/index.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/ArchUnitRulesTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/TestUtils.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplateTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/clicommands/GenerateBatchTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/clicommands/GenerateTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/clicommands/OptionUtilsTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/common/JsonCacheTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/common/ModelUtilsTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/common/OnceLoggerTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/common/SerializerUtilsTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/common/StringUtilsTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/common/URLPathUtilsTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/config/SpecValidationExceptionTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/config/WorkflowSettingsTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generators/AbstractJavaGeneratorExampleValuesTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generators/features/DocumentationProviderFeaturesTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSetTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generators/javaassertions/AbstractAnnotationAssert.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ConstructorAssert.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generators/javaassertions/JavaFileAssert.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generators/javaassertions/MethodAnnotationAssert.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generators/javaassertions/MethodAssert.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ParameterAnnotationAssert.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ParameterAssert.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generators/javaassertions/PropertyAnnotationAssert.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generators/javaassertions/PropertyAssert.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generators/javaassertions/TypeAnnotationAssert.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generators/options/AbstractOptionsTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generators/options/OptionsProvider.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/generators/options/PythonClientOptionsProvider.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/templating/HandlebarsEngineAdapterTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/templating/TemplateManagerTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/templating/handlebars/StringHelpersTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambdaTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/templating/mustache/IndentedLambdaTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/templating/mustache/LambdaTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambdaTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/templating/mustache/OnChangeLambdaTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/templating/mustache/PascalCaseLambdaTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/templating/mustache/SnakecaseLambdaTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/templating/mustache/SplitStringLambdaTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/templating/mustache/TitlecaseLambdaTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/templating/mustache/TrimWhitespaceLambdaTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/templating/mustache/UppercaseLambdaTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/testutils/AssertFile.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/testutils/IntegrationTestPathsConfig.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/validation/OpenApiOperationValidationsTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/validation/OpenApiParameterValidationsTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaTypeTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaValidationsTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/validation/OpenApiSecuritySchemeValidationsTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/validation/validators/GenericValidatorTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/validation/validators/ValidatedTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/java/org/openapijsonschematools/codegen/validation/validators/ValidationRuleTest.java (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/1_2/petstore-1.2/api-docs (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/1_2/petstore-1.2/pet (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/1_2/petstore-1.2/store (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/1_2/petstore-1.2/user (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/additional-properties-for-testing.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/allOfTest.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/arrayRefBody.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/bash-config.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/binaryDataTest.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/composed-allof.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/datePropertyTest.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/discriminatorTest.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/duplicateOperationIds.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/emptyBaseModel.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/globalConsumesAndProduces.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/globalProducesConsumesTest.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/globalSecurity.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/issue1226.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/issue_9086.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/issue_9086_expected.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/long_description_issue_7839.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/mapArgs.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/markdown.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/npe1.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/pathWithHtmlEntity.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/petstore-bash.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/petstore-nullable.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/petstore-orig.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/petstore-proto.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/petstore-security-test.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/petstore-vendor-mime.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/petstore-with-date-field.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/petstore-with-fake-endpoints-for-testing-playframework-with-security.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-saga-and-records.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/petstore-with-operations-without-required-params.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/petstore-with-spring-pageable.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/petstore.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/petstore.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/petstore_issue_7999.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/postBodyTest.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/python-prior/petstore-with-fake-endpoints-models-for-testing.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/refAliasedPrimitiveWithValidation.yml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/regression_6905.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/requiredTest.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/responseCodeTest.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/responseHeaderTest.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/responseSelectionTest.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/rust-server/rust-server-test.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/swift4Test.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/swift5Test.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/templates/Java/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/templates/Java/libraries/jersey2/ApiClient.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/templates/Java/libraries/jersey2/JSON.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/templates/Java/libraries/jersey2/api.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/templates/Java/libraries/jersey2/build.gradle.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/templates/Java/libraries/jersey2/build.sbt.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/templates/Java/model.mustache (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/v1beta3.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/wordnik.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/wordnik.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/2_0/x-discriminator-value.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/11_regex.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/3134-regression.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/3248-regression-dates.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/3248-regression.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/6150_model_json_inline.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/70_schema_enum_names.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/additional-properties-deeply-nested.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/allOf-readonly.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/allOf-required-parent.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/allOf-required.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/allOf.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/allOfDuplicatedProperties.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/allOfMappingDuplicatedProperties.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/allOfMultiParent.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/allOf_composition.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/allOf_composition_discriminator.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/allOf_composition_discriminator_recursive.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/allOf_nullable.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/anyOf.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/anyOfDiscriminator.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/any_type.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/arrayParameter.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/arrayRefBody.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/asciidoc/api-docs.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/GET.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/curl-request.adoc (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/http-request.adoc (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/http-response.adoc (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/httpie-request.adoc (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/request-body.adoc (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/response-body.adoc (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/asciidoc/specs/rest/project/GET/implementation.adoc (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/asciidoc/specs/rest/project/GET/spec.adoc (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/aspnetcore/petstore.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/avro-schema/petstore.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/callbacks.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/component-deprecated.yml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/composed-oneof.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/composed-schemas.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/conflictingParameter.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/container-type-import.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/content-data.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/cpp-qt/petstore.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/deepobject-array-with-pattern.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/deepobject.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/elm.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/example_generator_test.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/examples.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/extensions/x-auth-id-alias.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/features/dynamic-servers.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/features/generate-alias-as-model.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/form-duplicated-parameter.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/form-multipart-binary-array.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/fromParameter.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/generic.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/inline_model_resolver.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/inline_request_body_no_components.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue-11340.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue-4062.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue11242.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue13146_file_abstraction_response.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue392.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue4584.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue4808.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue677.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue7262.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue7356.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue7506.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue796.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue8352.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue855.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue8986.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_10056.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_10330.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_10725.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_10792.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_10865_default_values.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_10866_bigdecimal_default.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_11521.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_11772.yml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_12196.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_12445.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_12857.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_13025.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_13043_geometry_collection_expected_value.txt (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_13043_recursive_model.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_13043_recursive_model_expected_value.txt (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_1347.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_1517.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_1997.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_2053.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_241.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_2908.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_3248.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_4832.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_4876_format_email.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_5381.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_5386.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_5436.yml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_6762.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_7193.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_7199_array_simple_string.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_7361.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_7372.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_7532.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_7532_tree_example_value_expected.txt (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_7533.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_7613.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_7614.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_7651.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_7791.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_8052_recursive_model.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_8052_recursive_model_expected_value.txt (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_8535.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_8906.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_8945.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_9282.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_9447.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue_9848.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issue______kotlinArrayEnumEmbedded.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/issues_13069.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/java/petstore-group-parameter.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature-okhttp-gson.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/javascript/petstore-with-fake-endpoints-models-for-testing.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/kotlin/bean-qualifiers.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/kotlin/issue10591-enum-defaultValue.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/kotlin/issue11088-model-mutable-with-containers.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/kotlin/issue13506-defaultValue-numbers.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/kotlin/issue5497-use-tags-kotlin.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/kotlin/issue7325-use-delegate-reactive-tags-kotlin.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/kotlin/reserved_words.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/mapSchemas.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/markdown/expected/Models/Object.md (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/markdown/expected/Models/Object_InlinedObject.md (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/markdown/expected/Models/ReferencedObject.md (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/markdown/expected/Models/String.md (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/markdown/expected/README.md (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/markdown/issue_6096.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/micronaut/content-type.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/micronaut/multi-tags-test.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/micronaut/oauth2.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/micronaut/roles-extension-test.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/model-deprecated.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/nonCompliantUseDiscriminatorIfCompositionFails.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/objectQueryParam.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/oneOf.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/oneOfArrayMapImport.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/oneOfDiscriminator.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/oneOf_primitive.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/petstore-multiple-required-properties-has-same-oneOf-object.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/petstore-with-complex-headers.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/petstore-with-depreacted-fields.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/petstore-with-nullable-required.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/petstore-with-object-as-parameter.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/petstore.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/petstore.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/petstore_oas3_test.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/php/issue_10244.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/ping.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/pingBearerAuth.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/pingSomeObj.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/powershell/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/powershell/petstore.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/produces.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/property-deprecated.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/protobuf-schema/pet.proto (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/protobuf/petstore.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/python-prior/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/python/petstore_customized.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/r/petstore.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/recursion.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/regression-6734.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/response-tests.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/rootOperation.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/rust-server/multipart-v3.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/rust-server/no-example-v3.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/rust-server/openapi-v3.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/rust-server/ops-v3.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/rust-server/ping-bearer-auth.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/rust/petstore.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/scala-akka/petstore.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/scala/issue_10187_operatorName.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/scala/petstore.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/scala/stripModelName.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/scala_reserved_words.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/schema-unalias-test.yml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/schema-with-nullable-arrays.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/schema-with-special-characters.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/security.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/server-required.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/setParameter.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/setResponse.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/spring/10167-nullable-set.yml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/spring/issue_10278.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/spring/issue_11323.yml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/spring/issue_5026-b.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/spring/issue_5026.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/spring/issue_8045.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/streaming.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/tags.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/test_regex.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/two-responses.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/type-alias.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/type_alias.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/type_mapping_test.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/typescript-axios/with-separate-models-and-api-inheritance.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/typescript-fetch/enum.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/typescript/unique_items.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/.gitignore (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/3_0_3_unit_test_spec.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/LICENSE (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/additionalItems.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/additionalProperties.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/allOf.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/anyOf.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/boolean_schema.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/const.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/contains.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/default.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/definitions.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/dependencies.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/enum.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/exclusiveMaximum.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/exclusiveMinimum.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/format.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/id.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/infinite-loop-detection.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/items.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/maxItems.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/maxLength.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/maxProperties.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/maximum.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/minItems.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/minLength.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/minProperties.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/minimum.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/multipleOf.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/not.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/oneOf.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/optional/bignum.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/optional/ecmascript-regex.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/optional/float-overflow.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/optional/format/date-time.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/optional/format/email.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/optional/format/hostname.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/optional/format/ipv4.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/optional/format/ipv6.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/optional/format/json-pointer.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/optional/format/unknown.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/optional/format/uri-reference.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/optional/format/uri-template.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/optional/format/uri.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/optional/future-keywords.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/optional/non-bmp-regex.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/pattern.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/patternProperties.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/properties.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/propertyNames.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/ref.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/refRemote.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/required.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/type.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/uniqueItems.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/draft6/unknownKeyword.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/openapi_additions/additionalProperties.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/openapi_additions/multipleOf.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/openapi_additions/ref.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/openapi_additions/type.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unit_test_spec/spec_writer.py (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/unusedSchemas.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_0/wsdl/petstore.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_1/null-types-with-type-array.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_1/null-types.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/3_1/petstore.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/archunit_ignore_patterns.txt (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/batch/common/jaxrs-datelib-j8.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/batch/common/jaxrs-datelib-j8.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/batch/jaxrs-datelib-j8-double.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/batch/jaxrs-datelib-j8-double.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/batch/jaxrs-datelib-j8-json-include.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/batch/jaxrs-datelib-j8-nested-include-property-merge.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/batch/jaxrs-datelib-j8-nested-include.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/batch/jaxrs-datelib-j8-nested-include.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/batch/jaxrs-datelib-j8-nested-property-merge.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/batch/jaxrs-datelib-j8-nested.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/batch/jaxrs-datelib-j8-nested.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/batch/jaxrs-datelib-j8-yaml-include.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/batch/jaxrs-datelib-j8.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/batch/jaxrs-datelib-j8.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/batch/specs/petstore.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/bugs/Swift5CodeGenerationBug2.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/bugs/Swift5CodeGenerationStackOverflow#2966.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/bugs/issue_11304_kotlin_backticks_reserved_words.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/bugs/issue_11464.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/bugs/issue_11731.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/bugs/issue_11897.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/bugs/issue_11957.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/bugs/issue_12457.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/bugs/issue_12494.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/bugs/issue_12622.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/bugs/issue_12692.yml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/bugs/issue_12790.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/bugs/issue_7125.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/bugs/issue_9719.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/bugs/recursion-bug-4650.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/codegen/scala/JavaTimeObj.scala.txt (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/codegen/scala/SomeObj.scala.txt (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/csharp/general/enum-support-spec.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/csharp/general/enum-support.ignore (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/csharp/general/enum-support.sh (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/scala/client/required-attributes-spec.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/scala/client/required-attributes.sh (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/additional-properties-expected/.gitignore (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/additional-properties-expected/README.md (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/additional-properties-expected/api.module.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/additional-properties-expected/api/api.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/additional-properties-expected/api/user.service.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/additional-properties-expected/configuration.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/additional-properties-expected/encoder.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/additional-properties-expected/git_push.sh (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/additional-properties-expected/index.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/additional-properties-expected/model/models.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/additional-properties-expected/model/user.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/additional-properties-expected/ng-package.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/additional-properties-expected/package.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/additional-properties-expected/param.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/additional-properties-expected/tsconfig.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/additional-properties-expected/variables.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/additional-properties-spec.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-expected/.gitignore (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-expected/README.md (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-expected/api.module.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-expected/api/api.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-expected/api/project.service.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-expected/configuration.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-expected/encoder.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-expected/git_push.sh (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-expected/index.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-expected/model/models.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-expected/model/projectEntity.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-expected/model/projectEntityLocation.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-expected/model/projectList.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-expected/ng-package.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-expected/package.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-expected/param.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-expected/tsconfig.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-expected/variables.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/array-and-object-spec.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/custom-path-params-expected/.gitignore (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/custom-path-params-expected/README.md (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/custom-path-params-expected/api.module.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/custom-path-params-expected/api/api.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/custom-path-params-expected/api/matrixParams.service.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/custom-path-params-expected/configuration.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/custom-path-params-expected/encoder.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/custom-path-params-expected/git_push.sh (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/custom-path-params-expected/index.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/custom-path-params-expected/model/complexParams.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/custom-path-params-expected/model/models.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/custom-path-params-expected/ng-package.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/custom-path-params-expected/package.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/custom-path-params-expected/param.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/custom-path-params-expected/tsconfig.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/custom-path-params-expected/variables.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/custom-path-params-spec.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/node-es5-expected/.gitignore (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/node-es5-expected/.openapi-generator-ignore (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/node-es5-expected/LICENSE (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/node-es5-expected/api.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/node-es5-expected/git_push.sh (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/node-es5-expected/package.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/node-es5-expected/tsconfig.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/node-es5-expected/typings.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/node-es5-spec.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/objectsWithEnums-expected/.gitignore (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/objectsWithEnums-expected/.openapi-generator-ignore (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/objectsWithEnums-expected/.openapi-generator/VERSION (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/objectsWithEnums-expected/api.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/objectsWithEnums-expected/api/apis.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/objectsWithEnums-expected/api/defaultApi.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/objectsWithEnums-expected/git_push.sh (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/externalEnum.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/models.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/objectWithEnums.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/objectsWithEnums-expected/package.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/objectsWithEnums-expected/tsconfig.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/objectsWithEnums-spec.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/.gitignore (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/README.md (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/api.module.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/api/api.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/api/pet.service.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/api/store.service.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/api/user.service.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/configuration.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/encoder.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/git_push.sh (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/index.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/model/apiResponse.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/model/category.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/model/models.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/model/order.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/model/pet.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/model/tag.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/model/user.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/ng-package.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/package.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/param.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/tsconfig.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-expected/variables.ts (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/integrationtests/typescript/petstore-spec.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/jsoncodable.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/logback.xml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/npe-test-spec-file.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/npe-test.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/org/openapijsonschematools/codegen/kotlin/KotlinTestUtilsTest/badPack/com/example/SimpleClass.kt (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/org/openapijsonschematools/codegen/kotlin/KotlinTestUtilsTest/normalPack/com/example/SimpleClass.kt (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/petstore.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/sampleConfig.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/split-import.json (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/swagger.yaml (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/templating/templates/.gitignore (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/templating/templates/README.md (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/templating/templates/jmeter/api.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/templating/templates/jmeter/testdata-localhost.hbs (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/templating/templates/numbers.handlebars (100%) rename {modules/openapi-json-schema-generator/src => src}/test/resources/templating/templates/simple.mustache (100%) diff --git a/Dockerfile b/Dockerfile index 7c809d1d451..aac0a6c6d7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,12 +11,11 @@ COPY ./LICENSE ${GEN_DIR} COPY ./google_checkstyle.xml ${GEN_DIR} # Modules are copied individually here to allow for caching of docker layers between major.minor versions -COPY ./modules/openapi-json-schema-generator-cli ${GEN_DIR}/modules/openapi-json-schema-generator-cli -COPY ./modules/openapi-json-schema-generator ${GEN_DIR}/modules/openapi-json-schema-generator +COPY ./src ${GEN_DIR}/src COPY ./pom.xml ${GEN_DIR} # Pre-compile openapi-generator-cli -RUN mvn -am -pl "modules/openapi-json-schema-generator-cli" package +RUN mvn -am -pl . package # This exists at the end of the file to benefit from cached layers when modifying docker-entrypoint.sh. COPY docker-entrypoint.sh /usr/local/bin/ diff --git a/modules/openapi-json-schema-generator/pom.xml b/modules/openapi-json-schema-generator/pom.xml deleted file mode 100644 index 6d40c8f018a..00000000000 --- a/modules/openapi-json-schema-generator/pom.xml +++ /dev/null @@ -1,456 +0,0 @@ - - - org.openapijsonschematools - openapi-json-schema-generator-project - ${revision} - ../.. - - 4.0.0 - openapi-json-schema-generator - jar - openapi-json-schema-generator (core library) - - src/main/java - install - - - src/main/resources - - logback.xml - - - - - - org.jvnet.wagon-svn - wagon-svn - ${wagon-svn.version} - - - org.apache.maven.wagon - wagon-ssh-external - ${wagon-ssh-external.version} - - - org.apache.maven.wagon - wagon-webdav - ${wagon-webdav.version} - - - target - ${project.artifactId}-${project.version} - - - pl.project13.maven - git-commit-id-plugin - - - get-the-git-infos - - revision - - initialize - - - - true - ${project.build.outputDirectory}/openapi-json-schema-generator-git.properties - - - ^git.build.(time|version)$ - ^git.commit.id.(abbrev|full)$ - - full - ${project.parent.basedir}${file.separator}.git - false - false - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - ${project.parent.basedir}${file.separator}google_checkstyle.xml - - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - - java - - - - - org.openapi-tools.codegen.OpenAPIGenerator - - - - maven-dependency-plugin - - - package - - copy-dependencies - - - ${project.build.directory}/lib - - - - - - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${maven.compiler.source} - ${maven.compiler.source} - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven-jar-plugin.version} - - - - development - ${project.url} - ${project.version} - org.openapi-tools - - - - - - - test-jar - - - - - - org.apache.maven.plugins - maven-site-plugin - ${maven-site-plugin.version} - - - org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} - - - - - - release-profile - - true - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - - static-analysis - - - - com.github.spotbugs - spotbugs-maven-plugin - - ${project.parent.basedir}${file.separator}spotbugs-exclude.xml - - - - org.apache.maven.plugins - maven-pmd-plugin - - - se.bjurr.violations - violations-maven-plugin - - - 65 - - - - - - - - target/site - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - true - - http://java.sun.com/javaee/5/docs/api - http://java.sun.com/j2se/1.5.0/docs/api - - - - - - org.apache.maven.plugins - maven-jxr-plugin - 3.0.0 - - true - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - ${maven-project-info-reports-plugin.version} - - - - project-team - - - - - - - - - ${swagger-parser-groupid.version} - swagger-parser - ${swagger-parser.version} - - - com.samskivert - jmustache - ${jmustache.version} - - - com.github.jknack - handlebars - ${handlebars-java.version} - - - com.github.jknack - handlebars-jackson2 - ${handlebars-java.version} - - - commons-io - commons-io - ${commons-io.version} - - - org.slf4j - slf4j-ext - ${slf4j.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-simple - ${slf4j.version} - - - org.apache.commons - commons-lang3 - ${commons-lang.version} - - - org.apache.commons - commons-text - ${commons-text.version} - - - commons-cli - commons-cli - ${commons-cli.version} - - - com.google.guava - guava - ${guava.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-guava - ${jackson.version} - - - com.tngtech.archunit - archunit - ${archunit.version} - test - - - com.tngtech.archunit - archunit-junit4 - ${archunit.version} - test - - - org.testng - testng - ${testng.version} - test - - - com.github.javaparser - javaparser-core - 3.24.0 - test - - - org.openrewrite - rewrite-maven - test - - - org.reflections - reflections - ${reflections.version} - test - - - com.googlecode.java-diff-utils - diffutils - ${diffutils.version} - test - - - com.atlassian.commonmark - commonmark - 0.11.0 - - - org.mockito - mockito-core - ${mockito.version} - test - - - com.github.mifmif - generex - ${generex.version} - - - com.github.curious-odd-man - rgxgen - ${rxgen.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - ${jackson.version} - - - com.github.joschi.jackson - jackson-datatype-threetenbp - ${jackson-threetenbp.version} - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin.version} - test - - - org.jetbrains.kotlin - kotlin-compiler-embeddable - ${kotlin.version} - test - - - org.jetbrains.kotlin - kotlin-script-util - ${kotlin.version} - test - - - com.google.guava - guava-testlib - 28.2-jre - test - - - net.java.dev.jna - jna - 5.5.0 - - - com.github.ben-manes.caffeine - caffeine - 2.8.1 - - - org.assertj - assertj-core - 3.19.0 - test - - - - io.airlift - airline - 0.8 - - - com.googlecode.lambdaj - lambdaj - 2.3.3 - - - ch.qos.logback - logback-classic - 1.2.10 - - - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - true - - - - diff --git a/openapi_feature_info/opeanpi_feature_info_3_0_X.yaml b/openapi_feature_info/opeanpi_feature_info_3_0_X.yaml deleted file mode 100644 index e9d70c8e013..00000000000 --- a/openapi_feature_info/opeanpi_feature_info_3_0_X.yaml +++ /dev/null @@ -1,1024 +0,0 @@ -id: https://spec.openapis.org/oas/3.0/schema/2021-09-28 -$schema: http://json-schema.org/draft-04/schema# -description: The description of OpenAPI v3.0.x documents, as defined by https://spec.openapis.org/oas/v3.0.3 -type: object -required: - - openapi - - info - - paths -properties: - openapi: - type: string - pattern: ^3\.0\.\d(-.+)?$ - info: - $ref: '#/definitions/Info' - externalDocs: - $ref: '#/definitions/ExternalDocumentation' - servers: - type: array - items: - $ref: '#/definitions/Server' - security: - type: array - items: - $ref: '#/definitions/SecurityRequirement' - tags: - type: array - items: - $ref: '#/definitions/Tag' - uniqueItems: true - paths: - $ref: '#/definitions/Paths' - components: - $ref: '#/definitions/Components' -patternProperties: - '^x-': {} -additionalProperties: false -definitions: - Reference: - type: object - required: - - $ref - patternProperties: - '^\$ref$': - type: string - format: uri-reference - Info: - type: object - required: - - title - - version - properties: - title: - type: string - description: - type: string - termsOfService: - type: string - format: uri-reference - contact: - $ref: '#/definitions/Contact' - license: - $ref: '#/definitions/License' - version: - type: string - patternProperties: - '^x-': {} - additionalProperties: false - - - Contact: - type: object - properties: - name: - type: string - url: - type: string - format: uri-reference - email: - type: string - format: email - patternProperties: - '^x-': {} - additionalProperties: false - - License: - type: object - required: - - name - properties: - name: - type: string - url: - type: string - format: uri-reference - patternProperties: - '^x-': {} - additionalProperties: false - - Server: - type: object - required: - - url - properties: - url: - type: string - description: - type: string - variables: - type: object - additionalProperties: - $ref: '#/definitions/ServerVariable' - patternProperties: - '^x-': {} - additionalProperties: false - - ServerVariable: - type: object - required: - - default - properties: - enum: - type: array - items: - type: string - default: - type: string - description: - type: string - patternProperties: - '^x-': {} - additionalProperties: false - - Components: - type: object - properties: - schemas: - type: object - patternProperties: - '^[a-zA-Z0-9\.\-_]+$': - oneOf: - - $ref: '#/definitions/Schema' - - $ref: '#/definitions/Reference' - responses: - type: object - patternProperties: - '^[a-zA-Z0-9\.\-_]+$': - oneOf: - - $ref: '#/definitions/Reference' - - $ref: '#/definitions/Response' - parameters: - type: object - patternProperties: - '^[a-zA-Z0-9\.\-_]+$': - oneOf: - - $ref: '#/definitions/Reference' - - $ref: '#/definitions/Parameter' - examples: - type: object - patternProperties: - '^[a-zA-Z0-9\.\-_]+$': - oneOf: - - $ref: '#/definitions/Reference' - - $ref: '#/definitions/Example' - requestBodies: - type: object - patternProperties: - '^[a-zA-Z0-9\.\-_]+$': - oneOf: - - $ref: '#/definitions/Reference' - - $ref: '#/definitions/RequestBody' - headers: - type: object - patternProperties: - '^[a-zA-Z0-9\.\-_]+$': - oneOf: - - $ref: '#/definitions/Reference' - - $ref: '#/definitions/Header' - securitySchemes: - type: object - patternProperties: - '^[a-zA-Z0-9\.\-_]+$': - oneOf: - - $ref: '#/definitions/Reference' - - $ref: '#/definitions/SecurityScheme' - links: - type: object - patternProperties: - '^[a-zA-Z0-9\.\-_]+$': - oneOf: - - $ref: '#/definitions/Reference' - - $ref: '#/definitions/Link' - callbacks: - type: object - patternProperties: - '^[a-zA-Z0-9\.\-_]+$': - oneOf: - - $ref: '#/definitions/Reference' - - $ref: '#/definitions/Callback' - patternProperties: - '^x-': {} - additionalProperties: false - - Schema: - type: object - properties: - title: - type: string - multipleOf: - type: number - minimum: 0 - exclusiveMinimum: true - maximum: - type: number - exclusiveMaximum: - type: boolean - default: false - minimum: - type: number - exclusiveMinimum: - type: boolean - default: false - maxLength: - type: integer - minimum: 0 - minLength: - type: integer - minimum: 0 - default: 0 - pattern: - type: string - format: regex - maxItems: - type: integer - minimum: 0 - minItems: - type: integer - minimum: 0 - default: 0 - uniqueItems: - type: boolean - default: false - maxProperties: - type: integer - minimum: 0 - minProperties: - type: integer - minimum: 0 - default: 0 - required: - type: array - items: - type: string - minItems: 1 - uniqueItems: true - enum: - type: array - items: {} - minItems: 1 - uniqueItems: false - type: - type: string - enum: - - array - - boolean - - integer - - number - - object - - string - not: - oneOf: - - $ref: '#/definitions/Schema' - - $ref: '#/definitions/Reference' - allOf: - type: array - items: - oneOf: - - $ref: '#/definitions/Schema' - - $ref: '#/definitions/Reference' - oneOf: - type: array - items: - oneOf: - - $ref: '#/definitions/Schema' - - $ref: '#/definitions/Reference' - anyOf: - type: array - items: - oneOf: - - $ref: '#/definitions/Schema' - - $ref: '#/definitions/Reference' - items: - oneOf: - - $ref: '#/definitions/Schema' - - $ref: '#/definitions/Reference' - properties: - type: object - additionalProperties: - oneOf: - - $ref: '#/definitions/Schema' - - $ref: '#/definitions/Reference' - additionalProperties: - oneOf: - - $ref: '#/definitions/Schema' - - $ref: '#/definitions/Reference' - - type: boolean - default: true - description: - type: string - format: - type: string - default: {} - nullable: - type: boolean - default: false - discriminator: - $ref: '#/definitions/Discriminator' - readOnly: - type: boolean - default: false - writeOnly: - type: boolean - default: false - example: {} - externalDocs: - $ref: '#/definitions/ExternalDocumentation' - deprecated: - type: boolean - default: false - xml: - $ref: '#/definitions/XML' - patternProperties: - '^x-': {} - additionalProperties: false - - Discriminator: - type: object - required: - - propertyName - properties: - propertyName: - type: string - mapping: - type: object - additionalProperties: - type: string - - XML: - type: object - properties: - name: - type: string - namespace: - type: string - format: uri - prefix: - type: string - attribute: - type: boolean - default: false - wrapped: - type: boolean - default: false - patternProperties: - '^x-': {} - additionalProperties: false - - Response: - type: object - required: - - description - properties: - description: - type: string - headers: - type: object - additionalProperties: - oneOf: - - $ref: '#/definitions/Header' - - $ref: '#/definitions/Reference' - content: - type: object - additionalProperties: - $ref: '#/definitions/MediaType' - links: - type: object - additionalProperties: - oneOf: - - $ref: '#/definitions/Link' - - $ref: '#/definitions/Reference' - patternProperties: - '^x-': {} - additionalProperties: false - - MediaType: - type: object - properties: - schema: - oneOf: - - $ref: '#/definitions/Schema' - - $ref: '#/definitions/Reference' - example: {} - examples: - type: object - additionalProperties: - oneOf: - - $ref: '#/definitions/Example' - - $ref: '#/definitions/Reference' - encoding: - type: object - additionalProperties: - $ref: '#/definitions/Encoding' - patternProperties: - '^x-': {} - additionalProperties: false - allOf: - - $ref: '#/definitions/ExampleXORExamples' - - Example: - type: object - properties: - summary: - type: string - description: - type: string - value: {} - externalValue: - type: string - format: uri-reference - patternProperties: - '^x-': {} - additionalProperties: false - - Header: - type: object - properties: - description: - type: string - required: - type: boolean - default: false - deprecated: - type: boolean - default: false - allowEmptyValue: - type: boolean - default: false - style: - type: string - enum: - - simple - default: simple - explode: - type: boolean - allowReserved: - type: boolean - default: false - schema: - oneOf: - - $ref: '#/definitions/Schema' - - $ref: '#/definitions/Reference' - content: - type: object - additionalProperties: - $ref: '#/definitions/MediaType' - minProperties: 1 - maxProperties: 1 - example: {} - examples: - type: object - additionalProperties: - oneOf: - - $ref: '#/definitions/Example' - - $ref: '#/definitions/Reference' - patternProperties: - '^x-': {} - additionalProperties: false - allOf: - - $ref: '#/definitions/ExampleXORExamples' - - $ref: '#/definitions/SchemaXORContent' - - Paths: - type: object - patternProperties: - '^\/': - $ref: '#/definitions/PathItem' - '^x-': {} - additionalProperties: false - - PathItem: - type: object - properties: - $ref: - type: string - summary: - type: string - description: - type: string - get: - $ref: '#/definitions/Operation' - put: - $ref: '#/definitions/Operation' - post: - $ref: '#/definitions/Operation' - delete: - $ref: '#/definitions/Operation' - options: - $ref: '#/definitions/Operation' - head: - $ref: '#/definitions/Operation' - patch: - $ref: '#/definitions/Operation' - trace: - $ref: '#/definitions/Operation' - servers: - type: array - items: - $ref: '#/definitions/Server' - parameters: - type: array - items: - oneOf: - - $ref: '#/definitions/Parameter' - - $ref: '#/definitions/Reference' - uniqueItems: true - patternProperties: - '^x-': {} - additionalProperties: false - - Operation: - type: object - required: - - responses - properties: - tags: - type: array - items: - type: string - summary: - type: string - description: - type: string - externalDocs: - $ref: '#/definitions/ExternalDocumentation' - operationId: - type: string - parameters: - type: array - items: - oneOf: - - $ref: '#/definitions/Parameter' - - $ref: '#/definitions/Reference' - uniqueItems: true - requestBody: - oneOf: - - $ref: '#/definitions/RequestBody' - - $ref: '#/definitions/Reference' - responses: - $ref: '#/definitions/Responses' - callbacks: - type: object - additionalProperties: - oneOf: - - $ref: '#/definitions/Callback' - - $ref: '#/definitions/Reference' - deprecated: - type: boolean - default: false - security: - type: array - items: - $ref: '#/definitions/SecurityRequirement' - servers: - type: array - items: - $ref: '#/definitions/Server' - patternProperties: - '^x-': {} - additionalProperties: false - - Responses: - type: object - properties: - default: - oneOf: - - $ref: '#/definitions/Response' - - $ref: '#/definitions/Reference' - patternProperties: - '^[1-5](?:\d{2}|XX)$': - oneOf: - - $ref: '#/definitions/Response' - - $ref: '#/definitions/Reference' - '^x-': {} - minProperties: 1 - additionalProperties: false - - - SecurityRequirement: - type: object - additionalProperties: - type: array - items: - type: string - - Tag: - type: object - required: - - name - properties: - name: - type: string - description: - type: string - externalDocs: - $ref: '#/definitions/ExternalDocumentation' - patternProperties: - '^x-': {} - additionalProperties: false - - ExternalDocumentation: - type: object - required: - - url - properties: - description: - type: string - url: - type: string - format: uri-reference - patternProperties: - '^x-': {} - additionalProperties: false - - ExampleXORExamples: - description: Example and examples are mutually exclusive - not: - required: [example, examples] - - SchemaXORContent: - description: Schema and content are mutually exclusive, at least one is required - not: - required: [schema, content] - oneOf: - - required: [schema] - - required: [content] - description: Some properties are not allowed if content is present - allOf: - - not: - required: [style] - - not: - required: [explode] - - not: - required: [allowReserved] - - not: - required: [example] - - not: - required: [examples] - - Parameter: - type: object - properties: - name: - type: string - in: - type: string - description: - type: string - required: - type: boolean - default: false - deprecated: - type: boolean - default: false - allowEmptyValue: - type: boolean - default: false - style: - type: string - explode: - type: boolean - allowReserved: - type: boolean - default: false - schema: - oneOf: - - $ref: '#/definitions/Schema' - - $ref: '#/definitions/Reference' - content: - type: object - additionalProperties: - $ref: '#/definitions/MediaType' - minProperties: 1 - maxProperties: 1 - example: {} - examples: - type: object - additionalProperties: - oneOf: - - $ref: '#/definitions/Example' - - $ref: '#/definitions/Reference' - patternProperties: - '^x-': {} - additionalProperties: false - required: - - name - - in - allOf: - - $ref: '#/definitions/ExampleXORExamples' - - $ref: '#/definitions/SchemaXORContent' - - $ref: '#/definitions/ParameterLocation' - - ParameterLocation: - description: Parameter location - oneOf: - - description: Parameter in path - required: - - required - properties: - in: - enum: [path] - style: - enum: [matrix, label, simple] - default: simple - required: - enum: [true] - - - description: Parameter in query - properties: - in: - enum: [query] - style: - enum: [form, spaceDelimited, pipeDelimited, deepObject] - default: form - - - description: Parameter in header - properties: - in: - enum: [header] - style: - enum: [simple] - default: simple - - - description: Parameter in cookie - properties: - in: - enum: [cookie] - style: - enum: [form] - default: form - - RequestBody: - type: object - required: - - content - properties: - description: - type: string - content: - type: object - additionalProperties: - $ref: '#/definitions/MediaType' - required: - type: boolean - default: false - patternProperties: - '^x-': {} - additionalProperties: false - - SecurityScheme: - oneOf: - - $ref: '#/definitions/APIKeySecurityScheme' - - $ref: '#/definitions/HTTPSecurityScheme' - - $ref: '#/definitions/OAuth2SecurityScheme' - - $ref: '#/definitions/OpenIdConnectSecurityScheme' - - APIKeySecurityScheme: - type: object - required: - - type - - name - - in - properties: - type: - type: string - enum: - - apiKey - name: - type: string - in: - type: string - enum: - - header - - query - - cookie - description: - type: string - patternProperties: - '^x-': {} - additionalProperties: false - - HTTPSecurityScheme: - type: object - required: - - scheme - - type - properties: - scheme: - type: string - bearerFormat: - type: string - description: - type: string - type: - type: string - enum: - - http - patternProperties: - '^x-': {} - additionalProperties: false - oneOf: - - description: Bearer - properties: - scheme: - type: string - pattern: ^[Bb][Ee][Aa][Rr][Ee][Rr]$ - - - description: Non Bearer - not: - required: [bearerFormat] - properties: - scheme: - not: - type: string - pattern: ^[Bb][Ee][Aa][Rr][Ee][Rr]$ - - OAuth2SecurityScheme: - type: object - required: - - type - - flows - properties: - type: - type: string - enum: - - oauth2 - flows: - $ref: '#/definitions/OAuthFlows' - description: - type: string - patternProperties: - '^x-': {} - additionalProperties: false - - OpenIdConnectSecurityScheme: - type: object - required: - - type - - openIdConnectUrl - properties: - type: - type: string - enum: - - openIdConnect - openIdConnectUrl: - type: string - format: uri-reference - description: - type: string - patternProperties: - '^x-': {} - additionalProperties: false - - OAuthFlows: - type: object - properties: - implicit: - $ref: '#/definitions/ImplicitOAuthFlow' - password: - $ref: '#/definitions/PasswordOAuthFlow' - clientCredentials: - $ref: '#/definitions/ClientCredentialsFlow' - authorizationCode: - $ref: '#/definitions/AuthorizationCodeOAuthFlow' - patternProperties: - '^x-': {} - additionalProperties: false - - ImplicitOAuthFlow: - type: object - required: - - authorizationUrl - - scopes - properties: - authorizationUrl: - type: string - format: uri-reference - refreshUrl: - type: string - format: uri-reference - scopes: - type: object - additionalProperties: - type: string - patternProperties: - '^x-': {} - additionalProperties: false - - PasswordOAuthFlow: - type: object - required: - - tokenUrl - - scopes - properties: - tokenUrl: - type: string - format: uri-reference - refreshUrl: - type: string - format: uri-reference - scopes: - type: object - additionalProperties: - type: string - patternProperties: - '^x-': {} - additionalProperties: false - - ClientCredentialsFlow: - type: object - required: - - tokenUrl - - scopes - properties: - tokenUrl: - type: string - format: uri-reference - refreshUrl: - type: string - format: uri-reference - scopes: - type: object - additionalProperties: - type: string - patternProperties: - '^x-': {} - additionalProperties: false - - AuthorizationCodeOAuthFlow: - type: object - required: - - authorizationUrl - - tokenUrl - - scopes - properties: - authorizationUrl: - type: string - format: uri-reference - tokenUrl: - type: string - format: uri-reference - refreshUrl: - type: string - format: uri-reference - scopes: - type: object - additionalProperties: - type: string - patternProperties: - '^x-': {} - additionalProperties: false - - Link: - type: object - properties: - operationId: - type: string - operationRef: - type: string - format: uri-reference - parameters: - type: object - additionalProperties: {} - requestBody: {} - description: - type: string - server: - $ref: '#/definitions/Server' - patternProperties: - '^x-': {} - additionalProperties: false - not: - description: Operation Id and Operation Ref are mutually exclusive - required: [operationId, operationRef] - - Callback: - type: object - additionalProperties: - $ref: '#/definitions/PathItem' - patternProperties: - '^x-': {} - - Encoding: - type: object - properties: - contentType: - type: string - headers: - type: object - additionalProperties: - oneOf: - - $ref: '#/definitions/Header' - - $ref: '#/definitions/Reference' - style: - type: string - enum: - - form - - spaceDelimited - - pipeDelimited - - deepObject - explode: - type: boolean - allowReserved: - type: boolean - default: false - additionalProperties: false diff --git a/pom.xml b/pom.xml index 55f416d5a15..a08a861a71a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,62 +1,29 @@ - org.sonatype.oss - oss-parent - 5 - + org.openapijsonschematools + openapi-json-schema-generator-project + ${revision} + ../.. 4.0.0 - org.openapijsonschematools - openapi-json-schema-generator-project - pom - openapi-json-schema-generator-project + openapi-json-schema-generator + jar + openapi-json-schema-generator (core library) ${revision} - https://github.com/openapi-json-schema-tools/openapi-json-schema-generator - - scm:git:git@github.com:openapijsonschematools/openapi-json-schema-generator.git - scm:git:git@github.com:openapijsonschematools/openapi-jsons-schema-generator.git - https://github.com/openapi-json-schema-tools/openapi-jsons-schema-generator - - - - - fehguy - Tony Tam - fehguy@gmail.com - - - spacether - Justin Black - justin.a.black@gmail.com - - - - github - https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/issues - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.html - repo - - src/main/java - target/classes + install + + + src/main/resources + + logback.xml + + + org.jvnet.wagon-svn @@ -74,127 +41,56 @@ ${wagon-webdav.version} - install target ${project.artifactId}-${project.version} - org.codehaus.mojo - flatten-maven-plugin - 1.3.0 - - + pl.project13.maven + git-commit-id-plugin - - flatten - process-resources + get-the-git-infos - flatten - - - - - flatten.clean - clean - - clean + revision + initialize + + true + ${project.build.outputDirectory}/openapi-json-schema-generator-git.properties + + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + + full + ${project.parent.basedir}${file.separator}.git + false + false + org.apache.maven.plugins maven-checkstyle-plugin - ${checkstyle.plugin.version} - false - false - **/samples/*.java + ${project.parent.basedir}${file.separator}google_checkstyle.xml - - - checkstyle-check - - check - - verify - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} + org.codehaus.mojo + exec-maven-plugin + 1.6.0 - jacoco-initialize - - prepare-agent - - - - jacoco-site - test - - report - - - - default-check - check + java - - - - PACKAGE - - - LINE - COVEREDRATIO - 0 - - - - - - - **/gradle-wrapper.jar - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - true - classes - 3 - false - none:none - org.testng:testng - @{argLine} -XX:+StartAttachListener - - 1000 - 5000 - + org.openapi-tools.codegen.OpenAPIGenerator - - - - org.jacoco - org.jacoco.agent - runtime - ${jacoco.version} - runtime - - maven-dependency-plugin @@ -228,212 +124,37 @@ development ${project.url} ${project.version} - org.openapijsonschematools + org.openapi-tools - - - org.apache.maven.plugins - maven-site-plugin - ${maven-site-plugin.version} - - - org.apache.maven.plugins - maven-release-plugin - ${maven-release-plugin.version} - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - ${maven.compiler.source} - UTF-8 - 1g - true - - attach-javadocs - verify - jar + test-jar org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - verify - - jar-no-fork - - - + maven-site-plugin + ${maven-site-plugin.version} org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M2 - - - enforce-versions - - enforce - - - - - 1.8.0 - - - 3.2.5 - - - No Snapshots Allowed! - false - - org.openapijsonschematools:* - - - - - - - - - de.thetaphi - forbiddenapis - 2.6 - - - - jdk-unsafe - jdk-deprecated - jdk-internal - - jdk-non-portable - jdk-reflection - - - - - - check - testCheck - - - + maven-release-plugin + ${maven-release-plugin.version} - - - - se.bjurr.violations - violations-maven-plugin - ${violations-maven-plugin.version} - - 0 - VERBOSE - ERROR - - - FINDBUGS - Spotbugs - ${project.basedir} - .*/spotbugsXml\.xml$ - - - PMD - PMD - ${project.basedir} - .*/pmd\.xml$ - - - CHECKSTYLE - Checkstyle - ${project.basedir} - .*/checkstyle-result\.xml$ - - - - - - verify - - violations - - - - - - com.github.spotbugs - spotbugs-maven-plugin - ${spotbugs-plugin.version} - - - org.apache.maven.plugins - maven-pmd-plugin - ${pmd-plugin.version} - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${checkstyle.plugin.version} - - - pl.project13.maven - git-commit-id-plugin - ${git-commit-id-plugin.version} - - - - - release - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - true - - ossrh - https://oss.sonatype.org/ - true - - - - + release-profile + + true + - release-sign-artifacts @@ -460,799 +181,234 @@ - - static-analysis - - true - true - com.github.spotbugs spotbugs-maven-plugin - ${spotbugs-plugin.version} - false - - min - ${project.basedir}${file.separator}spotbugs-exclude.xml + ${project.parent.basedir}${file.separator}spotbugs-exclude.xml - - - spotbugs-check - - check - - verify - - org.apache.maven.plugins maven-pmd-plugin - ${pmd-plugin.version} + + + se.bjurr.violations + violations-maven-plugin - ${project.build.sourceEncoding} - false - false - - category/java/errorprone.xml - - - **/samples/**/* - + + 65 - - - pmd-check - - check - - verify - - - - - - com.github.spotbugs - spotbugs-maven-plugin - ${spotbugs-plugin.version} - - - - - - - android-client - - - env - java - - - - samples/client/petstore/android/volley - - - - bash-client - - - env - java - - - - samples/client/petstore/bash - - - - clojure-client - - - env - clojure - - - - samples/client/petstore/clojure - - - - haskell-http-client - - - env - haskell-http-client - - - - samples/client/petstore/haskell-http-client - - - - haskell-http-client-integration-test - - - env - haskell-http-client - - - - samples/client/petstore/haskell-http-client/tests-integration - - - - java-client-jersey1 - - - env - java - - - - samples/client/petstore/java/jersey1 - - - - java-client-jersey2-java8 - - - env - java - - - - samples/client/petstore/java/jersey2-java8 - - - - java-client-openapi3-jersey2-java8 - - - env - java - - - - samples/openapi3/client/petstore/java/jersey2-java8 - - - - java-client-okhttp-gson - - - env - java - - - - samples/client/petstore/java/okhttp-gson - - - - java-client-okhttp-gson-parcelable - - - env - java - - - - samples/client/petstore/java/okhttp-gson-parcelableModel - - - - java-client-retrofit2 - - - env - java - - - - samples/client/petstore/java/retrofit2 - - - - java-client-retrofit2-rx - - - env - java - - - - samples/client/petstore/java/retrofit2rx - - - - java-client-feign - - - env - java - - - - samples/client/petstore/java/feign - - - - javascript-client-es6 - - - env - javascript - - - - samples/client/petstore/javascript-es6 - - - - javascript-client-promise-es6 - - - env - javascript - - - - samples/client/petstore/javascript-promise-es6 - - - - scala-httpclient - - - env - scala - - - - samples/client/petstore/scala-httpclient - - - - java-micronaut-client - - - env - java - - - - samples/client/petstore/java-micronaut-client - - - - java-micronaut-server - - - env - java - - - - samples/server/petstore/java-micronaut-server - - - - java-msf4j-server - - - env - java - - - - samples/server/petstore/java-msf4j - - - - jaxrs-cxf-server - - - env - java - - - - samples/server/petstore/jaxrs-cxf - - - - jaxrs-resteasy-server - - - env - java - - - - samples/server/petstore/jaxrs-resteasy/default - - - - jaxrs-resteasy-server-joda - - - env - java - - - - samples/server/petstore/jaxrs-resteasy/joda - - - - jaxrs-resteasy-eap-server - - - env - java - - - - samples/server/petstore/jaxrs-resteasy/eap - - - - jaxrs-resteasy-eap-server-joda - - - env - java - - - - samples/server/petstore/jaxrs-resteasy/eap-joda - - - - jaxrs-server - - - env - java - - - - samples/server/petstore/jaxrs/jersey2 - - - - jaxrs-server-jersey1 - - - env - java - - - - samples/server/petstore/jaxrs/jersey1 - - - - - jaxrs-jersey - - - env - java - - - - samples/server/petstore/jaxrs-jersey - - - - jaxrs-spec - - - env - java - - - - samples/server/petstore/jaxrs-spec - - - - jaxrs-spec-interface - - - env - java - - - - samples/server/petstore/jaxrs-spec-interface - - - - jaxrs-spec-interface-response - - - env - java - - - - samples/server/petstore/jaxrs-spec-interface-response - - - - typescript-client-tests-default - - - env - java - - - - samples/openapi3/client/petstore/typescript/tests/default - - - - typescript-client-tests-deno - - - env - java - - - - samples/openapi3/client/petstore/typescript/tests/deno - - - - typescript-client-tests-jquery - - - env - java - - - - samples/openapi3/client/petstore/typescript/tests/jquery - - - - typescript-client-tests-browser - - - env - java - - - - samples/openapi3/client/petstore/typescript/tests/browser - - - - typescript-fetch-client-tests-default - - - env - java - - - - samples/client/petstore/typescript-fetch/tests/default - - - - typescript-fetch-client-builds-default - - - env - java - - - - samples/client/petstore/typescript-fetch/builds/default - - - - typescript-fetch-client-builds-es6-target - - - env - java - - - - samples/client/petstore/typescript-fetch/builds/es6-target - - - - typescript-fetch-client-builds-with-npm-version - - - env - java - - - - samples/client/petstore/typescript-fetch/builds/with-npm-version - - - - typescript-fetch-client-builds-prefix-parameter-interfaces - - - env - java - - - - samples/client/petstore/typescript-fetch/builds/prefix-parameter-interfaces - - - - typescript-node-npm-client - - - env - java - - - - samples/client/petstore/typescript-node/npm - - - - python-client - - - env - java - - - - samples/client/petstore/python-prior - - - - ruby-client - - - env - java - - - - samples/client/petstore/ruby - - - - go-client - - - env - java - - - - samples/client/petstore/go - - - - springboot-beanvalidation - - - env - java - - - - samples/server/petstore/springboot-beanvalidation - - - - springboot-reactive - - - env - java - - - - samples/server/petstore/springboot-reactive - - - - springboot - - - env - java - - - - samples/server/petstore/springboot - - - - springboot-virtualan - - - env - java - - - - samples/server/petstore/springboot-virtualan - - - - java-inflector - - - env - java - - - - samples/server/petstore/java-inflector - - - - java-undertow - - - env - java - - - - samples/server/petstore/java-undertow - - - - samples - - - env - samples - - - - - samples/client/petstore/php/OpenAPIClient-php - - - samples/server/petstore/python-aiohttp - samples/server/petstore/python-aiohttp-srclayout - samples/server/petstore/python-fastapi - samples/server/petstore/python-flask - - - - samples/client/petstore/perl - - samples/client/petstore/ruby-faraday - samples/client/petstore/ruby - samples/client/petstore/ruby-autoload - - samples/client/petstore/rust - samples/client/petstore/rust/reqwest/petstore - samples/client/petstore/rust/reqwest/petstore-async - - samples/client/petstore/python-legacy - samples/client/petstore/python-asyncio - samples/client/petstore/python-tornado - samples/openapi3/client/petstore/python-legacy - - - - samples.circleci.spring - - - env - samples.circleci.spring - - - - - samples/client/petstore/spring-cloud - - - - - samples.circleci.node4 - - - env - samples.circleci.node4 - - - - - samples/openapi3/client/petstore/python - samples/openapi3/client/petstore/python-prior - - - - openapi-json-schema-generator - - true - - !integration-test - - - - modules/openapi-json-schema-generator - - - target/site - - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin.version} - - - org.apache.maven.plugins - maven-jxr-plugin - 3.0.0 - - true - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - ${maven-project-info-reports-plugin.version} - - - - project-team - - - - - - - - - - junit - junit - ${junit.version} - test - - - org.testng - testng - ${testng.version} - test - - - org.openrewrite - rewrite-maven - ${openrewrite.version} - test - - - + + + ${swagger-parser-groupid.version} + swagger-parser + ${swagger-parser.version} + + + com.samskivert + jmustache + ${jmustache.version} + + + com.github.jknack + handlebars + ${handlebars-java.version} + + + com.github.jknack + handlebars-jackson2 + ${handlebars-java.version} + + + commons-io + commons-io + ${commons-io.version} + + + org.slf4j + slf4j-ext + ${slf4j.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-simple + ${slf4j.version} + + + org.apache.commons + commons-lang3 + ${commons-lang.version} + + + org.apache.commons + commons-text + ${commons-text.version} + + + commons-cli + commons-cli + ${commons-cli.version} + + + com.google.guava + guava + ${guava.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-guava + ${jackson.version} + + + com.tngtech.archunit + archunit + ${archunit.version} + test + + + com.tngtech.archunit + archunit-junit4 + ${archunit.version} + test + + + org.testng + testng + ${testng.version} + test + + + com.github.javaparser + javaparser-core + 3.24.0 + test + + + org.openrewrite + rewrite-maven + test + + + org.reflections + reflections + ${reflections.version} + test + + + com.googlecode.java-diff-utils + diffutils + ${diffutils.version} + test + + + com.atlassian.commonmark + commonmark + 0.11.0 + + + org.mockito + mockito-core + ${mockito.version} + test + + + com.github.mifmif + generex + ${generex.version} + + + com.github.curious-odd-man + rgxgen + ${rxgen.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + ${jackson.version} + + + com.github.joschi.jackson + jackson-datatype-threetenbp + ${jackson-threetenbp.version} + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + test + + + org.jetbrains.kotlin + kotlin-compiler-embeddable + ${kotlin.version} + test + + + org.jetbrains.kotlin + kotlin-script-util + ${kotlin.version} + test + + + com.google.guava + guava-testlib + 28.2-jre + test + + + net.java.dev.jna + jna + 5.5.0 + + + com.github.ben-manes.caffeine + caffeine + 2.8.1 + + + org.assertj + assertj-core + 3.19.0 + test + + + + io.airlift + airline + 0.8 + + + com.googlecode.lambdaj + lambdaj + 2.3.3 + + + ch.qos.logback + logback-classic + 1.2.10 + + sonatype-snapshots diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java b/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java rename to src/main/java/org/openapijsonschematools/codegen/OpenAPIGenerator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/AbstractCommand.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/AbstractCommand.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/AbstractCommand.java rename to src/main/java/org/openapijsonschematools/codegen/clicommands/AbstractCommand.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplate.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplate.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplate.java rename to src/main/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplate.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Completion.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/Completion.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Completion.java rename to src/main/java/org/openapijsonschematools/codegen/clicommands/Completion.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java rename to src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java rename to src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java rename to src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Help.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/Help.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Help.java rename to src/main/java/org/openapijsonschematools/codegen/clicommands/Help.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/ListGenerators.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/ListGenerators.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/ListGenerators.java rename to src/main/java/org/openapijsonschematools/codegen/clicommands/ListGenerators.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Meta.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/Meta.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Meta.java rename to src/main/java/org/openapijsonschematools/codegen/clicommands/Meta.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Validate.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/Validate.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Validate.java rename to src/main/java/org/openapijsonschematools/codegen/clicommands/Validate.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Version.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/Version.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/Version.java rename to src/main/java/org/openapijsonschematools/codegen/clicommands/Version.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/common/BuildInfo.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/common/BuildInfo.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/common/BuildInfo.java rename to src/main/java/org/openapijsonschematools/codegen/clicommands/common/BuildInfo.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/common/Constants.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/common/Constants.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/common/Constants.java rename to src/main/java/org/openapijsonschematools/codegen/clicommands/common/Constants.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/common/GlobalOptions.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/common/GlobalOptions.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/clicommands/common/GlobalOptions.java rename to src/main/java/org/openapijsonschematools/codegen/clicommands/common/GlobalOptions.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/CodegenConstants.java b/src/main/java/org/openapijsonschematools/codegen/common/CodegenConstants.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/CodegenConstants.java rename to src/main/java/org/openapijsonschematools/codegen/common/CodegenConstants.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/DryRunStatus.java b/src/main/java/org/openapijsonschematools/codegen/common/DryRunStatus.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/DryRunStatus.java rename to src/main/java/org/openapijsonschematools/codegen/common/DryRunStatus.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ImplementationVersion.java b/src/main/java/org/openapijsonschematools/codegen/common/ImplementationVersion.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ImplementationVersion.java rename to src/main/java/org/openapijsonschematools/codegen/common/ImplementationVersion.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/JsonCache.java b/src/main/java/org/openapijsonschematools/codegen/common/JsonCache.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/JsonCache.java rename to src/main/java/org/openapijsonschematools/codegen/common/JsonCache.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/JsonCacheImpl.java b/src/main/java/org/openapijsonschematools/codegen/common/JsonCacheImpl.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/JsonCacheImpl.java rename to src/main/java/org/openapijsonschematools/codegen/common/JsonCacheImpl.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/Markdown.java b/src/main/java/org/openapijsonschematools/codegen/common/Markdown.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/Markdown.java rename to src/main/java/org/openapijsonschematools/codegen/common/Markdown.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ModelUtils.java b/src/main/java/org/openapijsonschematools/codegen/common/ModelUtils.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ModelUtils.java rename to src/main/java/org/openapijsonschematools/codegen/common/ModelUtils.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/OnceLogger.java b/src/main/java/org/openapijsonschematools/codegen/common/OnceLogger.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/OnceLogger.java rename to src/main/java/org/openapijsonschematools/codegen/common/OnceLogger.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/OpenAPISerializer.java b/src/main/java/org/openapijsonschematools/codegen/common/OpenAPISerializer.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/OpenAPISerializer.java rename to src/main/java/org/openapijsonschematools/codegen/common/OpenAPISerializer.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/OptionUtils.java b/src/main/java/org/openapijsonschematools/codegen/common/OptionUtils.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/OptionUtils.java rename to src/main/java/org/openapijsonschematools/codegen/common/OptionUtils.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ProcessUtils.java b/src/main/java/org/openapijsonschematools/codegen/common/ProcessUtils.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/ProcessUtils.java rename to src/main/java/org/openapijsonschematools/codegen/common/ProcessUtils.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/SemVer.java b/src/main/java/org/openapijsonschematools/codegen/common/SemVer.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/SemVer.java rename to src/main/java/org/openapijsonschematools/codegen/common/SemVer.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/SerializerUtils.java b/src/main/java/org/openapijsonschematools/codegen/common/SerializerUtils.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/SerializerUtils.java rename to src/main/java/org/openapijsonschematools/codegen/common/SerializerUtils.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/StringUtils.java b/src/main/java/org/openapijsonschematools/codegen/common/StringUtils.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/StringUtils.java rename to src/main/java/org/openapijsonschematools/codegen/common/StringUtils.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/URLPathUtils.java b/src/main/java/org/openapijsonschematools/codegen/common/URLPathUtils.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/common/URLPathUtils.java rename to src/main/java/org/openapijsonschematools/codegen/common/URLPathUtils.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/AuthParser.java b/src/main/java/org/openapijsonschematools/codegen/config/AuthParser.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/AuthParser.java rename to src/main/java/org/openapijsonschematools/codegen/config/AuthParser.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/ClientOptInput.java b/src/main/java/org/openapijsonschematools/codegen/config/ClientOptInput.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/ClientOptInput.java rename to src/main/java/org/openapijsonschematools/codegen/config/ClientOptInput.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java b/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java rename to src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfiguratorUtils.java b/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfiguratorUtils.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfiguratorUtils.java rename to src/main/java/org/openapijsonschematools/codegen/config/CodegenConfiguratorUtils.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/Context.java b/src/main/java/org/openapijsonschematools/codegen/config/Context.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/Context.java rename to src/main/java/org/openapijsonschematools/codegen/config/Context.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/DynamicSettings.java b/src/main/java/org/openapijsonschematools/codegen/config/DynamicSettings.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/DynamicSettings.java rename to src/main/java/org/openapijsonschematools/codegen/config/DynamicSettings.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/GeneratorSettings.java b/src/main/java/org/openapijsonschematools/codegen/config/GeneratorSettings.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/GeneratorSettings.java rename to src/main/java/org/openapijsonschematools/codegen/config/GeneratorSettings.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/GlobalSettings.java b/src/main/java/org/openapijsonschematools/codegen/config/GlobalSettings.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/GlobalSettings.java rename to src/main/java/org/openapijsonschematools/codegen/config/GlobalSettings.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/SpecValidationException.java b/src/main/java/org/openapijsonschematools/codegen/config/SpecValidationException.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/SpecValidationException.java rename to src/main/java/org/openapijsonschematools/codegen/config/SpecValidationException.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java b/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java rename to src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java rename to src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorRunner.java b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorRunner.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorRunner.java rename to src/main/java/org/openapijsonschematools/codegen/generatorrunner/GeneratorRunner.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/CodegenIgnoreProcessor.java b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/CodegenIgnoreProcessor.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/CodegenIgnoreProcessor.java rename to src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/CodegenIgnoreProcessor.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/DirectoryRule.java b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/DirectoryRule.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/DirectoryRule.java rename to src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/DirectoryRule.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/EverythingRule.java b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/EverythingRule.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/EverythingRule.java rename to src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/EverythingRule.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/FileRule.java b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/FileRule.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/FileRule.java rename to src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/FileRule.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/IgnoreLineParser.java b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/IgnoreLineParser.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/IgnoreLineParser.java rename to src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/IgnoreLineParser.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/InvalidRule.java b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/InvalidRule.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/InvalidRule.java rename to src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/InvalidRule.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/ParserException.java b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/ParserException.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/ParserException.java rename to src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/ParserException.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/Part.java b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/Part.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/Part.java rename to src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/Part.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/RootedFileRule.java b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/RootedFileRule.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/RootedFileRule.java rename to src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/RootedFileRule.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/Rule.java b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/Rule.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/Rule.java rename to src/main/java/org/openapijsonschematools/codegen/generatorrunner/ignore/rules/Rule.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java rename to src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaGenerator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java rename to src/main/java/org/openapijsonschematools/codegen/generators/AbstractJavaJAXRSServerGenerator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java rename to src/main/java/org/openapijsonschematools/codegen/generators/AbstractKotlinGenerator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractPythonGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/AbstractPythonGenerator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/AbstractPythonGenerator.java rename to src/main/java/org/openapijsonschematools/codegen/generators/AbstractPythonGenerator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java rename to src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java b/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/Generator.java rename to src/main/java/org/openapijsonschematools/codegen/generators/Generator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java rename to src/main/java/org/openapijsonschematools/codegen/generators/JMeterClientGenerator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java rename to src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java rename to src/main/java/org/openapijsonschematools/codegen/generators/JavaJerseyServerGenerator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java rename to src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java rename to src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/BeanValidationExtendedFeatures.java b/src/main/java/org/openapijsonschematools/codegen/generators/features/BeanValidationExtendedFeatures.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/BeanValidationExtendedFeatures.java rename to src/main/java/org/openapijsonschematools/codegen/generators/features/BeanValidationExtendedFeatures.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/BeanValidationFeatures.java b/src/main/java/org/openapijsonschematools/codegen/generators/features/BeanValidationFeatures.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/BeanValidationFeatures.java rename to src/main/java/org/openapijsonschematools/codegen/generators/features/BeanValidationFeatures.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/CXFExtServerFeatures.java b/src/main/java/org/openapijsonschematools/codegen/generators/features/CXFExtServerFeatures.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/CXFExtServerFeatures.java rename to src/main/java/org/openapijsonschematools/codegen/generators/features/CXFExtServerFeatures.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/CXFFeatures.java b/src/main/java/org/openapijsonschematools/codegen/generators/features/CXFFeatures.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/CXFFeatures.java rename to src/main/java/org/openapijsonschematools/codegen/generators/features/CXFFeatures.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/CXFServerFeatures.java b/src/main/java/org/openapijsonschematools/codegen/generators/features/CXFServerFeatures.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/CXFServerFeatures.java rename to src/main/java/org/openapijsonschematools/codegen/generators/features/CXFServerFeatures.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/DocumentationProviderFeatures.java b/src/main/java/org/openapijsonschematools/codegen/generators/features/DocumentationProviderFeatures.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/DocumentationProviderFeatures.java rename to src/main/java/org/openapijsonschematools/codegen/generators/features/DocumentationProviderFeatures.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/GzipFeatures.java b/src/main/java/org/openapijsonschematools/codegen/generators/features/GzipFeatures.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/GzipFeatures.java rename to src/main/java/org/openapijsonschematools/codegen/generators/features/GzipFeatures.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/GzipTestFeatures.java b/src/main/java/org/openapijsonschematools/codegen/generators/features/GzipTestFeatures.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/GzipTestFeatures.java rename to src/main/java/org/openapijsonschematools/codegen/generators/features/GzipTestFeatures.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/JbossFeature.java b/src/main/java/org/openapijsonschematools/codegen/generators/features/JbossFeature.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/JbossFeature.java rename to src/main/java/org/openapijsonschematools/codegen/generators/features/JbossFeature.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/LoggingFeatures.java b/src/main/java/org/openapijsonschematools/codegen/generators/features/LoggingFeatures.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/LoggingFeatures.java rename to src/main/java/org/openapijsonschematools/codegen/generators/features/LoggingFeatures.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/LoggingTestFeatures.java b/src/main/java/org/openapijsonschematools/codegen/generators/features/LoggingTestFeatures.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/LoggingTestFeatures.java rename to src/main/java/org/openapijsonschematools/codegen/generators/features/LoggingTestFeatures.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/OptionalFeatures.java b/src/main/java/org/openapijsonschematools/codegen/generators/features/OptionalFeatures.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/OptionalFeatures.java rename to src/main/java/org/openapijsonschematools/codegen/generators/features/OptionalFeatures.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/PerformBeanValidationFeatures.java b/src/main/java/org/openapijsonschematools/codegen/generators/features/PerformBeanValidationFeatures.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/PerformBeanValidationFeatures.java rename to src/main/java/org/openapijsonschematools/codegen/generators/features/PerformBeanValidationFeatures.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/SpringFeatures.java b/src/main/java/org/openapijsonschematools/codegen/generators/features/SpringFeatures.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/SpringFeatures.java rename to src/main/java/org/openapijsonschematools/codegen/generators/features/SpringFeatures.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/SwaggerFeatures.java b/src/main/java/org/openapijsonschematools/codegen/generators/features/SwaggerFeatures.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/SwaggerFeatures.java rename to src/main/java/org/openapijsonschematools/codegen/generators/features/SwaggerFeatures.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/SwaggerUIFeatures.java b/src/main/java/org/openapijsonschematools/codegen/generators/features/SwaggerUIFeatures.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/SwaggerUIFeatures.java rename to src/main/java/org/openapijsonschematools/codegen/generators/features/SwaggerUIFeatures.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/UseGenericResponseFeatures.java b/src/main/java/org/openapijsonschematools/codegen/generators/features/UseGenericResponseFeatures.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/features/UseGenericResponseFeatures.java rename to src/main/java/org/openapijsonschematools/codegen/generators/features/UseGenericResponseFeatures.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorLoader.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorLoader.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorLoader.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorLoader.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorNotFoundException.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorNotFoundException.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorNotFoundException.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatorloader/GeneratorNotFoundException.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSet.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSet.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSet.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSet.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorLanguage.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorLanguage.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorLanguage.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorLanguage.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorMetadata.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorMetadata.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorMetadata.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorMetadata.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorType.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorType.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorType.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/GeneratorType.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/Stability.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/Stability.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/Stability.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/Stability.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ClientModificationFeature.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ClientModificationFeature.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ClientModificationFeature.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ClientModificationFeature.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ComponentsFeature.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ComponentsFeature.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ComponentsFeature.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ComponentsFeature.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/DataTypeFeature.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/DataTypeFeature.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/DataTypeFeature.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/DataTypeFeature.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/DocumentationFeature.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/DocumentationFeature.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/DocumentationFeature.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/DocumentationFeature.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/GlobalFeature.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/GlobalFeature.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/GlobalFeature.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/GlobalFeature.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/OperationFeature.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/OperationFeature.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/OperationFeature.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/OperationFeature.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ParameterFeature.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ParameterFeature.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ParameterFeature.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/ParameterFeature.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/SchemaFeature.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/SchemaFeature.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/SchemaFeature.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/SchemaFeature.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/SecurityFeature.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/SecurityFeature.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/SecurityFeature.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/SecurityFeature.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/WireFormatFeature.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/WireFormatFeature.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/WireFormatFeature.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/WireFormatFeature.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/AnnotationType.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/AnnotationType.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/AnnotationType.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/AnnotationType.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/OAS2.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/OAS2.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/OAS2.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/OAS2.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/OAS3.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/OAS3.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/OAS3.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/OAS3.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/ToolingExtension.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/ToolingExtension.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/ToolingExtension.java rename to src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/features/annotations/ToolingExtension.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/models/CliOption.java b/src/main/java/org/openapijsonschematools/codegen/generators/models/CliOption.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/models/CliOption.java rename to src/main/java/org/openapijsonschematools/codegen/generators/models/CliOption.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/models/VendorExtension.java b/src/main/java/org/openapijsonschematools/codegen/generators/models/VendorExtension.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/models/VendorExtension.java rename to src/main/java/org/openapijsonschematools/codegen/generators/models/VendorExtension.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/ArrayListWithContext.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/ArrayListWithContext.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/ArrayListWithContext.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/ArrayListWithContext.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenCallback.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenCallback.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenCallback.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenCallback.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenDiscriminator.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenDiscriminator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenDiscriminator.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenDiscriminator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenEncoding.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenEncoding.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenEncoding.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenEncoding.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenHeader.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenHeader.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenHeader.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenHeader.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenKey.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenKey.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenKey.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenKey.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenMediaType.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenMediaType.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenMediaType.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenMediaType.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOauthFlow.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOauthFlow.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOauthFlow.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOauthFlow.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOauthFlows.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOauthFlows.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOauthFlows.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOauthFlows.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOperation.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOperation.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOperation.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenOperation.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenParameter.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenParameter.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenParameter.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenParameter.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPathItem.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPathItem.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPathItem.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPathItem.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPatternInfo.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPatternInfo.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPatternInfo.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenPatternInfo.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenRefInfo.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenRefInfo.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenRefInfo.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenRefInfo.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenRequestBody.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenRequestBody.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenRequestBody.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenRequestBody.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenResponse.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenResponse.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenResponse.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenResponse.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityRequirementValue.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityRequirementValue.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityRequirementValue.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityRequirementValue.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityScheme.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityScheme.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityScheme.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSecurityScheme.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenServer.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenServer.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenServer.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenServer.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenTag.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenTag.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenTag.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenTag.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenXml.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenXml.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenXml.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenXml.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/EnumInfo.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/EnumInfo.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/EnumInfo.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/EnumInfo.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/EnumValue.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/EnumValue.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/EnumValue.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/EnumValue.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/InlineContext.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/InlineContext.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/InlineContext.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/InlineContext.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/LinkedHashMapWithContext.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/LinkedHashMapWithContext.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/LinkedHashMapWithContext.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/LinkedHashMapWithContext.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/PairCacheKey.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/PairCacheKey.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/PairCacheKey.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/PairCacheKey.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/SchemaTestCase.java b/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/SchemaTestCase.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/SchemaTestCase.java rename to src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/SchemaTestCase.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/AbstractTemplatingEngineAdapter.java b/src/main/java/org/openapijsonschematools/codegen/templating/AbstractTemplatingEngineAdapter.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/AbstractTemplatingEngineAdapter.java rename to src/main/java/org/openapijsonschematools/codegen/templating/AbstractTemplatingEngineAdapter.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/CommonTemplateContentLocator.java b/src/main/java/org/openapijsonschematools/codegen/templating/CommonTemplateContentLocator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/CommonTemplateContentLocator.java rename to src/main/java/org/openapijsonschematools/codegen/templating/CommonTemplateContentLocator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/DryRunTemplateManager.java b/src/main/java/org/openapijsonschematools/codegen/templating/DryRunTemplateManager.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/DryRunTemplateManager.java rename to src/main/java/org/openapijsonschematools/codegen/templating/DryRunTemplateManager.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/GeneratorTemplateContentLocator.java b/src/main/java/org/openapijsonschematools/codegen/templating/GeneratorTemplateContentLocator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/GeneratorTemplateContentLocator.java rename to src/main/java/org/openapijsonschematools/codegen/templating/GeneratorTemplateContentLocator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/HandlebarsEngineAdapter.java b/src/main/java/org/openapijsonschematools/codegen/templating/HandlebarsEngineAdapter.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/HandlebarsEngineAdapter.java rename to src/main/java/org/openapijsonschematools/codegen/templating/HandlebarsEngineAdapter.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/MustacheEngineAdapter.java b/src/main/java/org/openapijsonschematools/codegen/templating/MustacheEngineAdapter.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/MustacheEngineAdapter.java rename to src/main/java/org/openapijsonschematools/codegen/templating/MustacheEngineAdapter.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/SupportingFile.java b/src/main/java/org/openapijsonschematools/codegen/templating/SupportingFile.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/SupportingFile.java rename to src/main/java/org/openapijsonschematools/codegen/templating/SupportingFile.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateDefinition.java b/src/main/java/org/openapijsonschematools/codegen/templating/TemplateDefinition.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateDefinition.java rename to src/main/java/org/openapijsonschematools/codegen/templating/TemplateDefinition.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateFileType.java b/src/main/java/org/openapijsonschematools/codegen/templating/TemplateFileType.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateFileType.java rename to src/main/java/org/openapijsonschematools/codegen/templating/TemplateFileType.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateManager.java b/src/main/java/org/openapijsonschematools/codegen/templating/TemplateManager.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateManager.java rename to src/main/java/org/openapijsonschematools/codegen/templating/TemplateManager.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateManagerOptions.java b/src/main/java/org/openapijsonschematools/codegen/templating/TemplateManagerOptions.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateManagerOptions.java rename to src/main/java/org/openapijsonschematools/codegen/templating/TemplateManagerOptions.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateNotFoundException.java b/src/main/java/org/openapijsonschematools/codegen/templating/TemplateNotFoundException.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateNotFoundException.java rename to src/main/java/org/openapijsonschematools/codegen/templating/TemplateNotFoundException.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatePathLocator.java b/src/main/java/org/openapijsonschematools/codegen/templating/TemplatePathLocator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatePathLocator.java rename to src/main/java/org/openapijsonschematools/codegen/templating/TemplatePathLocator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateProcessor.java b/src/main/java/org/openapijsonschematools/codegen/templating/TemplateProcessor.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplateProcessor.java rename to src/main/java/org/openapijsonschematools/codegen/templating/TemplateProcessor.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineAdapter.java b/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineAdapter.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineAdapter.java rename to src/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineAdapter.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineLoader.java b/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineLoader.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineLoader.java rename to src/main/java/org/openapijsonschematools/codegen/templating/TemplatingEngineLoader.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingExecutor.java b/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingExecutor.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingExecutor.java rename to src/main/java/org/openapijsonschematools/codegen/templating/TemplatingExecutor.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingGenerator.java b/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingGenerator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/TemplatingGenerator.java rename to src/main/java/org/openapijsonschematools/codegen/templating/TemplatingGenerator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/handlebars/CustomHelpers.java b/src/main/java/org/openapijsonschematools/codegen/templating/handlebars/CustomHelpers.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/handlebars/CustomHelpers.java rename to src/main/java/org/openapijsonschematools/codegen/templating/handlebars/CustomHelpers.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/handlebars/StringHelpers.java b/src/main/java/org/openapijsonschematools/codegen/templating/handlebars/StringHelpers.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/handlebars/StringHelpers.java rename to src/main/java/org/openapijsonschematools/codegen/templating/handlebars/StringHelpers.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java rename to src/main/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambda.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CaseFormatLambda.java b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CaseFormatLambda.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/CaseFormatLambda.java rename to src/main/java/org/openapijsonschematools/codegen/templating/mustache/CaseFormatLambda.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/IndentedLambda.java b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/IndentedLambda.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/IndentedLambda.java rename to src/main/java/org/openapijsonschematools/codegen/templating/mustache/IndentedLambda.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/JoinWithCommaLambda.java b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/JoinWithCommaLambda.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/JoinWithCommaLambda.java rename to src/main/java/org/openapijsonschematools/codegen/templating/mustache/JoinWithCommaLambda.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambda.java b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambda.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambda.java rename to src/main/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambda.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/OnChangeLambda.java b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/OnChangeLambda.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/OnChangeLambda.java rename to src/main/java/org/openapijsonschematools/codegen/templating/mustache/OnChangeLambda.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/OptionalParameterLambda.java b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/OptionalParameterLambda.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/OptionalParameterLambda.java rename to src/main/java/org/openapijsonschematools/codegen/templating/mustache/OptionalParameterLambda.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/PrefixWithHashLambda.java b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/PrefixWithHashLambda.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/PrefixWithHashLambda.java rename to src/main/java/org/openapijsonschematools/codegen/templating/mustache/PrefixWithHashLambda.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/RequiredParameterLambda.java b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/RequiredParameterLambda.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/RequiredParameterLambda.java rename to src/main/java/org/openapijsonschematools/codegen/templating/mustache/RequiredParameterLambda.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/SnakecaseLambda.java b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/SnakecaseLambda.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/SnakecaseLambda.java rename to src/main/java/org/openapijsonschematools/codegen/templating/mustache/SnakecaseLambda.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/SplitStringLambda.java b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/SplitStringLambda.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/SplitStringLambda.java rename to src/main/java/org/openapijsonschematools/codegen/templating/mustache/SplitStringLambda.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/TitlecaseLambda.java b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/TitlecaseLambda.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/TitlecaseLambda.java rename to src/main/java/org/openapijsonschematools/codegen/templating/mustache/TitlecaseLambda.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/TrimWhitespaceLambda.java b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/TrimWhitespaceLambda.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/TrimWhitespaceLambda.java rename to src/main/java/org/openapijsonschematools/codegen/templating/mustache/TrimWhitespaceLambda.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/UppercaseLambda.java b/src/main/java/org/openapijsonschematools/codegen/templating/mustache/UppercaseLambda.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/templating/mustache/UppercaseLambda.java rename to src/main/java/org/openapijsonschematools/codegen/templating/mustache/UppercaseLambda.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiEvaluator.java b/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiEvaluator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiEvaluator.java rename to src/main/java/org/openapijsonschematools/codegen/validation/OpenApiEvaluator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiOperationValidations.java b/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiOperationValidations.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiOperationValidations.java rename to src/main/java/org/openapijsonschematools/codegen/validation/OpenApiOperationValidations.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiParameterValidations.java b/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiParameterValidations.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiParameterValidations.java rename to src/main/java/org/openapijsonschematools/codegen/validation/OpenApiParameterValidations.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaValidations.java b/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaValidations.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaValidations.java rename to src/main/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaValidations.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiSecuritySchemeValidations.java b/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiSecuritySchemeValidations.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OpenApiSecuritySchemeValidations.java rename to src/main/java/org/openapijsonschematools/codegen/validation/OpenApiSecuritySchemeValidations.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OperationWrapper.java b/src/main/java/org/openapijsonschematools/codegen/validation/OperationWrapper.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/OperationWrapper.java rename to src/main/java/org/openapijsonschematools/codegen/validation/OperationWrapper.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ParameterWrapper.java b/src/main/java/org/openapijsonschematools/codegen/validation/ParameterWrapper.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ParameterWrapper.java rename to src/main/java/org/openapijsonschematools/codegen/validation/ParameterWrapper.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/RuleConfiguration.java b/src/main/java/org/openapijsonschematools/codegen/validation/RuleConfiguration.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/RuleConfiguration.java rename to src/main/java/org/openapijsonschematools/codegen/validation/RuleConfiguration.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/SchemaWrapper.java b/src/main/java/org/openapijsonschematools/codegen/validation/SchemaWrapper.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/SchemaWrapper.java rename to src/main/java/org/openapijsonschematools/codegen/validation/SchemaWrapper.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/SecuritySchemeWrapper.java b/src/main/java/org/openapijsonschematools/codegen/validation/SecuritySchemeWrapper.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/SecuritySchemeWrapper.java rename to src/main/java/org/openapijsonschematools/codegen/validation/SecuritySchemeWrapper.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationConstants.java b/src/main/java/org/openapijsonschematools/codegen/validation/ValidationConstants.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/ValidationConstants.java rename to src/main/java/org/openapijsonschematools/codegen/validation/ValidationConstants.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/GenericValidator.java b/src/main/java/org/openapijsonschematools/codegen/validation/validators/GenericValidator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/GenericValidator.java rename to src/main/java/org/openapijsonschematools/codegen/validation/validators/GenericValidator.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Invalid.java b/src/main/java/org/openapijsonschematools/codegen/validation/validators/Invalid.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Invalid.java rename to src/main/java/org/openapijsonschematools/codegen/validation/validators/Invalid.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Severity.java b/src/main/java/org/openapijsonschematools/codegen/validation/validators/Severity.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Severity.java rename to src/main/java/org/openapijsonschematools/codegen/validation/validators/Severity.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Valid.java b/src/main/java/org/openapijsonschematools/codegen/validation/validators/Valid.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Valid.java rename to src/main/java/org/openapijsonschematools/codegen/validation/validators/Valid.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Validated.java b/src/main/java/org/openapijsonschematools/codegen/validation/validators/Validated.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Validated.java rename to src/main/java/org/openapijsonschematools/codegen/validation/validators/Validated.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/ValidationResult.java b/src/main/java/org/openapijsonschematools/codegen/validation/validators/ValidationResult.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/ValidationResult.java rename to src/main/java/org/openapijsonschematools/codegen/validation/validators/ValidationResult.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/ValidationRule.java b/src/main/java/org/openapijsonschematools/codegen/validation/validators/ValidationRule.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/ValidationRule.java rename to src/main/java/org/openapijsonschematools/codegen/validation/validators/ValidationRule.java diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Validator.java b/src/main/java/org/openapijsonschematools/codegen/validation/validators/Validator.java similarity index 100% rename from modules/openapi-json-schema-generator/src/main/java/org/openapijsonschematools/codegen/validation/validators/Validator.java rename to src/main/java/org/openapijsonschematools/codegen/validation/validators/Validator.java diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/ApiClient.mustache b/src/main/resources/Java/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/ApiClient.mustache rename to src/main/resources/Java/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/BeanValidationException.mustache b/src/main/resources/Java/BeanValidationException.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/BeanValidationException.mustache rename to src/main/resources/Java/BeanValidationException.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/Configuration.mustache b/src/main/resources/Java/Configuration.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/Configuration.mustache rename to src/main/resources/Java/Configuration.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/CustomInstantDeserializer.mustache b/src/main/resources/Java/CustomInstantDeserializer.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/CustomInstantDeserializer.mustache rename to src/main/resources/Java/CustomInstantDeserializer.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/JSON.mustache b/src/main/resources/Java/JSON.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/JSON.mustache rename to src/main/resources/Java/JSON.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/JavaTimeFormatter.mustache b/src/main/resources/Java/JavaTimeFormatter.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/JavaTimeFormatter.mustache rename to src/main/resources/Java/JavaTimeFormatter.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/Pair.mustache b/src/main/resources/Java/Pair.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/Pair.mustache rename to src/main/resources/Java/Pair.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/README.mustache b/src/main/resources/Java/README.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/README.mustache rename to src/main/resources/Java/README.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/RFC3339DateFormat.mustache b/src/main/resources/Java/RFC3339DateFormat.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/RFC3339DateFormat.mustache rename to src/main/resources/Java/RFC3339DateFormat.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/ServerConfiguration.mustache b/src/main/resources/Java/ServerConfiguration.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/ServerConfiguration.mustache rename to src/main/resources/Java/ServerConfiguration.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/ServerVariable.mustache b/src/main/resources/Java/ServerVariable.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/ServerVariable.mustache rename to src/main/resources/Java/ServerVariable.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/StringUtil.mustache b/src/main/resources/Java/StringUtil.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/StringUtil.mustache rename to src/main/resources/Java/StringUtil.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/additionalEnumTypeAnnotations.mustache b/src/main/resources/Java/additionalEnumTypeAnnotations.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/additionalEnumTypeAnnotations.mustache rename to src/main/resources/Java/additionalEnumTypeAnnotations.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/additionalModelTypeAnnotations.mustache b/src/main/resources/Java/additionalModelTypeAnnotations.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/additionalModelTypeAnnotations.mustache rename to src/main/resources/Java/additionalModelTypeAnnotations.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/api.mustache b/src/main/resources/Java/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/api.mustache rename to src/main/resources/Java/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/apiException.mustache b/src/main/resources/Java/apiException.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/apiException.mustache rename to src/main/resources/Java/apiException.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/apiOperation.mustache b/src/main/resources/Java/apiOperation.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/apiOperation.mustache rename to src/main/resources/Java/apiOperation.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/api_doc.mustache b/src/main/resources/Java/api_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/api_doc.mustache rename to src/main/resources/Java/api_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/api_test.mustache b/src/main/resources/Java/api_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/api_test.mustache rename to src/main/resources/Java/api_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/auth/ApiKeyAuth.mustache b/src/main/resources/Java/auth/ApiKeyAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/auth/ApiKeyAuth.mustache rename to src/main/resources/Java/auth/ApiKeyAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/auth/Authentication.mustache b/src/main/resources/Java/auth/Authentication.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/auth/Authentication.mustache rename to src/main/resources/Java/auth/Authentication.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/auth/HttpBasicAuth.mustache b/src/main/resources/Java/auth/HttpBasicAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/auth/HttpBasicAuth.mustache rename to src/main/resources/Java/auth/HttpBasicAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/auth/HttpBearerAuth.mustache b/src/main/resources/Java/auth/HttpBearerAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/auth/HttpBearerAuth.mustache rename to src/main/resources/Java/auth/HttpBearerAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/auth/OAuth.mustache b/src/main/resources/Java/auth/OAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/auth/OAuth.mustache rename to src/main/resources/Java/auth/OAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/auth/OAuthFlow.mustache b/src/main/resources/Java/auth/OAuthFlow.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/auth/OAuthFlow.mustache rename to src/main/resources/Java/auth/OAuthFlow.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/beanValidation.mustache b/src/main/resources/Java/beanValidation.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/beanValidation.mustache rename to src/main/resources/Java/beanValidation.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/beanValidationCore.mustache b/src/main/resources/Java/beanValidationCore.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/beanValidationCore.mustache rename to src/main/resources/Java/beanValidationCore.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/beanValidationQueryParams.mustache b/src/main/resources/Java/beanValidationQueryParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/beanValidationQueryParams.mustache rename to src/main/resources/Java/beanValidationQueryParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/build.gradle.mustache b/src/main/resources/Java/build.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/build.gradle.mustache rename to src/main/resources/Java/build.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/build.sbt.mustache b/src/main/resources/Java/build.sbt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/build.sbt.mustache rename to src/main/resources/Java/build.sbt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/enum_outer_doc.mustache b/src/main/resources/Java/enum_outer_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/enum_outer_doc.mustache rename to src/main/resources/Java/enum_outer_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/generatedAnnotation.mustache b/src/main/resources/Java/generatedAnnotation.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/generatedAnnotation.mustache rename to src/main/resources/Java/generatedAnnotation.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/git_push.sh.mustache b/src/main/resources/Java/git_push.sh.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/git_push.sh.mustache rename to src/main/resources/Java/git_push.sh.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/gitignore.mustache b/src/main/resources/Java/gitignore.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/gitignore.mustache rename to src/main/resources/Java/gitignore.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/gradle-wrapper.jar b/src/main/resources/Java/gradle-wrapper.jar similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/gradle-wrapper.jar rename to src/main/resources/Java/gradle-wrapper.jar diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/gradle-wrapper.properties.mustache b/src/main/resources/Java/gradle-wrapper.properties.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/gradle-wrapper.properties.mustache rename to src/main/resources/Java/gradle-wrapper.properties.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/gradle.properties.mustache b/src/main/resources/Java/gradle.properties.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/gradle.properties.mustache rename to src/main/resources/Java/gradle.properties.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/gradlew.bat.mustache b/src/main/resources/Java/gradlew.bat.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/gradlew.bat.mustache rename to src/main/resources/Java/gradlew.bat.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/gradlew.mustache b/src/main/resources/Java/gradlew.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/gradlew.mustache rename to src/main/resources/Java/gradlew.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/jackson_annotations.mustache b/src/main/resources/Java/jackson_annotations.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/jackson_annotations.mustache rename to src/main/resources/Java/jackson_annotations.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache b/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache rename to src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/apache-httpclient/README.mustache b/src/main/resources/Java/libraries/apache-httpclient/README.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/apache-httpclient/README.mustache rename to src/main/resources/Java/libraries/apache-httpclient/README.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache b/src/main/resources/Java/libraries/apache-httpclient/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache rename to src/main/resources/Java/libraries/apache-httpclient/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/apache-httpclient/api_test.mustache b/src/main/resources/Java/libraries/apache-httpclient/api_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/apache-httpclient/api_test.mustache rename to src/main/resources/Java/libraries/apache-httpclient/api_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache b/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache rename to src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache b/src/main/resources/Java/libraries/apache-httpclient/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/apache-httpclient/pom.mustache rename to src/main/resources/Java/libraries/apache-httpclient/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache b/src/main/resources/Java/libraries/feign/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache rename to src/main/resources/Java/libraries/feign/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/ApiResponseDecoder.mustache b/src/main/resources/Java/libraries/feign/ApiResponseDecoder.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/ApiResponseDecoder.mustache rename to src/main/resources/Java/libraries/feign/ApiResponseDecoder.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/EncodingUtils.mustache b/src/main/resources/Java/libraries/feign/EncodingUtils.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/EncodingUtils.mustache rename to src/main/resources/Java/libraries/feign/EncodingUtils.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/ParamExpander.mustache b/src/main/resources/Java/libraries/feign/ParamExpander.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/ParamExpander.mustache rename to src/main/resources/Java/libraries/feign/ParamExpander.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/README.mustache b/src/main/resources/Java/libraries/feign/README.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/README.mustache rename to src/main/resources/Java/libraries/feign/README.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/api.mustache b/src/main/resources/Java/libraries/feign/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/api.mustache rename to src/main/resources/Java/libraries/feign/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/api_test.mustache b/src/main/resources/Java/libraries/feign/api_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/api_test.mustache rename to src/main/resources/Java/libraries/feign/api_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/auth/ApiErrorDecoder.mustache b/src/main/resources/Java/libraries/feign/auth/ApiErrorDecoder.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/auth/ApiErrorDecoder.mustache rename to src/main/resources/Java/libraries/feign/auth/ApiErrorDecoder.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/auth/ApiKeyAuth.mustache b/src/main/resources/Java/libraries/feign/auth/ApiKeyAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/auth/ApiKeyAuth.mustache rename to src/main/resources/Java/libraries/feign/auth/ApiKeyAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/auth/DefaultApi20Impl.mustache b/src/main/resources/Java/libraries/feign/auth/DefaultApi20Impl.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/auth/DefaultApi20Impl.mustache rename to src/main/resources/Java/libraries/feign/auth/DefaultApi20Impl.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/auth/HttpBasicAuth.mustache b/src/main/resources/Java/libraries/feign/auth/HttpBasicAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/auth/HttpBasicAuth.mustache rename to src/main/resources/Java/libraries/feign/auth/HttpBasicAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/auth/HttpBearerAuth.mustache b/src/main/resources/Java/libraries/feign/auth/HttpBearerAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/auth/HttpBearerAuth.mustache rename to src/main/resources/Java/libraries/feign/auth/HttpBearerAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/auth/OAuth.mustache b/src/main/resources/Java/libraries/feign/auth/OAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/auth/OAuth.mustache rename to src/main/resources/Java/libraries/feign/auth/OAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/auth/OauthClientCredentialsGrant.mustache b/src/main/resources/Java/libraries/feign/auth/OauthClientCredentialsGrant.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/auth/OauthClientCredentialsGrant.mustache rename to src/main/resources/Java/libraries/feign/auth/OauthClientCredentialsGrant.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/auth/OauthPasswordGrant.mustache b/src/main/resources/Java/libraries/feign/auth/OauthPasswordGrant.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/auth/OauthPasswordGrant.mustache rename to src/main/resources/Java/libraries/feign/auth/OauthPasswordGrant.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache b/src/main/resources/Java/libraries/feign/build.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache rename to src/main/resources/Java/libraries/feign/build.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache b/src/main/resources/Java/libraries/feign/build.sbt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/build.sbt.mustache rename to src/main/resources/Java/libraries/feign/build.sbt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/model/ApiResponse.mustache b/src/main/resources/Java/libraries/feign/model/ApiResponse.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/model/ApiResponse.mustache rename to src/main/resources/Java/libraries/feign/model/ApiResponse.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/model_test.mustache b/src/main/resources/Java/libraries/feign/model_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/model_test.mustache rename to src/main/resources/Java/libraries/feign/model_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/pom.mustache b/src/main/resources/Java/libraries/feign/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/feign/pom.mustache rename to src/main/resources/Java/libraries/feign/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/google-api-client/ApiClient.mustache b/src/main/resources/Java/libraries/google-api-client/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/google-api-client/ApiClient.mustache rename to src/main/resources/Java/libraries/google-api-client/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/google-api-client/api.mustache b/src/main/resources/Java/libraries/google-api-client/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/google-api-client/api.mustache rename to src/main/resources/Java/libraries/google-api-client/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/google-api-client/api_test.mustache b/src/main/resources/Java/libraries/google-api-client/api_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/google-api-client/api_test.mustache rename to src/main/resources/Java/libraries/google-api-client/api_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache b/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache rename to src/main/resources/Java/libraries/google-api-client/build.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache b/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/google-api-client/build.sbt.mustache rename to src/main/resources/Java/libraries/google-api-client/build.sbt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache b/src/main/resources/Java/libraries/google-api-client/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache rename to src/main/resources/Java/libraries/google-api-client/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache b/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache rename to src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache b/src/main/resources/Java/libraries/jersey2/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache rename to src/main/resources/Java/libraries/jersey2/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/ApiResponse.mustache b/src/main/resources/Java/libraries/jersey2/ApiResponse.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/ApiResponse.mustache rename to src/main/resources/Java/libraries/jersey2/ApiResponse.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache b/src/main/resources/Java/libraries/jersey2/JSON.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache rename to src/main/resources/Java/libraries/jersey2/JSON.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/additional_properties.mustache b/src/main/resources/Java/libraries/jersey2/additional_properties.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/additional_properties.mustache rename to src/main/resources/Java/libraries/jersey2/additional_properties.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache b/src/main/resources/Java/libraries/jersey2/anyof_model.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache rename to src/main/resources/Java/libraries/jersey2/anyof_model.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/api.mustache b/src/main/resources/Java/libraries/jersey2/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/api.mustache rename to src/main/resources/Java/libraries/jersey2/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/apiException.mustache b/src/main/resources/Java/libraries/jersey2/apiException.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/apiException.mustache rename to src/main/resources/Java/libraries/jersey2/apiException.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/api_doc.mustache b/src/main/resources/Java/libraries/jersey2/api_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/api_doc.mustache rename to src/main/resources/Java/libraries/jersey2/api_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/api_test.mustache b/src/main/resources/Java/libraries/jersey2/api_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/api_test.mustache rename to src/main/resources/Java/libraries/jersey2/api_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/auth/ApiKeyAuth.mustache b/src/main/resources/Java/libraries/jersey2/auth/ApiKeyAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/auth/ApiKeyAuth.mustache rename to src/main/resources/Java/libraries/jersey2/auth/ApiKeyAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/auth/Authentication.mustache b/src/main/resources/Java/libraries/jersey2/auth/Authentication.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/auth/Authentication.mustache rename to src/main/resources/Java/libraries/jersey2/auth/Authentication.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/auth/HttpBasicAuth.mustache b/src/main/resources/Java/libraries/jersey2/auth/HttpBasicAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/auth/HttpBasicAuth.mustache rename to src/main/resources/Java/libraries/jersey2/auth/HttpBasicAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/auth/HttpBearerAuth.mustache b/src/main/resources/Java/libraries/jersey2/auth/HttpBearerAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/auth/HttpBearerAuth.mustache rename to src/main/resources/Java/libraries/jersey2/auth/HttpBearerAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/auth/HttpSignatureAuth.mustache b/src/main/resources/Java/libraries/jersey2/auth/HttpSignatureAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/auth/HttpSignatureAuth.mustache rename to src/main/resources/Java/libraries/jersey2/auth/HttpSignatureAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache b/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache rename to src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/auth/OAuthFlow.mustache b/src/main/resources/Java/libraries/jersey2/auth/OAuthFlow.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/auth/OAuthFlow.mustache rename to src/main/resources/Java/libraries/jersey2/auth/OAuthFlow.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/src/main/resources/Java/libraries/jersey2/build.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache rename to src/main/resources/Java/libraries/jersey2/build.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache b/src/main/resources/Java/libraries/jersey2/build.sbt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/build.sbt.mustache rename to src/main/resources/Java/libraries/jersey2/build.sbt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/model.mustache b/src/main/resources/Java/libraries/jersey2/model.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/model.mustache rename to src/main/resources/Java/libraries/jersey2/model.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/model_anyof_doc.mustache b/src/main/resources/Java/libraries/jersey2/model_anyof_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/model_anyof_doc.mustache rename to src/main/resources/Java/libraries/jersey2/model_anyof_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/model_doc.mustache b/src/main/resources/Java/libraries/jersey2/model_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/model_doc.mustache rename to src/main/resources/Java/libraries/jersey2/model_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/model_oneof_doc.mustache b/src/main/resources/Java/libraries/jersey2/model_oneof_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/model_oneof_doc.mustache rename to src/main/resources/Java/libraries/jersey2/model_oneof_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/model_test.mustache b/src/main/resources/Java/libraries/jersey2/model_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/model_test.mustache rename to src/main/resources/Java/libraries/jersey2/model_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache b/src/main/resources/Java/libraries/jersey2/oneof_model.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/oneof_model.mustache rename to src/main/resources/Java/libraries/jersey2/oneof_model.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache b/src/main/resources/Java/libraries/jersey2/pojo.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache rename to src/main/resources/Java/libraries/jersey2/pojo.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/pom.mustache b/src/main/resources/Java/libraries/jersey2/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey2/pom.mustache rename to src/main/resources/Java/libraries/jersey2/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/AbstractOpenApiSchema.mustache b/src/main/resources/Java/libraries/jersey3/AbstractOpenApiSchema.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/AbstractOpenApiSchema.mustache rename to src/main/resources/Java/libraries/jersey3/AbstractOpenApiSchema.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache b/src/main/resources/Java/libraries/jersey3/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/ApiClient.mustache rename to src/main/resources/Java/libraries/jersey3/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/ApiResponse.mustache b/src/main/resources/Java/libraries/jersey3/ApiResponse.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/ApiResponse.mustache rename to src/main/resources/Java/libraries/jersey3/ApiResponse.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/JSON.mustache b/src/main/resources/Java/libraries/jersey3/JSON.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/JSON.mustache rename to src/main/resources/Java/libraries/jersey3/JSON.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/additional_properties.mustache b/src/main/resources/Java/libraries/jersey3/additional_properties.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/additional_properties.mustache rename to src/main/resources/Java/libraries/jersey3/additional_properties.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/anyof_model.mustache b/src/main/resources/Java/libraries/jersey3/anyof_model.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/anyof_model.mustache rename to src/main/resources/Java/libraries/jersey3/anyof_model.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/api.mustache b/src/main/resources/Java/libraries/jersey3/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/api.mustache rename to src/main/resources/Java/libraries/jersey3/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/apiException.mustache b/src/main/resources/Java/libraries/jersey3/apiException.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/apiException.mustache rename to src/main/resources/Java/libraries/jersey3/apiException.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/api_doc.mustache b/src/main/resources/Java/libraries/jersey3/api_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/api_doc.mustache rename to src/main/resources/Java/libraries/jersey3/api_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/api_test.mustache b/src/main/resources/Java/libraries/jersey3/api_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/api_test.mustache rename to src/main/resources/Java/libraries/jersey3/api_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/auth/ApiKeyAuth.mustache b/src/main/resources/Java/libraries/jersey3/auth/ApiKeyAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/auth/ApiKeyAuth.mustache rename to src/main/resources/Java/libraries/jersey3/auth/ApiKeyAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/auth/Authentication.mustache b/src/main/resources/Java/libraries/jersey3/auth/Authentication.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/auth/Authentication.mustache rename to src/main/resources/Java/libraries/jersey3/auth/Authentication.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/auth/HttpBasicAuth.mustache b/src/main/resources/Java/libraries/jersey3/auth/HttpBasicAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/auth/HttpBasicAuth.mustache rename to src/main/resources/Java/libraries/jersey3/auth/HttpBasicAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/auth/HttpBearerAuth.mustache b/src/main/resources/Java/libraries/jersey3/auth/HttpBearerAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/auth/HttpBearerAuth.mustache rename to src/main/resources/Java/libraries/jersey3/auth/HttpBearerAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/auth/HttpSignatureAuth.mustache b/src/main/resources/Java/libraries/jersey3/auth/HttpSignatureAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/auth/HttpSignatureAuth.mustache rename to src/main/resources/Java/libraries/jersey3/auth/HttpSignatureAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/auth/OAuth.mustache b/src/main/resources/Java/libraries/jersey3/auth/OAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/auth/OAuth.mustache rename to src/main/resources/Java/libraries/jersey3/auth/OAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/auth/OAuthFlow.mustache b/src/main/resources/Java/libraries/jersey3/auth/OAuthFlow.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/auth/OAuthFlow.mustache rename to src/main/resources/Java/libraries/jersey3/auth/OAuthFlow.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache b/src/main/resources/Java/libraries/jersey3/build.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/build.gradle.mustache rename to src/main/resources/Java/libraries/jersey3/build.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/build.sbt.mustache b/src/main/resources/Java/libraries/jersey3/build.sbt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/build.sbt.mustache rename to src/main/resources/Java/libraries/jersey3/build.sbt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/generatedAnnotation.mustache b/src/main/resources/Java/libraries/jersey3/generatedAnnotation.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/generatedAnnotation.mustache rename to src/main/resources/Java/libraries/jersey3/generatedAnnotation.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/model.mustache b/src/main/resources/Java/libraries/jersey3/model.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/model.mustache rename to src/main/resources/Java/libraries/jersey3/model.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/model_anyof_doc.mustache b/src/main/resources/Java/libraries/jersey3/model_anyof_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/model_anyof_doc.mustache rename to src/main/resources/Java/libraries/jersey3/model_anyof_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/model_doc.mustache b/src/main/resources/Java/libraries/jersey3/model_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/model_doc.mustache rename to src/main/resources/Java/libraries/jersey3/model_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/model_oneof_doc.mustache b/src/main/resources/Java/libraries/jersey3/model_oneof_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/model_oneof_doc.mustache rename to src/main/resources/Java/libraries/jersey3/model_oneof_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/model_test.mustache b/src/main/resources/Java/libraries/jersey3/model_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/model_test.mustache rename to src/main/resources/Java/libraries/jersey3/model_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/oneof_model.mustache b/src/main/resources/Java/libraries/jersey3/oneof_model.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/oneof_model.mustache rename to src/main/resources/Java/libraries/jersey3/oneof_model.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache b/src/main/resources/Java/libraries/jersey3/pojo.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache rename to src/main/resources/Java/libraries/jersey3/pojo.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/pom.mustache b/src/main/resources/Java/libraries/jersey3/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/jersey3/pom.mustache rename to src/main/resources/Java/libraries/jersey3/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/README.mustache b/src/main/resources/Java/libraries/microprofile/README.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/README.mustache rename to src/main/resources/Java/libraries/microprofile/README.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/api.mustache b/src/main/resources/Java/libraries/microprofile/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/api.mustache rename to src/main/resources/Java/libraries/microprofile/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/api_exception.mustache b/src/main/resources/Java/libraries/microprofile/api_exception.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/api_exception.mustache rename to src/main/resources/Java/libraries/microprofile/api_exception.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/api_exception_mapper.mustache b/src/main/resources/Java/libraries/microprofile/api_exception_mapper.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/api_exception_mapper.mustache rename to src/main/resources/Java/libraries/microprofile/api_exception_mapper.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/api_test.mustache b/src/main/resources/Java/libraries/microprofile/api_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/api_test.mustache rename to src/main/resources/Java/libraries/microprofile/api_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/beanValidation.mustache b/src/main/resources/Java/libraries/microprofile/beanValidation.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/beanValidation.mustache rename to src/main/resources/Java/libraries/microprofile/beanValidation.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/beanValidationCore.mustache b/src/main/resources/Java/libraries/microprofile/beanValidationCore.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/beanValidationCore.mustache rename to src/main/resources/Java/libraries/microprofile/beanValidationCore.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/beanValidationHeaderParams.mustache b/src/main/resources/Java/libraries/microprofile/beanValidationHeaderParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/beanValidationHeaderParams.mustache rename to src/main/resources/Java/libraries/microprofile/beanValidationHeaderParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/beanValidationPathParams.mustache b/src/main/resources/Java/libraries/microprofile/beanValidationPathParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/beanValidationPathParams.mustache rename to src/main/resources/Java/libraries/microprofile/beanValidationPathParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/beanValidationQueryParams.mustache b/src/main/resources/Java/libraries/microprofile/beanValidationQueryParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/beanValidationQueryParams.mustache rename to src/main/resources/Java/libraries/microprofile/beanValidationQueryParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/bodyParams.mustache b/src/main/resources/Java/libraries/microprofile/bodyParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/bodyParams.mustache rename to src/main/resources/Java/libraries/microprofile/bodyParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/bodyParamsImpl.mustache b/src/main/resources/Java/libraries/microprofile/bodyParamsImpl.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/bodyParamsImpl.mustache rename to src/main/resources/Java/libraries/microprofile/bodyParamsImpl.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache b/src/main/resources/Java/libraries/microprofile/enumClass.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache rename to src/main/resources/Java/libraries/microprofile/enumClass.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/enumOuterClass.mustache b/src/main/resources/Java/libraries/microprofile/enumOuterClass.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/enumOuterClass.mustache rename to src/main/resources/Java/libraries/microprofile/enumOuterClass.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/formParams.mustache b/src/main/resources/Java/libraries/microprofile/formParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/formParams.mustache rename to src/main/resources/Java/libraries/microprofile/formParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/formParamsImpl.mustache b/src/main/resources/Java/libraries/microprofile/formParamsImpl.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/formParamsImpl.mustache rename to src/main/resources/Java/libraries/microprofile/formParamsImpl.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/generatedAnnotation.mustache b/src/main/resources/Java/libraries/microprofile/generatedAnnotation.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/generatedAnnotation.mustache rename to src/main/resources/Java/libraries/microprofile/generatedAnnotation.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/headerParams.mustache b/src/main/resources/Java/libraries/microprofile/headerParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/headerParams.mustache rename to src/main/resources/Java/libraries/microprofile/headerParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/headerParamsImpl.mustache b/src/main/resources/Java/libraries/microprofile/headerParamsImpl.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/headerParamsImpl.mustache rename to src/main/resources/Java/libraries/microprofile/headerParamsImpl.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/kumuluzee.beans.xml.mustache b/src/main/resources/Java/libraries/microprofile/kumuluzee.beans.xml.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/kumuluzee.beans.xml.mustache rename to src/main/resources/Java/libraries/microprofile/kumuluzee.beans.xml.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/kumuluzee.config.yaml.mustache b/src/main/resources/Java/libraries/microprofile/kumuluzee.config.yaml.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/kumuluzee.config.yaml.mustache rename to src/main/resources/Java/libraries/microprofile/kumuluzee.config.yaml.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/kumuluzee.pom.mustache b/src/main/resources/Java/libraries/microprofile/kumuluzee.pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/kumuluzee.pom.mustache rename to src/main/resources/Java/libraries/microprofile/kumuluzee.pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/licenseInfo.mustache b/src/main/resources/Java/libraries/microprofile/licenseInfo.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/licenseInfo.mustache rename to src/main/resources/Java/libraries/microprofile/licenseInfo.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/model.mustache b/src/main/resources/Java/libraries/microprofile/model.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/model.mustache rename to src/main/resources/Java/libraries/microprofile/model.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/pathParams.mustache b/src/main/resources/Java/libraries/microprofile/pathParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/pathParams.mustache rename to src/main/resources/Java/libraries/microprofile/pathParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/pathParamsImpl.mustache b/src/main/resources/Java/libraries/microprofile/pathParamsImpl.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/pathParamsImpl.mustache rename to src/main/resources/Java/libraries/microprofile/pathParamsImpl.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache b/src/main/resources/Java/libraries/microprofile/pojo.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache rename to src/main/resources/Java/libraries/microprofile/pojo.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/pom.mustache b/src/main/resources/Java/libraries/microprofile/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/pom.mustache rename to src/main/resources/Java/libraries/microprofile/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache b/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache rename to src/main/resources/Java/libraries/microprofile/pom_3.0.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/queryParams.mustache b/src/main/resources/Java/libraries/microprofile/queryParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/queryParams.mustache rename to src/main/resources/Java/libraries/microprofile/queryParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/queryParamsImpl.mustache b/src/main/resources/Java/libraries/microprofile/queryParamsImpl.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/queryParamsImpl.mustache rename to src/main/resources/Java/libraries/microprofile/queryParamsImpl.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/returnTypes.mustache b/src/main/resources/Java/libraries/microprofile/returnTypes.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/microprofile/returnTypes.mustache rename to src/main/resources/Java/libraries/microprofile/returnTypes.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/AbstractOpenApiSchema.mustache b/src/main/resources/Java/libraries/native/AbstractOpenApiSchema.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/AbstractOpenApiSchema.mustache rename to src/main/resources/Java/libraries/native/AbstractOpenApiSchema.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/ApiClient.mustache b/src/main/resources/Java/libraries/native/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/ApiClient.mustache rename to src/main/resources/Java/libraries/native/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/ApiResponse.mustache b/src/main/resources/Java/libraries/native/ApiResponse.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/ApiResponse.mustache rename to src/main/resources/Java/libraries/native/ApiResponse.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/JSON.mustache b/src/main/resources/Java/libraries/native/JSON.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/JSON.mustache rename to src/main/resources/Java/libraries/native/JSON.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/README.mustache b/src/main/resources/Java/libraries/native/README.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/README.mustache rename to src/main/resources/Java/libraries/native/README.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/additional_properties.mustache b/src/main/resources/Java/libraries/native/additional_properties.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/additional_properties.mustache rename to src/main/resources/Java/libraries/native/additional_properties.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/anyof_model.mustache b/src/main/resources/Java/libraries/native/anyof_model.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/anyof_model.mustache rename to src/main/resources/Java/libraries/native/anyof_model.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/api.mustache b/src/main/resources/Java/libraries/native/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/api.mustache rename to src/main/resources/Java/libraries/native/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/apiException.mustache b/src/main/resources/Java/libraries/native/apiException.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/apiException.mustache rename to src/main/resources/Java/libraries/native/apiException.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/api_doc.mustache b/src/main/resources/Java/libraries/native/api_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/api_doc.mustache rename to src/main/resources/Java/libraries/native/api_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/api_test.mustache b/src/main/resources/Java/libraries/native/api_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/api_test.mustache rename to src/main/resources/Java/libraries/native/api_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/build.gradle.mustache b/src/main/resources/Java/libraries/native/build.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/build.gradle.mustache rename to src/main/resources/Java/libraries/native/build.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/generatedAnnotation.mustache b/src/main/resources/Java/libraries/native/generatedAnnotation.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/generatedAnnotation.mustache rename to src/main/resources/Java/libraries/native/generatedAnnotation.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/gradle.properties.mustache b/src/main/resources/Java/libraries/native/gradle.properties.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/gradle.properties.mustache rename to src/main/resources/Java/libraries/native/gradle.properties.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/model.mustache b/src/main/resources/Java/libraries/native/model.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/model.mustache rename to src/main/resources/Java/libraries/native/model.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/model_anyof_doc.mustache b/src/main/resources/Java/libraries/native/model_anyof_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/model_anyof_doc.mustache rename to src/main/resources/Java/libraries/native/model_anyof_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/model_doc.mustache b/src/main/resources/Java/libraries/native/model_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/model_doc.mustache rename to src/main/resources/Java/libraries/native/model_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/model_oneof_doc.mustache b/src/main/resources/Java/libraries/native/model_oneof_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/model_oneof_doc.mustache rename to src/main/resources/Java/libraries/native/model_oneof_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/oneof_model.mustache b/src/main/resources/Java/libraries/native/oneof_model.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/oneof_model.mustache rename to src/main/resources/Java/libraries/native/oneof_model.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/pojo.mustache b/src/main/resources/Java/libraries/native/pojo.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/pojo.mustache rename to src/main/resources/Java/libraries/native/pojo.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/pom.mustache b/src/main/resources/Java/libraries/native/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/pom.mustache rename to src/main/resources/Java/libraries/native/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/travis.mustache b/src/main/resources/Java/libraries/native/travis.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/native/travis.mustache rename to src/main/resources/Java/libraries/native/travis.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/AbstractOpenApiSchema.mustache b/src/main/resources/Java/libraries/okhttp-gson/AbstractOpenApiSchema.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/AbstractOpenApiSchema.mustache rename to src/main/resources/Java/libraries/okhttp-gson/AbstractOpenApiSchema.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/ApiCallback.mustache b/src/main/resources/Java/libraries/okhttp-gson/ApiCallback.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/ApiCallback.mustache rename to src/main/resources/Java/libraries/okhttp-gson/ApiCallback.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache b/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache rename to src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/ApiResponse.mustache b/src/main/resources/Java/libraries/okhttp-gson/ApiResponse.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/ApiResponse.mustache rename to src/main/resources/Java/libraries/okhttp-gson/ApiResponse.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/GzipRequestInterceptor.mustache b/src/main/resources/Java/libraries/okhttp-gson/GzipRequestInterceptor.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/GzipRequestInterceptor.mustache rename to src/main/resources/Java/libraries/okhttp-gson/GzipRequestInterceptor.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache b/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/JSON.mustache rename to src/main/resources/Java/libraries/okhttp-gson/JSON.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache b/src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache rename to src/main/resources/Java/libraries/okhttp-gson/ProgressRequestBody.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/ProgressResponseBody.mustache b/src/main/resources/Java/libraries/okhttp-gson/ProgressResponseBody.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/ProgressResponseBody.mustache rename to src/main/resources/Java/libraries/okhttp-gson/ProgressResponseBody.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/README.mustache b/src/main/resources/Java/libraries/okhttp-gson/README.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/README.mustache rename to src/main/resources/Java/libraries/okhttp-gson/README.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/additional_properties.mustache b/src/main/resources/Java/libraries/okhttp-gson/additional_properties.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/additional_properties.mustache rename to src/main/resources/Java/libraries/okhttp-gson/additional_properties.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/anyof_model.mustache b/src/main/resources/Java/libraries/okhttp-gson/anyof_model.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/anyof_model.mustache rename to src/main/resources/Java/libraries/okhttp-gson/anyof_model.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache b/src/main/resources/Java/libraries/okhttp-gson/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache rename to src/main/resources/Java/libraries/okhttp-gson/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/apiException.mustache b/src/main/resources/Java/libraries/okhttp-gson/apiException.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/apiException.mustache rename to src/main/resources/Java/libraries/okhttp-gson/apiException.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/api_doc.mustache b/src/main/resources/Java/libraries/okhttp-gson/api_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/api_doc.mustache rename to src/main/resources/Java/libraries/okhttp-gson/api_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/api_test.mustache b/src/main/resources/Java/libraries/okhttp-gson/api_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/api_test.mustache rename to src/main/resources/Java/libraries/okhttp-gson/api_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/auth/ApiKeyAuth.mustache b/src/main/resources/Java/libraries/okhttp-gson/auth/ApiKeyAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/auth/ApiKeyAuth.mustache rename to src/main/resources/Java/libraries/okhttp-gson/auth/ApiKeyAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/auth/Authentication.mustache b/src/main/resources/Java/libraries/okhttp-gson/auth/Authentication.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/auth/Authentication.mustache rename to src/main/resources/Java/libraries/okhttp-gson/auth/Authentication.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache b/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache rename to src/main/resources/Java/libraries/okhttp-gson/auth/HttpBasicAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBearerAuth.mustache b/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBearerAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/auth/HttpBearerAuth.mustache rename to src/main/resources/Java/libraries/okhttp-gson/auth/HttpBearerAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/auth/OAuth.mustache b/src/main/resources/Java/libraries/okhttp-gson/auth/OAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/auth/OAuth.mustache rename to src/main/resources/Java/libraries/okhttp-gson/auth/OAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/auth/OAuthOkHttpClient.mustache b/src/main/resources/Java/libraries/okhttp-gson/auth/OAuthOkHttpClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/auth/OAuthOkHttpClient.mustache rename to src/main/resources/Java/libraries/okhttp-gson/auth/OAuthOkHttpClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/auth/RetryingOAuth.mustache b/src/main/resources/Java/libraries/okhttp-gson/auth/RetryingOAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/auth/RetryingOAuth.mustache rename to src/main/resources/Java/libraries/okhttp-gson/auth/RetryingOAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache rename to src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache b/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache rename to src/main/resources/Java/libraries/okhttp-gson/build.sbt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/model.mustache b/src/main/resources/Java/libraries/okhttp-gson/model.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/model.mustache rename to src/main/resources/Java/libraries/okhttp-gson/model.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/model_test.mustache b/src/main/resources/Java/libraries/okhttp-gson/model_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/model_test.mustache rename to src/main/resources/Java/libraries/okhttp-gson/model_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/oneof_model.mustache b/src/main/resources/Java/libraries/okhttp-gson/oneof_model.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/oneof_model.mustache rename to src/main/resources/Java/libraries/okhttp-gson/oneof_model.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache b/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache rename to src/main/resources/Java/libraries/okhttp-gson/pojo.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/src/main/resources/Java/libraries/okhttp-gson/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache rename to src/main/resources/Java/libraries/okhttp-gson/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/ApiClient.mustache b/src/main/resources/Java/libraries/rest-assured/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/ApiClient.mustache rename to src/main/resources/Java/libraries/rest-assured/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/GsonObjectMapper.mustache b/src/main/resources/Java/libraries/rest-assured/GsonObjectMapper.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/GsonObjectMapper.mustache rename to src/main/resources/Java/libraries/rest-assured/GsonObjectMapper.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/JacksonObjectMapper.mustache b/src/main/resources/Java/libraries/rest-assured/JacksonObjectMapper.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/JacksonObjectMapper.mustache rename to src/main/resources/Java/libraries/rest-assured/JacksonObjectMapper.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/Oper.mustache b/src/main/resources/Java/libraries/rest-assured/Oper.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/Oper.mustache rename to src/main/resources/Java/libraries/rest-assured/Oper.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/README.mustache b/src/main/resources/Java/libraries/rest-assured/README.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/README.mustache rename to src/main/resources/Java/libraries/rest-assured/README.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/ResponseSpecBuilders.mustache b/src/main/resources/Java/libraries/rest-assured/ResponseSpecBuilders.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/ResponseSpecBuilders.mustache rename to src/main/resources/Java/libraries/rest-assured/ResponseSpecBuilders.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/api.mustache b/src/main/resources/Java/libraries/rest-assured/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/api.mustache rename to src/main/resources/Java/libraries/rest-assured/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/api_doc.mustache b/src/main/resources/Java/libraries/rest-assured/api_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/api_doc.mustache rename to src/main/resources/Java/libraries/rest-assured/api_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/api_test.mustache b/src/main/resources/Java/libraries/rest-assured/api_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/api_test.mustache rename to src/main/resources/Java/libraries/rest-assured/api_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache b/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache rename to src/main/resources/Java/libraries/rest-assured/build.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache b/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/build.sbt.mustache rename to src/main/resources/Java/libraries/rest-assured/build.sbt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache b/src/main/resources/Java/libraries/rest-assured/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache rename to src/main/resources/Java/libraries/rest-assured/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resteasy/ApiClient.mustache b/src/main/resources/Java/libraries/resteasy/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resteasy/ApiClient.mustache rename to src/main/resources/Java/libraries/resteasy/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resteasy/JSON.mustache b/src/main/resources/Java/libraries/resteasy/JSON.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resteasy/JSON.mustache rename to src/main/resources/Java/libraries/resteasy/JSON.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resteasy/api.mustache b/src/main/resources/Java/libraries/resteasy/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resteasy/api.mustache rename to src/main/resources/Java/libraries/resteasy/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache b/src/main/resources/Java/libraries/resteasy/build.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache rename to src/main/resources/Java/libraries/resteasy/build.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache b/src/main/resources/Java/libraries/resteasy/build.sbt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache rename to src/main/resources/Java/libraries/resteasy/build.sbt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resteasy/pom.mustache b/src/main/resources/Java/libraries/resteasy/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resteasy/pom.mustache rename to src/main/resources/Java/libraries/resteasy/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache b/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache rename to src/main/resources/Java/libraries/resttemplate/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/api.mustache b/src/main/resources/Java/libraries/resttemplate/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/api.mustache rename to src/main/resources/Java/libraries/resttemplate/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/api_test.mustache b/src/main/resources/Java/libraries/resttemplate/api_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/api_test.mustache rename to src/main/resources/Java/libraries/resttemplate/api_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/auth/ApiKeyAuth.mustache b/src/main/resources/Java/libraries/resttemplate/auth/ApiKeyAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/auth/ApiKeyAuth.mustache rename to src/main/resources/Java/libraries/resttemplate/auth/ApiKeyAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/auth/Authentication.mustache b/src/main/resources/Java/libraries/resttemplate/auth/Authentication.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/auth/Authentication.mustache rename to src/main/resources/Java/libraries/resttemplate/auth/Authentication.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/auth/HttpBasicAuth.mustache b/src/main/resources/Java/libraries/resttemplate/auth/HttpBasicAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/auth/HttpBasicAuth.mustache rename to src/main/resources/Java/libraries/resttemplate/auth/HttpBasicAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/auth/HttpBearerAuth.mustache b/src/main/resources/Java/libraries/resttemplate/auth/HttpBearerAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/auth/HttpBearerAuth.mustache rename to src/main/resources/Java/libraries/resttemplate/auth/HttpBearerAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/auth/OAuth.mustache b/src/main/resources/Java/libraries/resttemplate/auth/OAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/auth/OAuth.mustache rename to src/main/resources/Java/libraries/resttemplate/auth/OAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/auth/OAuthFlow.mustache b/src/main/resources/Java/libraries/resttemplate/auth/OAuthFlow.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/auth/OAuthFlow.mustache rename to src/main/resources/Java/libraries/resttemplate/auth/OAuthFlow.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache b/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache rename to src/main/resources/Java/libraries/resttemplate/build.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache b/src/main/resources/Java/libraries/resttemplate/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache rename to src/main/resources/Java/libraries/resttemplate/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/ApiClient.mustache b/src/main/resources/Java/libraries/retrofit/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/ApiClient.mustache rename to src/main/resources/Java/libraries/retrofit/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/CollectionFormats.mustache b/src/main/resources/Java/libraries/retrofit/CollectionFormats.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/CollectionFormats.mustache rename to src/main/resources/Java/libraries/retrofit/CollectionFormats.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/README.mustache b/src/main/resources/Java/libraries/retrofit/README.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/README.mustache rename to src/main/resources/Java/libraries/retrofit/README.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/api.mustache b/src/main/resources/Java/libraries/retrofit/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/api.mustache rename to src/main/resources/Java/libraries/retrofit/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/api_test.mustache b/src/main/resources/Java/libraries/retrofit/api_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/api_test.mustache rename to src/main/resources/Java/libraries/retrofit/api_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/auth/ApiKeyAuth.mustache b/src/main/resources/Java/libraries/retrofit/auth/ApiKeyAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/auth/ApiKeyAuth.mustache rename to src/main/resources/Java/libraries/retrofit/auth/ApiKeyAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/auth/HttpBasicAuth.mustache b/src/main/resources/Java/libraries/retrofit/auth/HttpBasicAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/auth/HttpBasicAuth.mustache rename to src/main/resources/Java/libraries/retrofit/auth/HttpBasicAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/auth/HttpBearerAuth.mustache b/src/main/resources/Java/libraries/retrofit/auth/HttpBearerAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/auth/HttpBearerAuth.mustache rename to src/main/resources/Java/libraries/retrofit/auth/HttpBearerAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/auth/OAuth.mustache b/src/main/resources/Java/libraries/retrofit/auth/OAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/auth/OAuth.mustache rename to src/main/resources/Java/libraries/retrofit/auth/OAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/auth/OAuthOkHttpClient.mustache b/src/main/resources/Java/libraries/retrofit/auth/OAuthOkHttpClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/auth/OAuthOkHttpClient.mustache rename to src/main/resources/Java/libraries/retrofit/auth/OAuthOkHttpClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/bodyParams.mustache b/src/main/resources/Java/libraries/retrofit/bodyParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/bodyParams.mustache rename to src/main/resources/Java/libraries/retrofit/bodyParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache b/src/main/resources/Java/libraries/retrofit/build.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache rename to src/main/resources/Java/libraries/retrofit/build.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache b/src/main/resources/Java/libraries/retrofit/build.sbt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/build.sbt.mustache rename to src/main/resources/Java/libraries/retrofit/build.sbt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/formParams.mustache b/src/main/resources/Java/libraries/retrofit/formParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/formParams.mustache rename to src/main/resources/Java/libraries/retrofit/formParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/headerParams.mustache b/src/main/resources/Java/libraries/retrofit/headerParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/headerParams.mustache rename to src/main/resources/Java/libraries/retrofit/headerParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/pathParams.mustache b/src/main/resources/Java/libraries/retrofit/pathParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/pathParams.mustache rename to src/main/resources/Java/libraries/retrofit/pathParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/pom.mustache b/src/main/resources/Java/libraries/retrofit/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/pom.mustache rename to src/main/resources/Java/libraries/retrofit/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/queryParams.mustache b/src/main/resources/Java/libraries/retrofit/queryParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit/queryParams.mustache rename to src/main/resources/Java/libraries/retrofit/queryParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache b/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/ApiClient.mustache rename to src/main/resources/Java/libraries/retrofit2/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/CollectionFormats.mustache b/src/main/resources/Java/libraries/retrofit2/CollectionFormats.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/CollectionFormats.mustache rename to src/main/resources/Java/libraries/retrofit2/CollectionFormats.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/JSON.mustache b/src/main/resources/Java/libraries/retrofit2/JSON.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/JSON.mustache rename to src/main/resources/Java/libraries/retrofit2/JSON.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/README.mustache b/src/main/resources/Java/libraries/retrofit2/README.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/README.mustache rename to src/main/resources/Java/libraries/retrofit2/README.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/api.mustache b/src/main/resources/Java/libraries/retrofit2/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/api.mustache rename to src/main/resources/Java/libraries/retrofit2/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/api_test.mustache b/src/main/resources/Java/libraries/retrofit2/api_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/api_test.mustache rename to src/main/resources/Java/libraries/retrofit2/api_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/auth/ApiKeyAuth.mustache b/src/main/resources/Java/libraries/retrofit2/auth/ApiKeyAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/auth/ApiKeyAuth.mustache rename to src/main/resources/Java/libraries/retrofit2/auth/ApiKeyAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/auth/HttpBasicAuth.mustache b/src/main/resources/Java/libraries/retrofit2/auth/HttpBasicAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/auth/HttpBasicAuth.mustache rename to src/main/resources/Java/libraries/retrofit2/auth/HttpBasicAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/auth/HttpBearerAuth.mustache b/src/main/resources/Java/libraries/retrofit2/auth/HttpBearerAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/auth/HttpBearerAuth.mustache rename to src/main/resources/Java/libraries/retrofit2/auth/HttpBearerAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache b/src/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache rename to src/main/resources/Java/libraries/retrofit2/auth/OAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/auth/OAuthOkHttpClient.mustache b/src/main/resources/Java/libraries/retrofit2/auth/OAuthOkHttpClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/auth/OAuthOkHttpClient.mustache rename to src/main/resources/Java/libraries/retrofit2/auth/OAuthOkHttpClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/bodyParams.mustache b/src/main/resources/Java/libraries/retrofit2/bodyParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/bodyParams.mustache rename to src/main/resources/Java/libraries/retrofit2/bodyParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache rename to src/main/resources/Java/libraries/retrofit2/build.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache b/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/build.sbt.mustache rename to src/main/resources/Java/libraries/retrofit2/build.sbt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/formParams.mustache b/src/main/resources/Java/libraries/retrofit2/formParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/formParams.mustache rename to src/main/resources/Java/libraries/retrofit2/formParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/formParams.mustache.save b/src/main/resources/Java/libraries/retrofit2/formParams.mustache.save similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/formParams.mustache.save rename to src/main/resources/Java/libraries/retrofit2/formParams.mustache.save diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/headerParams.mustache b/src/main/resources/Java/libraries/retrofit2/headerParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/headerParams.mustache rename to src/main/resources/Java/libraries/retrofit2/headerParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/pathParams.mustache b/src/main/resources/Java/libraries/retrofit2/pathParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/pathParams.mustache rename to src/main/resources/Java/libraries/retrofit2/pathParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play-common/auth/ApiKeyAuth.mustache b/src/main/resources/Java/libraries/retrofit2/play-common/auth/ApiKeyAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play-common/auth/ApiKeyAuth.mustache rename to src/main/resources/Java/libraries/retrofit2/play-common/auth/ApiKeyAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play24/ApiClient.mustache b/src/main/resources/Java/libraries/retrofit2/play24/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play24/ApiClient.mustache rename to src/main/resources/Java/libraries/retrofit2/play24/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play24/Play24CallAdapterFactory.mustache b/src/main/resources/Java/libraries/retrofit2/play24/Play24CallAdapterFactory.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play24/Play24CallAdapterFactory.mustache rename to src/main/resources/Java/libraries/retrofit2/play24/Play24CallAdapterFactory.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache b/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache rename to src/main/resources/Java/libraries/retrofit2/play24/Play24CallFactory.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play24/api.mustache b/src/main/resources/Java/libraries/retrofit2/play24/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play24/api.mustache rename to src/main/resources/Java/libraries/retrofit2/play24/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play25/ApiClient.mustache b/src/main/resources/Java/libraries/retrofit2/play25/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play25/ApiClient.mustache rename to src/main/resources/Java/libraries/retrofit2/play25/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play25/Play25CallAdapterFactory.mustache b/src/main/resources/Java/libraries/retrofit2/play25/Play25CallAdapterFactory.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play25/Play25CallAdapterFactory.mustache rename to src/main/resources/Java/libraries/retrofit2/play25/Play25CallAdapterFactory.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play25/Play25CallFactory.mustache b/src/main/resources/Java/libraries/retrofit2/play25/Play25CallFactory.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play25/Play25CallFactory.mustache rename to src/main/resources/Java/libraries/retrofit2/play25/Play25CallFactory.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play25/api.mustache b/src/main/resources/Java/libraries/retrofit2/play25/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play25/api.mustache rename to src/main/resources/Java/libraries/retrofit2/play25/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play26/ApiClient.mustache b/src/main/resources/Java/libraries/retrofit2/play26/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play26/ApiClient.mustache rename to src/main/resources/Java/libraries/retrofit2/play26/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play26/Play26CallAdapterFactory.mustache b/src/main/resources/Java/libraries/retrofit2/play26/Play26CallAdapterFactory.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play26/Play26CallAdapterFactory.mustache rename to src/main/resources/Java/libraries/retrofit2/play26/Play26CallAdapterFactory.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play26/Play26CallFactory.mustache b/src/main/resources/Java/libraries/retrofit2/play26/Play26CallFactory.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play26/Play26CallFactory.mustache rename to src/main/resources/Java/libraries/retrofit2/play26/Play26CallFactory.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play26/api.mustache b/src/main/resources/Java/libraries/retrofit2/play26/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/play26/api.mustache rename to src/main/resources/Java/libraries/retrofit2/play26/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache b/src/main/resources/Java/libraries/retrofit2/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache rename to src/main/resources/Java/libraries/retrofit2/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/queryParams.mustache b/src/main/resources/Java/libraries/retrofit2/queryParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/retrofit2/queryParams.mustache rename to src/main/resources/Java/libraries/retrofit2/queryParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/ApiClient.mustache b/src/main/resources/Java/libraries/vertx/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/ApiClient.mustache rename to src/main/resources/Java/libraries/vertx/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/Configuration.mustache b/src/main/resources/Java/libraries/vertx/Configuration.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/Configuration.mustache rename to src/main/resources/Java/libraries/vertx/Configuration.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/api.mustache b/src/main/resources/Java/libraries/vertx/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/api.mustache rename to src/main/resources/Java/libraries/vertx/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/apiException.mustache b/src/main/resources/Java/libraries/vertx/apiException.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/apiException.mustache rename to src/main/resources/Java/libraries/vertx/apiException.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/apiImpl.mustache b/src/main/resources/Java/libraries/vertx/apiImpl.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/apiImpl.mustache rename to src/main/resources/Java/libraries/vertx/apiImpl.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/api_test.mustache b/src/main/resources/Java/libraries/vertx/api_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/api_test.mustache rename to src/main/resources/Java/libraries/vertx/api_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/auth/ApiKeyAuth.mustache b/src/main/resources/Java/libraries/vertx/auth/ApiKeyAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/auth/ApiKeyAuth.mustache rename to src/main/resources/Java/libraries/vertx/auth/ApiKeyAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/auth/Authentication.mustache b/src/main/resources/Java/libraries/vertx/auth/Authentication.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/auth/Authentication.mustache rename to src/main/resources/Java/libraries/vertx/auth/Authentication.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/auth/HttpBasicAuth.mustache b/src/main/resources/Java/libraries/vertx/auth/HttpBasicAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/auth/HttpBasicAuth.mustache rename to src/main/resources/Java/libraries/vertx/auth/HttpBasicAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/auth/HttpBearerAuth.mustache b/src/main/resources/Java/libraries/vertx/auth/HttpBearerAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/auth/HttpBearerAuth.mustache rename to src/main/resources/Java/libraries/vertx/auth/HttpBearerAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/auth/OAuth.mustache b/src/main/resources/Java/libraries/vertx/auth/OAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/auth/OAuth.mustache rename to src/main/resources/Java/libraries/vertx/auth/OAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/auth/OAuthFlow.mustache b/src/main/resources/Java/libraries/vertx/auth/OAuthFlow.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/auth/OAuthFlow.mustache rename to src/main/resources/Java/libraries/vertx/auth/OAuthFlow.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache b/src/main/resources/Java/libraries/vertx/build.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache rename to src/main/resources/Java/libraries/vertx/build.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/pom.mustache b/src/main/resources/Java/libraries/vertx/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/pom.mustache rename to src/main/resources/Java/libraries/vertx/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/rxApiImpl.mustache b/src/main/resources/Java/libraries/vertx/rxApiImpl.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/vertx/rxApiImpl.mustache rename to src/main/resources/Java/libraries/vertx/rxApiImpl.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache b/src/main/resources/Java/libraries/webclient/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache rename to src/main/resources/Java/libraries/webclient/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/api.mustache b/src/main/resources/Java/libraries/webclient/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/api.mustache rename to src/main/resources/Java/libraries/webclient/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/api_test.mustache b/src/main/resources/Java/libraries/webclient/api_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/api_test.mustache rename to src/main/resources/Java/libraries/webclient/api_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/auth/ApiKeyAuth.mustache b/src/main/resources/Java/libraries/webclient/auth/ApiKeyAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/auth/ApiKeyAuth.mustache rename to src/main/resources/Java/libraries/webclient/auth/ApiKeyAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/auth/Authentication.mustache b/src/main/resources/Java/libraries/webclient/auth/Authentication.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/auth/Authentication.mustache rename to src/main/resources/Java/libraries/webclient/auth/Authentication.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/auth/HttpBasicAuth.mustache b/src/main/resources/Java/libraries/webclient/auth/HttpBasicAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/auth/HttpBasicAuth.mustache rename to src/main/resources/Java/libraries/webclient/auth/HttpBasicAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/auth/HttpBearerAuth.mustache b/src/main/resources/Java/libraries/webclient/auth/HttpBearerAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/auth/HttpBearerAuth.mustache rename to src/main/resources/Java/libraries/webclient/auth/HttpBearerAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/auth/OAuth.mustache b/src/main/resources/Java/libraries/webclient/auth/OAuth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/auth/OAuth.mustache rename to src/main/resources/Java/libraries/webclient/auth/OAuth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/auth/OAuthFlow.mustache b/src/main/resources/Java/libraries/webclient/auth/OAuthFlow.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/auth/OAuthFlow.mustache rename to src/main/resources/Java/libraries/webclient/auth/OAuthFlow.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache b/src/main/resources/Java/libraries/webclient/build.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache rename to src/main/resources/Java/libraries/webclient/build.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/pom.mustache b/src/main/resources/Java/libraries/webclient/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/libraries/webclient/pom.mustache rename to src/main/resources/Java/libraries/webclient/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/licenseInfo.mustache b/src/main/resources/Java/licenseInfo.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/licenseInfo.mustache rename to src/main/resources/Java/licenseInfo.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/manifest.mustache b/src/main/resources/Java/manifest.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/manifest.mustache rename to src/main/resources/Java/manifest.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/maven.yml.mustache b/src/main/resources/Java/maven.yml.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/maven.yml.mustache rename to src/main/resources/Java/maven.yml.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/model.mustache b/src/main/resources/Java/model.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/model.mustache rename to src/main/resources/Java/model.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/modelEnum.mustache b/src/main/resources/Java/modelEnum.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/modelEnum.mustache rename to src/main/resources/Java/modelEnum.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/modelInnerEnum.mustache b/src/main/resources/Java/modelInnerEnum.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/modelInnerEnum.mustache rename to src/main/resources/Java/modelInnerEnum.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/model_doc.mustache b/src/main/resources/Java/model_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/model_doc.mustache rename to src/main/resources/Java/model_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/model_test.mustache b/src/main/resources/Java/model_test.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/model_test.mustache rename to src/main/resources/Java/model_test.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/oneof_interface.mustache b/src/main/resources/Java/oneof_interface.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/oneof_interface.mustache rename to src/main/resources/Java/oneof_interface.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/openapi.mustache b/src/main/resources/Java/openapi.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/openapi.mustache rename to src/main/resources/Java/openapi.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/pojo.mustache b/src/main/resources/Java/pojo.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/pojo.mustache rename to src/main/resources/Java/pojo.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/pojo_doc.mustache b/src/main/resources/Java/pojo_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/pojo_doc.mustache rename to src/main/resources/Java/pojo_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/pom.mustache b/src/main/resources/Java/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/pom.mustache rename to src/main/resources/Java/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/settings.gradle.mustache b/src/main/resources/Java/settings.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/settings.gradle.mustache rename to src/main/resources/Java/settings.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/travis.mustache b/src/main/resources/Java/travis.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/travis.mustache rename to src/main/resources/Java/travis.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/typeInfoAnnotation.mustache b/src/main/resources/Java/typeInfoAnnotation.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/typeInfoAnnotation.mustache rename to src/main/resources/Java/typeInfoAnnotation.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/Java/xmlAnnotation.mustache b/src/main/resources/Java/xmlAnnotation.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/Java/xmlAnnotation.mustache rename to src/main/resources/Java/xmlAnnotation.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.generators.Generator b/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.generators.Generator similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.generators.Generator rename to src/main/resources/META-INF/services/org.openapijsonschematools.codegen.generators.Generator diff --git a/modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter b/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/META-INF/services/org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter rename to src/main/resources/META-INF/services/org.openapijsonschematools.codegen.templating.TemplatingEngineAdapter diff --git a/modules/openapi-json-schema-generator/src/main/resources/_common/.gitignore b/src/main/resources/_common/.gitignore similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/_common/.gitignore rename to src/main/resources/_common/.gitignore diff --git a/modules/openapi-json-schema-generator/src/main/resources/_common/.openapi-generator-ignore b/src/main/resources/_common/.openapi-generator-ignore similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/_common/.openapi-generator-ignore rename to src/main/resources/_common/.openapi-generator-ignore diff --git a/modules/openapi-json-schema-generator/src/main/resources/codegen/README.mustache b/src/main/resources/codegen/README.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/codegen/README.mustache rename to src/main/resources/codegen/README.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/codegen/api.template b/src/main/resources/codegen/api.template similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/codegen/api.template rename to src/main/resources/codegen/api.template diff --git a/modules/openapi-json-schema-generator/src/main/resources/codegen/generatorClass.mustache b/src/main/resources/codegen/generatorClass.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/codegen/generatorClass.mustache rename to src/main/resources/codegen/generatorClass.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/codegen/generatorClassTest.mustache b/src/main/resources/codegen/generatorClassTest.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/codegen/generatorClassTest.mustache rename to src/main/resources/codegen/generatorClassTest.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/codegen/kotlin/README.mustache b/src/main/resources/codegen/kotlin/README.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/codegen/kotlin/README.mustache rename to src/main/resources/codegen/kotlin/README.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/codegen/kotlin/build_gradle.mustache b/src/main/resources/codegen/kotlin/build_gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/codegen/kotlin/build_gradle.mustache rename to src/main/resources/codegen/kotlin/build_gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/codegen/kotlin/generatorClass.mustache b/src/main/resources/codegen/kotlin/generatorClass.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/codegen/kotlin/generatorClass.mustache rename to src/main/resources/codegen/kotlin/generatorClass.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/codegen/kotlin/generatorClassTest.mustache b/src/main/resources/codegen/kotlin/generatorClassTest.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/codegen/kotlin/generatorClassTest.mustache rename to src/main/resources/codegen/kotlin/generatorClassTest.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/codegen/kotlin/gradle.properties b/src/main/resources/codegen/kotlin/gradle.properties similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/codegen/kotlin/gradle.properties rename to src/main/resources/codegen/kotlin/gradle.properties diff --git a/modules/openapi-json-schema-generator/src/main/resources/codegen/kotlin/settings.mustache b/src/main/resources/codegen/kotlin/settings.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/codegen/kotlin/settings.mustache rename to src/main/resources/codegen/kotlin/settings.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/codegen/model.template b/src/main/resources/codegen/model.template similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/codegen/model.template rename to src/main/resources/codegen/model.template diff --git a/modules/openapi-json-schema-generator/src/main/resources/codegen/myFile.template b/src/main/resources/codegen/myFile.template similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/codegen/myFile.template rename to src/main/resources/codegen/myFile.template diff --git a/modules/openapi-json-schema-generator/src/main/resources/codegen/pom.mustache b/src/main/resources/codegen/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/codegen/pom.mustache rename to src/main/resources/codegen/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/codegen/services.mustache b/src/main/resources/codegen/services.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/codegen/services.mustache rename to src/main/resources/codegen/services.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/README.mustache b/src/main/resources/kotlin-client/README.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/README.mustache rename to src/main/resources/kotlin-client/README.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/api_doc.mustache b/src/main/resources/kotlin-client/api_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/api_doc.mustache rename to src/main/resources/kotlin-client/api_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/build.gradle.mustache b/src/main/resources/kotlin-client/build.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/build.gradle.mustache rename to src/main/resources/kotlin-client/build.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/class_doc.mustache b/src/main/resources/kotlin-client/class_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/class_doc.mustache rename to src/main/resources/kotlin-client/class_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/data_class.mustache b/src/main/resources/kotlin-client/data_class.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/data_class.mustache rename to src/main/resources/kotlin-client/data_class.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache b/src/main/resources/kotlin-client/data_class_opt_var.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/data_class_opt_var.mustache rename to src/main/resources/kotlin-client/data_class_opt_var.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/data_class_req_var.mustache b/src/main/resources/kotlin-client/data_class_req_var.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/data_class_req_var.mustache rename to src/main/resources/kotlin-client/data_class_req_var.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/enum_class.mustache b/src/main/resources/kotlin-client/enum_class.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/enum_class.mustache rename to src/main/resources/kotlin-client/enum_class.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/enum_doc.mustache b/src/main/resources/kotlin-client/enum_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/enum_doc.mustache rename to src/main/resources/kotlin-client/enum_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/gradle-wrapper.jar b/src/main/resources/kotlin-client/gradle-wrapper.jar similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/gradle-wrapper.jar rename to src/main/resources/kotlin-client/gradle-wrapper.jar diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/gradle-wrapper.properties.mustache b/src/main/resources/kotlin-client/gradle-wrapper.properties.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/gradle-wrapper.properties.mustache rename to src/main/resources/kotlin-client/gradle-wrapper.properties.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/gradlew.bat.mustache b/src/main/resources/kotlin-client/gradlew.bat.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/gradlew.bat.mustache rename to src/main/resources/kotlin-client/gradlew.bat.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/gradlew.mustache b/src/main/resources/kotlin-client/gradlew.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/gradlew.mustache rename to src/main/resources/kotlin-client/gradlew.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/infrastructure/ApiAbstractions.kt.mustache b/src/main/resources/kotlin-client/infrastructure/ApiAbstractions.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/infrastructure/ApiAbstractions.kt.mustache rename to src/main/resources/kotlin-client/infrastructure/ApiAbstractions.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/infrastructure/PartConfig.kt.mustache b/src/main/resources/kotlin-client/infrastructure/PartConfig.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/infrastructure/PartConfig.kt.mustache rename to src/main/resources/kotlin-client/infrastructure/PartConfig.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/infrastructure/RequestConfig.kt.mustache b/src/main/resources/kotlin-client/infrastructure/RequestConfig.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/infrastructure/RequestConfig.kt.mustache rename to src/main/resources/kotlin-client/infrastructure/RequestConfig.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/infrastructure/RequestMethod.kt.mustache b/src/main/resources/kotlin-client/infrastructure/RequestMethod.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/infrastructure/RequestMethod.kt.mustache rename to src/main/resources/kotlin-client/infrastructure/RequestMethod.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/interface_opt_var.mustache b/src/main/resources/kotlin-client/interface_opt_var.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/interface_opt_var.mustache rename to src/main/resources/kotlin-client/interface_opt_var.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/interface_req_var.mustache b/src/main/resources/kotlin-client/interface_req_var.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/interface_req_var.mustache rename to src/main/resources/kotlin-client/interface_req_var.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/AtomicBooleanAdapter.kt.mustache b/src/main/resources/kotlin-client/jvm-common/infrastructure/AtomicBooleanAdapter.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/AtomicBooleanAdapter.kt.mustache rename to src/main/resources/kotlin-client/jvm-common/infrastructure/AtomicBooleanAdapter.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/AtomicIntegerAdapter.kt.mustache b/src/main/resources/kotlin-client/jvm-common/infrastructure/AtomicIntegerAdapter.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/AtomicIntegerAdapter.kt.mustache rename to src/main/resources/kotlin-client/jvm-common/infrastructure/AtomicIntegerAdapter.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/AtomicLongAdapter.kt.mustache b/src/main/resources/kotlin-client/jvm-common/infrastructure/AtomicLongAdapter.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/AtomicLongAdapter.kt.mustache rename to src/main/resources/kotlin-client/jvm-common/infrastructure/AtomicLongAdapter.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/BigDecimalAdapter.kt.mustache b/src/main/resources/kotlin-client/jvm-common/infrastructure/BigDecimalAdapter.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/BigDecimalAdapter.kt.mustache rename to src/main/resources/kotlin-client/jvm-common/infrastructure/BigDecimalAdapter.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/BigIntegerAdapter.kt.mustache b/src/main/resources/kotlin-client/jvm-common/infrastructure/BigIntegerAdapter.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/BigIntegerAdapter.kt.mustache rename to src/main/resources/kotlin-client/jvm-common/infrastructure/BigIntegerAdapter.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/ByteArrayAdapter.kt.mustache b/src/main/resources/kotlin-client/jvm-common/infrastructure/ByteArrayAdapter.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/ByteArrayAdapter.kt.mustache rename to src/main/resources/kotlin-client/jvm-common/infrastructure/ByteArrayAdapter.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/LocalDateAdapter.kt.mustache b/src/main/resources/kotlin-client/jvm-common/infrastructure/LocalDateAdapter.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/LocalDateAdapter.kt.mustache rename to src/main/resources/kotlin-client/jvm-common/infrastructure/LocalDateAdapter.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/LocalDateTimeAdapter.kt.mustache b/src/main/resources/kotlin-client/jvm-common/infrastructure/LocalDateTimeAdapter.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/LocalDateTimeAdapter.kt.mustache rename to src/main/resources/kotlin-client/jvm-common/infrastructure/LocalDateTimeAdapter.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/OffsetDateTimeAdapter.kt.mustache b/src/main/resources/kotlin-client/jvm-common/infrastructure/OffsetDateTimeAdapter.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/OffsetDateTimeAdapter.kt.mustache rename to src/main/resources/kotlin-client/jvm-common/infrastructure/OffsetDateTimeAdapter.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/Serializer.kt.mustache b/src/main/resources/kotlin-client/jvm-common/infrastructure/Serializer.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/Serializer.kt.mustache rename to src/main/resources/kotlin-client/jvm-common/infrastructure/Serializer.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/SerializerHelper.kt.mustache b/src/main/resources/kotlin-client/jvm-common/infrastructure/SerializerHelper.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/SerializerHelper.kt.mustache rename to src/main/resources/kotlin-client/jvm-common/infrastructure/SerializerHelper.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/StringBuilderAdapter.kt.mustache b/src/main/resources/kotlin-client/jvm-common/infrastructure/StringBuilderAdapter.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/StringBuilderAdapter.kt.mustache rename to src/main/resources/kotlin-client/jvm-common/infrastructure/StringBuilderAdapter.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/URIAdapter.kt.mustache b/src/main/resources/kotlin-client/jvm-common/infrastructure/URIAdapter.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/URIAdapter.kt.mustache rename to src/main/resources/kotlin-client/jvm-common/infrastructure/URIAdapter.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/URLAdapter.kt.mustache b/src/main/resources/kotlin-client/jvm-common/infrastructure/URLAdapter.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/URLAdapter.kt.mustache rename to src/main/resources/kotlin-client/jvm-common/infrastructure/URLAdapter.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/UUIDAdapter.kt.mustache b/src/main/resources/kotlin-client/jvm-common/infrastructure/UUIDAdapter.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/UUIDAdapter.kt.mustache rename to src/main/resources/kotlin-client/jvm-common/infrastructure/UUIDAdapter.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/proguard-rules.pro.mustache b/src/main/resources/kotlin-client/jvm-common/infrastructure/proguard-rules.pro.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/jvm-common/infrastructure/proguard-rules.pro.mustache rename to src/main/resources/kotlin-client/jvm-common/infrastructure/proguard-rules.pro.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/api.mustache b/src/main/resources/kotlin-client/libraries/jvm-ktor/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/api.mustache rename to src/main/resources/kotlin-client/libraries/jvm-ktor/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/ApiKeyAuth.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/ApiKeyAuth.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/ApiKeyAuth.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-ktor/auth/ApiKeyAuth.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/Authentication.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/Authentication.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/Authentication.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-ktor/auth/Authentication.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/HttpBasicAuth.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/HttpBasicAuth.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/HttpBasicAuth.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-ktor/auth/HttpBasicAuth.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/HttpBearerAuth.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/HttpBearerAuth.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/HttpBearerAuth.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-ktor/auth/HttpBearerAuth.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/OAuth.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/OAuth.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/auth/OAuth.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-ktor/auth/OAuth.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/infrastructure/ApiClient.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-ktor/infrastructure/ApiClient.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/infrastructure/ApiClient.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-ktor/infrastructure/ApiClient.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/infrastructure/HttpResponse.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-ktor/infrastructure/HttpResponse.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-ktor/infrastructure/HttpResponse.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-ktor/infrastructure/HttpResponse.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache b/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache rename to src/main/resources/kotlin-client/libraries/jvm-okhttp/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiResponse.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiResponse.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiResponse.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiResponse.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/Errors.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/Errors.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/Errors.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/Errors.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ResponseExtensions.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ResponseExtensions.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ResponseExtensions.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ResponseExtensions.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api_doc.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/api_doc.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/api_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/ApiKeyAuth.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/ApiKeyAuth.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/ApiKeyAuth.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/ApiKeyAuth.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBasicAuth.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBasicAuth.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBasicAuth.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBasicAuth.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBearerAuth.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBearerAuth.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBearerAuth.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBearerAuth.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuth.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuth.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuth.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuth.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuthFlow.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuthFlow.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuthFlow.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuthFlow.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuthOkHttpClient.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuthOkHttpClient.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuthOkHttpClient.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/OAuthOkHttpClient.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/bodyParams.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/bodyParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/bodyParams.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/bodyParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/explodedQueryParam.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/explodedQueryParam.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/explodedQueryParam.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/explodedQueryParam.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/formParams.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/formParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/formParams.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/formParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/headerParams.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/headerParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/headerParams.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/headerParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ApiClient.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/CollectionFormats.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/CollectionFormats.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/CollectionFormats.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/CollectionFormats.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ResponseExt.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ResponseExt.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ResponseExt.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/infrastructure/ResponseExt.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/paramJavadoc.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/paramJavadoc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/paramJavadoc.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/paramJavadoc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/pathParams.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/pathParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/pathParams.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/pathParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/queryParam.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/queryParam.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/queryParam.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/queryParam.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/queryParams.mustache b/src/main/resources/kotlin-client/libraries/jvm-retrofit2/queryParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/queryParams.mustache rename to src/main/resources/kotlin-client/libraries/jvm-retrofit2/queryParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/README.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/README.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/README.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/README.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/api.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/api.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/api_doc.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/api_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/api_doc.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/api_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/auth/apikeyauth.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/auth/apikeyauth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/auth/apikeyauth.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/auth/apikeyauth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/auth/authentication.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/auth/authentication.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/auth/authentication.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/auth/authentication.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/auth/httpbasicauth.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/auth/httpbasicauth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/auth/httpbasicauth.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/auth/httpbasicauth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/auth/oauth.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/auth/oauth.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/auth/oauth.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/auth/oauth.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/bodyParams.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/bodyParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/bodyParams.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/bodyParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/build.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/build.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/build.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/build.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/formParams.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/formParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/formParams.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/formParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/gradle.properties.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/gradle.properties.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/gradle.properties.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/gradle.properties.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/headerParams.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/headerParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/headerParams.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/headerParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/infrastructure/CollectionFormats.kt.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/infrastructure/CollectionFormats.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/infrastructure/CollectionFormats.kt.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/infrastructure/CollectionFormats.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/infrastructure/ITransformForStorage.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/infrastructure/ITransformForStorage.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/infrastructure/ITransformForStorage.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/infrastructure/ITransformForStorage.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/manifest.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/manifest.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/manifest.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/manifest.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/pathParams.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/pathParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/pathParams.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/pathParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/queryParams.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/queryParams.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/queryParams.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/queryParams.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/request/GsonRequest.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/request/GsonRequest.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/request/GsonRequest.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/request/GsonRequest.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/request/IRequestFactory.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/request/IRequestFactory.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/request/IRequestFactory.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/request/IRequestFactory.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/request/RequestFactory.mustache b/src/main/resources/kotlin-client/libraries/jvm-volley/request/RequestFactory.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/jvm-volley/request/RequestFactory.mustache rename to src/main/resources/kotlin-client/libraries/jvm-volley/request/RequestFactory.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/api.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/api.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/auth/ApiKeyAuth.kt.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/auth/ApiKeyAuth.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/auth/ApiKeyAuth.kt.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/auth/ApiKeyAuth.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/auth/Authentication.kt.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/auth/Authentication.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/auth/Authentication.kt.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/auth/Authentication.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/auth/HttpBasicAuth.kt.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/auth/HttpBasicAuth.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/auth/HttpBasicAuth.kt.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/auth/HttpBasicAuth.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/auth/HttpBearerAuth.kt.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/auth/HttpBearerAuth.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/auth/HttpBearerAuth.kt.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/auth/HttpBearerAuth.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/auth/OAuth.kt.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/auth/OAuth.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/auth/OAuth.kt.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/auth/OAuth.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/build.gradle.kts.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/commonTest/Coroutine.kt.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/commonTest/Coroutine.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/commonTest/Coroutine.kt.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/commonTest/Coroutine.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/ApiClient.kt.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/ApiClient.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/ApiClient.kt.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/ApiClient.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/Base64ByteArray.kt.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/Base64ByteArray.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/Base64ByteArray.kt.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/Base64ByteArray.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/Bytes.kt.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/Bytes.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/Bytes.kt.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/Bytes.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/HttpResponse.kt.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/HttpResponse.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/HttpResponse.kt.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/HttpResponse.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/OctetByteArray.kt.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/OctetByteArray.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/OctetByteArray.kt.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/OctetByteArray.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/iosTest/Coroutine.kt.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/iosTest/Coroutine.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/iosTest/Coroutine.kt.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/iosTest/Coroutine.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/jsTest/Coroutine.kt.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/jsTest/Coroutine.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/jsTest/Coroutine.kt.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/jsTest/Coroutine.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/jvmTest/Coroutine.kt.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/jvmTest/Coroutine.kt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/jvmTest/Coroutine.kt.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/jvmTest/Coroutine.kt.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/pom.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/pom.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_request_list.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_request_list.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_request_list.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_request_list.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_request_map.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_request_map.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_request_map.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_request_map.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_response_list.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_response_list.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_response_list.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_response_list.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_response_map.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_response_map.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_response_map.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/serial_wrapper_response_map.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/settings.gradle.kts.mustache b/src/main/resources/kotlin-client/libraries/multiplatform/settings.gradle.kts.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/libraries/multiplatform/settings.gradle.kts.mustache rename to src/main/resources/kotlin-client/libraries/multiplatform/settings.gradle.kts.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/licenseInfo.mustache b/src/main/resources/kotlin-client/licenseInfo.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/licenseInfo.mustache rename to src/main/resources/kotlin-client/licenseInfo.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/model.mustache b/src/main/resources/kotlin-client/model.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/model.mustache rename to src/main/resources/kotlin-client/model.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/modelMutable.mustache b/src/main/resources/kotlin-client/modelMutable.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/modelMutable.mustache rename to src/main/resources/kotlin-client/modelMutable.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/model_doc.mustache b/src/main/resources/kotlin-client/model_doc.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/model_doc.mustache rename to src/main/resources/kotlin-client/model_doc.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/model_room.mustache b/src/main/resources/kotlin-client/model_room.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/model_room.mustache rename to src/main/resources/kotlin-client/model_room.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/model_room_init_var.mustache b/src/main/resources/kotlin-client/model_room_init_var.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/model_room_init_var.mustache rename to src/main/resources/kotlin-client/model_room_init_var.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/settings.gradle.mustache b/src/main/resources/kotlin-client/settings.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/settings.gradle.mustache rename to src/main/resources/kotlin-client/settings.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/kotlin-client/typeInfoAnnotation.mustache b/src/main/resources/kotlin-client/typeInfoAnnotation.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/kotlin-client/typeInfoAnnotation.mustache rename to src/main/resources/kotlin-client/typeInfoAnnotation.mustache diff --git a/modules/openapi-json-schema-generator/src/main/resources/logback.xml b/src/main/resources/logback.xml similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/logback.xml rename to src/main/resources/logback.xml diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/README.hbs b/src/main/resources/python/README.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/README.hbs rename to src/main/resources/python/README.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/README_onlypackage.hbs b/src/main/resources/python/README_onlypackage.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/README_onlypackage.hbs rename to src/main/resources/python/README_onlypackage.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/__init__.hbs b/src/main/resources/python/__init__.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/__init__.hbs rename to src/main/resources/python/__init__.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/__init__package.hbs b/src/main/resources/python/__init__package.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/__init__package.hbs rename to src/main/resources/python/__init__package.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/__init__test_paths.hbs b/src/main/resources/python/__init__test_paths.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/__init__test_paths.hbs rename to src/main/resources/python/__init__test_paths.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/_helper_footer_links.hbs b/src/main/resources/python/_helper_footer_links.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/_helper_footer_links.hbs rename to src/main/resources/python/_helper_footer_links.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/_helper_header.hbs b/src/main/resources/python/_helper_header.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/_helper_header.hbs rename to src/main/resources/python/_helper_header.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/_helper_imports.hbs b/src/main/resources/python/_helper_imports.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/_helper_imports.hbs rename to src/main/resources/python/_helper_imports.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/_helper_readme_common.hbs b/src/main/resources/python/_helper_readme_common.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/_helper_readme_common.hbs rename to src/main/resources/python/_helper_readme_common.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/_helper_required_libraries.hbs b/src/main/resources/python/_helper_required_libraries.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/_helper_required_libraries.hbs rename to src/main/resources/python/_helper_required_libraries.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/_helper_schema_python_type_newline.hbs b/src/main/resources/python/_helper_schema_python_type_newline.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/_helper_schema_python_type_newline.hbs rename to src/main/resources/python/_helper_schema_python_type_newline.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/_helper_schema_python_types.hbs b/src/main/resources/python/_helper_schema_python_types.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/_helper_schema_python_types.hbs rename to src/main/resources/python/_helper_schema_python_types.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/_helper_schema_python_types_newline.hbs b/src/main/resources/python/_helper_schema_python_types_newline.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/_helper_schema_python_types_newline.hbs rename to src/main/resources/python/_helper_schema_python_types_newline.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/api_client.hbs b/src/main/resources/python/api_client.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/api_client.hbs rename to src/main/resources/python/api_client.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/api_response.hbs b/src/main/resources/python/api_response.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/api_response.hbs rename to src/main/resources/python/api_response.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/apis/__init__.hbs b/src/main/resources/python/apis/__init__.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/apis/__init__.hbs rename to src/main/resources/python/apis/__init__.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/apis/apis_path_to_api.hbs b/src/main/resources/python/apis/apis_path_to_api.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/apis/apis_path_to_api.hbs rename to src/main/resources/python/apis/apis_path_to_api.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/apis/apis_tag_to_api.hbs b/src/main/resources/python/apis/apis_tag_to_api.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/apis/apis_tag_to_api.hbs rename to src/main/resources/python/apis/apis_tag_to_api.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/apis/paths/__init__.hbs b/src/main/resources/python/apis/paths/__init__.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/apis/paths/__init__.hbs rename to src/main/resources/python/apis/paths/__init__.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/apis/paths/api.hbs b/src/main/resources/python/apis/paths/api.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/apis/paths/api.hbs rename to src/main/resources/python/apis/paths/api.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/apis/tags/__init__.hbs b/src/main/resources/python/apis/tags/__init__.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/apis/tags/__init__.hbs rename to src/main/resources/python/apis/tags/__init__.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/apis/tags/api.hbs b/src/main/resources/python/apis/tags/api.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/apis/tags/api.hbs rename to src/main/resources/python/apis/tags/api.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/apis/tags/api_doc.hbs b/src/main/resources/python/apis/tags/api_doc.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/apis/tags/api_doc.hbs rename to src/main/resources/python/apis/tags/api_doc.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/_helper_anchor_id.hbs b/src/main/resources/python/components/_helper_anchor_id.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/_helper_anchor_id.hbs rename to src/main/resources/python/components/_helper_anchor_id.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/_helper_content_schema_output_type.hbs b/src/main/resources/python/components/_helper_content_schema_output_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/_helper_content_schema_output_type.hbs rename to src/main/resources/python/components/_helper_content_schema_output_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/_helper_content_schema_type.hbs b/src/main/resources/python/components/_helper_content_schema_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/_helper_content_schema_type.hbs rename to src/main/resources/python/components/_helper_content_schema_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/_helper_header_from_identifier_pieces.hbs b/src/main/resources/python/components/_helper_header_from_identifier_pieces.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/_helper_header_from_identifier_pieces.hbs rename to src/main/resources/python/components/_helper_header_from_identifier_pieces.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/_helper_param_or_header_instance.hbs b/src/main/resources/python/components/_helper_param_or_header_instance.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/_helper_param_or_header_instance.hbs rename to src/main/resources/python/components/_helper_param_or_header_instance.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/_helper_schema_accessed_types.hbs b/src/main/resources/python/components/_helper_schema_accessed_types.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/_helper_schema_accessed_types.hbs rename to src/main/resources/python/components/_helper_schema_accessed_types.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/headers/header.hbs b/src/main/resources/python/components/headers/header.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/headers/header.hbs rename to src/main/resources/python/components/headers/header.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/headers/header_doc.hbs b/src/main/resources/python/components/headers/header_doc.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/headers/header_doc.hbs rename to src/main/resources/python/components/headers/header_doc.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/parameters/parameter.hbs b/src/main/resources/python/components/parameters/parameter.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/parameters/parameter.hbs rename to src/main/resources/python/components/parameters/parameter.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/parameters/parameter_doc.hbs b/src/main/resources/python/components/parameters/parameter_doc.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/parameters/parameter_doc.hbs rename to src/main/resources/python/components/parameters/parameter_doc.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/request_bodies/request_body.hbs b/src/main/resources/python/components/request_bodies/request_body.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/request_bodies/request_body.hbs rename to src/main/resources/python/components/request_bodies/request_body.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/request_bodies/request_body_doc.hbs b/src/main/resources/python/components/request_bodies/request_body_doc.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/request_bodies/request_body_doc.hbs rename to src/main/resources/python/components/request_bodies/request_body_doc.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/responses/response.hbs b/src/main/resources/python/components/responses/response.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/responses/response.hbs rename to src/main/resources/python/components/responses/response.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/responses/response_doc.hbs b/src/main/resources/python/components/responses/response_doc.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/responses/response_doc.hbs rename to src/main/resources/python/components/responses/response_doc.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/__init__schema.hbs b/src/main/resources/python/components/schemas/__init__schema.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/__init__schema.hbs rename to src/main/resources/python/components/schemas/__init__schema.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/__init__schemas.hbs b/src/main/resources/python/components/schemas/__init__schemas.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/__init__schemas.hbs rename to src/main/resources/python/components/schemas/__init__schemas.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_allof_type.hbs b/src/main/resources/python/components/schemas/_helper_allof_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_allof_type.hbs rename to src/main/resources/python/components/schemas/_helper_allof_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_anyof_type.hbs b/src/main/resources/python/components/schemas/_helper_anyof_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_anyof_type.hbs rename to src/main/resources/python/components/schemas/_helper_anyof_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_array_input_type.hbs b/src/main/resources/python/components/schemas/_helper_array_input_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_array_input_type.hbs rename to src/main/resources/python/components/schemas/_helper_array_input_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_array_output_type.hbs b/src/main/resources/python/components/schemas/_helper_array_output_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_array_output_type.hbs rename to src/main/resources/python/components/schemas/_helper_array_output_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_composed_schemas.hbs b/src/main/resources/python/components/schemas/_helper_composed_schemas.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_composed_schemas.hbs rename to src/main/resources/python/components/schemas/_helper_composed_schemas.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_dict_partial.hbs b/src/main/resources/python/components/schemas/_helper_dict_partial.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_dict_partial.hbs rename to src/main/resources/python/components/schemas/_helper_dict_partial.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_enum_class.hbs b/src/main/resources/python/components/schemas/_helper_enum_class.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_enum_class.hbs rename to src/main/resources/python/components/schemas/_helper_enum_class.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_getschemas.hbs b/src/main/resources/python/components/schemas/_helper_getschemas.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_getschemas.hbs rename to src/main/resources/python/components/schemas/_helper_getschemas.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_identifier_suffix.hbs b/src/main/resources/python/components/schemas/_helper_identifier_suffix.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_identifier_suffix.hbs rename to src/main/resources/python/components/schemas/_helper_identifier_suffix.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_list_partial.hbs b/src/main/resources/python/components/schemas/_helper_list_partial.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_list_partial.hbs rename to src/main/resources/python/components/schemas/_helper_list_partial.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_new.hbs b/src/main/resources/python/components/schemas/_helper_new.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_new.hbs rename to src/main/resources/python/components/schemas/_helper_new.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_notes_msg.hbs b/src/main/resources/python/components/schemas/_helper_notes_msg.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_notes_msg.hbs rename to src/main/resources/python/components/schemas/_helper_notes_msg.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_object_get_property.hbs b/src/main/resources/python/components/schemas/_helper_object_get_property.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_object_get_property.hbs rename to src/main/resources/python/components/schemas/_helper_object_get_property.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_object_output_properties.hbs b/src/main/resources/python/components/schemas/_helper_object_output_properties.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_object_output_properties.hbs rename to src/main/resources/python/components/schemas/_helper_object_output_properties.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_object_output_type.hbs b/src/main/resources/python/components/schemas/_helper_object_output_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_object_output_type.hbs rename to src/main/resources/python/components/schemas/_helper_object_output_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_oneof_type.hbs b/src/main/resources/python/components/schemas/_helper_oneof_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_oneof_type.hbs rename to src/main/resources/python/components/schemas/_helper_oneof_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_optional_properties_input_type.hbs b/src/main/resources/python/components/schemas/_helper_optional_properties_input_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_optional_properties_input_type.hbs rename to src/main/resources/python/components/schemas/_helper_optional_properties_input_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_payload_renderer.hbs b/src/main/resources/python/components/schemas/_helper_payload_renderer.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_payload_renderer.hbs rename to src/main/resources/python/components/schemas/_helper_payload_renderer.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_prefix_property_value_type.hbs b/src/main/resources/python/components/schemas/_helper_prefix_property_value_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_prefix_property_value_type.hbs rename to src/main/resources/python/components/schemas/_helper_prefix_property_value_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_prefix_ref_property_value_type.hbs b/src/main/resources/python/components/schemas/_helper_prefix_ref_property_value_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_prefix_ref_property_value_type.hbs rename to src/main/resources/python/components/schemas/_helper_prefix_ref_property_value_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_properties_input_type.hbs b/src/main/resources/python/components/schemas/_helper_properties_input_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_properties_input_type.hbs rename to src/main/resources/python/components/schemas/_helper_properties_input_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_properties_type.hbs b/src/main/resources/python/components/schemas/_helper_properties_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_properties_type.hbs rename to src/main/resources/python/components/schemas/_helper_properties_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_property_value_type.hbs b/src/main/resources/python/components/schemas/_helper_property_value_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_property_value_type.hbs rename to src/main/resources/python/components/schemas/_helper_property_value_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_refclass_partial.hbs b/src/main/resources/python/components/schemas/_helper_refclass_partial.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_refclass_partial.hbs rename to src/main/resources/python/components/schemas/_helper_refclass_partial.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_required_properties_input_type.hbs b/src/main/resources/python/components/schemas/_helper_required_properties_input_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_required_properties_input_type.hbs rename to src/main/resources/python/components/schemas/_helper_required_properties_input_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_composed_or_anytype.hbs b/src/main/resources/python/components/schemas/_helper_schema_composed_or_anytype.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_composed_or_anytype.hbs rename to src/main/resources/python/components/schemas/_helper_schema_composed_or_anytype.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_dict.hbs b/src/main/resources/python/components/schemas/_helper_schema_dict.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_dict.hbs rename to src/main/resources/python/components/schemas/_helper_schema_dict.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_enum.hbs b/src/main/resources/python/components/schemas/_helper_schema_enum.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_enum.hbs rename to src/main/resources/python/components/schemas/_helper_schema_enum.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_input_ref_type.hbs b/src/main/resources/python/components/schemas/_helper_schema_input_ref_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_input_ref_type.hbs rename to src/main/resources/python/components/schemas/_helper_schema_input_ref_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_input_type.hbs b/src/main/resources/python/components/schemas/_helper_schema_input_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_input_type.hbs rename to src/main/resources/python/components/schemas/_helper_schema_input_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_input_type_base.hbs b/src/main/resources/python/components/schemas/_helper_schema_input_type_base.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_input_type_base.hbs rename to src/main/resources/python/components/schemas/_helper_schema_input_type_base.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_list.hbs b/src/main/resources/python/components/schemas/_helper_schema_list.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_list.hbs rename to src/main/resources/python/components/schemas/_helper_schema_list.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_output_ref_single.hbs b/src/main/resources/python/components/schemas/_helper_schema_output_ref_single.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_output_ref_single.hbs rename to src/main/resources/python/components/schemas/_helper_schema_output_ref_single.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_output_ref_type.hbs b/src/main/resources/python/components/schemas/_helper_schema_output_ref_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_output_ref_type.hbs rename to src/main/resources/python/components/schemas/_helper_schema_output_ref_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_output_type.hbs b/src/main/resources/python/components/schemas/_helper_schema_output_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_output_type.hbs rename to src/main/resources/python/components/schemas/_helper_schema_output_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_output_type_base.hbs b/src/main/resources/python/components/schemas/_helper_schema_output_type_base.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_output_type_base.hbs rename to src/main/resources/python/components/schemas/_helper_schema_output_type_base.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_output_type_single.hbs b/src/main/resources/python/components/schemas/_helper_schema_output_type_single.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_output_type_single.hbs rename to src/main/resources/python/components/schemas/_helper_schema_output_type_single.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_python_base_types.hbs b/src/main/resources/python/components/schemas/_helper_schema_python_base_types.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_python_base_types.hbs rename to src/main/resources/python/components/schemas/_helper_schema_python_base_types.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_python_base_types_newline.hbs b/src/main/resources/python/components/schemas/_helper_schema_python_base_types_newline.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_python_base_types_newline.hbs rename to src/main/resources/python/components/schemas/_helper_schema_python_base_types_newline.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_simple.hbs b/src/main/resources/python/components/schemas/_helper_schema_simple.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_simple.hbs rename to src/main/resources/python/components/schemas/_helper_schema_simple.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_switch_case.hbs b/src/main/resources/python/components/schemas/_helper_schema_switch_case.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_schema_switch_case.hbs rename to src/main/resources/python/components/schemas/_helper_schema_switch_case.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_types.hbs b/src/main/resources/python/components/schemas/_helper_types.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_types.hbs rename to src/main/resources/python/components/schemas/_helper_types.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_types_all_accessed_oneline.hbs b/src/main/resources/python/components/schemas/_helper_types_all_accessed_oneline.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_types_all_accessed_oneline.hbs rename to src/main/resources/python/components/schemas/_helper_types_all_accessed_oneline.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_types_all_incl_schema_oneline.hbs b/src/main/resources/python/components/schemas/_helper_types_all_incl_schema_oneline.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_types_all_incl_schema_oneline.hbs rename to src/main/resources/python/components/schemas/_helper_types_all_incl_schema_oneline.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_validate.hbs b/src/main/resources/python/components/schemas/_helper_validate.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_validate.hbs rename to src/main/resources/python/components/schemas/_helper_validate.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_validate_args.hbs b/src/main/resources/python/components/schemas/_helper_validate_args.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_validate_args.hbs rename to src/main/resources/python/components/schemas/_helper_validate_args.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_validate_bool_overload.hbs b/src/main/resources/python/components/schemas/_helper_validate_bool_overload.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_validate_bool_overload.hbs rename to src/main/resources/python/components/schemas/_helper_validate_bool_overload.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_validate_int_overload.hbs b/src/main/resources/python/components/schemas/_helper_validate_int_overload.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_validate_int_overload.hbs rename to src/main/resources/python/components/schemas/_helper_validate_int_overload.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_validate_str_overload.hbs b/src/main/resources/python/components/schemas/_helper_validate_str_overload.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_validate_str_overload.hbs rename to src/main/resources/python/components/schemas/_helper_validate_str_overload.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_validations.hbs b/src/main/resources/python/components/schemas/_helper_validations.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_validations.hbs rename to src/main/resources/python/components/schemas/_helper_validations.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_var_equals_cls.hbs b/src/main/resources/python/components/schemas/_helper_var_equals_cls.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_var_equals_cls.hbs rename to src/main/resources/python/components/schemas/_helper_var_equals_cls.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_xbase_one_type.hbs b/src/main/resources/python/components/schemas/_helper_xbase_one_type.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/_helper_xbase_one_type.hbs rename to src/main/resources/python/components/schemas/_helper_xbase_one_type.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/schema.hbs b/src/main/resources/python/components/schemas/schema.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/schema.hbs rename to src/main/resources/python/components/schemas/schema.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/schema_doc.hbs b/src/main/resources/python/components/schemas/schema_doc.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/schema_doc.hbs rename to src/main/resources/python/components/schemas/schema_doc.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/schema_test.hbs b/src/main/resources/python/components/schemas/schema_test.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/schemas/schema_test.hbs rename to src/main/resources/python/components/schemas/schema_test.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/security_schemes/security_scheme.hbs b/src/main/resources/python/components/security_schemes/security_scheme.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/security_schemes/security_scheme.hbs rename to src/main/resources/python/components/security_schemes/security_scheme.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/components/security_schemes/security_scheme_doc.hbs b/src/main/resources/python/components/security_schemes/security_scheme_doc.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/components/security_schemes/security_scheme_doc.hbs rename to src/main/resources/python/components/security_schemes/security_scheme_doc.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/configurations/api_configuration.hbs b/src/main/resources/python/configurations/api_configuration.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/configurations/api_configuration.hbs rename to src/main/resources/python/configurations/api_configuration.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/configurations/schema_configuration.hbs b/src/main/resources/python/configurations/schema_configuration.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/configurations/schema_configuration.hbs rename to src/main/resources/python/configurations/schema_configuration.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/exceptions.hbs b/src/main/resources/python/exceptions.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/exceptions.hbs rename to src/main/resources/python/exceptions.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/git_push.hbs b/src/main/resources/python/git_push.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/git_push.hbs rename to src/main/resources/python/git_push.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/gitignore.hbs b/src/main/resources/python/gitignore.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/gitignore.hbs rename to src/main/resources/python/gitignore.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/gitlab-ci.hbs b/src/main/resources/python/gitlab-ci.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/gitlab-ci.hbs rename to src/main/resources/python/gitlab-ci.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/migration_2_0_0.hbs b/src/main/resources/python/migration_2_0_0.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/migration_2_0_0.hbs rename to src/main/resources/python/migration_2_0_0.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/migration_3_0_0.hbs b/src/main/resources/python/migration_3_0_0.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/migration_3_0_0.hbs rename to src/main/resources/python/migration_3_0_0.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/migration_other_python_generators.hbs b/src/main/resources/python/migration_other_python_generators.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/migration_other_python_generators.hbs rename to src/main/resources/python/migration_other_python_generators.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/paths/__init__paths.hbs b/src/main/resources/python/paths/__init__paths.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/paths/__init__paths.hbs rename to src/main/resources/python/paths/__init__paths.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/paths/path/__init__path.hbs b/src/main/resources/python/paths/path/__init__path.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/paths/path/__init__path.hbs rename to src/main/resources/python/paths/path/__init__path.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_args.hbs b/src/main/resources/python/paths/path/verb/_helper_operation_args.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_args.hbs rename to src/main/resources/python/paths/path/verb/_helper_operation_args.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_args_body.hbs b/src/main/resources/python/paths/path/verb/_helper_operation_args_body.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_args_body.hbs rename to src/main/resources/python/paths/path/verb/_helper_operation_args_body.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_args_optional.hbs b/src/main/resources/python/paths/path/verb/_helper_operation_args_optional.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_args_optional.hbs rename to src/main/resources/python/paths/path/verb/_helper_operation_args_optional.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_args_passed.hbs b/src/main/resources/python/paths/path/verb/_helper_operation_args_passed.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_args_passed.hbs rename to src/main/resources/python/paths/path/verb/_helper_operation_args_passed.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_args_required.hbs b/src/main/resources/python/paths/path/verb/_helper_operation_args_required.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_args_required.hbs rename to src/main/resources/python/paths/path/verb/_helper_operation_args_required.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_body_serialization.hbs b/src/main/resources/python/paths/path/verb/_helper_operation_body_serialization.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_body_serialization.hbs rename to src/main/resources/python/paths/path/verb/_helper_operation_body_serialization.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_doc_configuration_partial.hbs b/src/main/resources/python/paths/path/verb/_helper_operation_doc_configuration_partial.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_doc_configuration_partial.hbs rename to src/main/resources/python/paths/path/verb/_helper_operation_doc_configuration_partial.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_doc_example.hbs b/src/main/resources/python/paths/path/verb/_helper_operation_doc_example.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_doc_example.hbs rename to src/main/resources/python/paths/path/verb/_helper_operation_doc_example.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_doc_security_scheme_info_partial.hbs b/src/main/resources/python/paths/path/verb/_helper_operation_doc_security_scheme_info_partial.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_doc_security_scheme_info_partial.hbs rename to src/main/resources/python/paths/path/verb/_helper_operation_doc_security_scheme_info_partial.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_docs_xparams.hbs b/src/main/resources/python/paths/path/verb/_helper_operation_docs_xparams.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_docs_xparams.hbs rename to src/main/resources/python/paths/path/verb/_helper_operation_docs_xparams.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_response_type_hint.hbs b/src/main/resources/python/paths/path/verb/_helper_operation_response_type_hint.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_response_type_hint.hbs rename to src/main/resources/python/paths/path/verb/_helper_operation_response_type_hint.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_test_partial.hbs b/src/main/resources/python/paths/path/verb/_helper_operation_test_partial.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_test_partial.hbs rename to src/main/resources/python/paths/path/verb/_helper_operation_test_partial.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_test_response_content.hbs b/src/main/resources/python/paths/path/verb/_helper_operation_test_response_content.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/_helper_operation_test_response_content.hbs rename to src/main/resources/python/paths/path/verb/_helper_operation_test_response_content.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/operation.hbs b/src/main/resources/python/paths/path/verb/operation.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/operation.hbs rename to src/main/resources/python/paths/path/verb/operation.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/operation_doc.hbs b/src/main/resources/python/paths/path/verb/operation_doc.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/operation_doc.hbs rename to src/main/resources/python/paths/path/verb/operation_doc.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/operation_test.hbs b/src/main/resources/python/paths/path/verb/operation_test.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/paths/path/verb/operation_test.hbs rename to src/main/resources/python/paths/path/verb/operation_test.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/pyproject.hbs b/src/main/resources/python/pyproject.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/pyproject.hbs rename to src/main/resources/python/pyproject.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/rest.hbs b/src/main/resources/python/rest.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/rest.hbs rename to src/main/resources/python/rest.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/schemas/__init__.hbs b/src/main/resources/python/schemas/__init__.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/schemas/__init__.hbs rename to src/main/resources/python/schemas/__init__.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/schemas/format.hbs b/src/main/resources/python/schemas/format.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/schemas/format.hbs rename to src/main/resources/python/schemas/format.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/schemas/original_immutabledict.hbs b/src/main/resources/python/schemas/original_immutabledict.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/schemas/original_immutabledict.hbs rename to src/main/resources/python/schemas/original_immutabledict.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/schemas/schema.hbs b/src/main/resources/python/schemas/schema.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/schemas/schema.hbs rename to src/main/resources/python/schemas/schema.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/schemas/schemas.hbs b/src/main/resources/python/schemas/schemas.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/schemas/schemas.hbs rename to src/main/resources/python/schemas/schemas.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/schemas/validation.hbs b/src/main/resources/python/schemas/validation.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/schemas/validation.hbs rename to src/main/resources/python/schemas/validation.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/security/security.hbs b/src/main/resources/python/security/security.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/security/security.hbs rename to src/main/resources/python/security/security.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/security_schemes.hbs b/src/main/resources/python/security_schemes.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/security_schemes.hbs rename to src/main/resources/python/security_schemes.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/server.hbs b/src/main/resources/python/server.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/server.hbs rename to src/main/resources/python/server.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/servers/server.hbs b/src/main/resources/python/servers/server.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/servers/server.hbs rename to src/main/resources/python/servers/server.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/servers/server_doc.hbs b/src/main/resources/python/servers/server_doc.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/servers/server_doc.hbs rename to src/main/resources/python/servers/server_doc.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/shared_imports/header_imports.hbs b/src/main/resources/python/shared_imports/header_imports.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/shared_imports/header_imports.hbs rename to src/main/resources/python/shared_imports/header_imports.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/shared_imports/operation_imports.hbs b/src/main/resources/python/shared_imports/operation_imports.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/shared_imports/operation_imports.hbs rename to src/main/resources/python/shared_imports/operation_imports.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/shared_imports/response_imports.hbs b/src/main/resources/python/shared_imports/response_imports.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/shared_imports/response_imports.hbs rename to src/main/resources/python/shared_imports/response_imports.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/shared_imports/schema_imports.hbs b/src/main/resources/python/shared_imports/schema_imports.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/shared_imports/schema_imports.hbs rename to src/main/resources/python/shared_imports/schema_imports.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/shared_imports/security_scheme_imports.hbs b/src/main/resources/python/shared_imports/security_scheme_imports.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/shared_imports/security_scheme_imports.hbs rename to src/main/resources/python/shared_imports/security_scheme_imports.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/shared_imports/server_imports.hbs b/src/main/resources/python/shared_imports/server_imports.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/shared_imports/server_imports.hbs rename to src/main/resources/python/shared_imports/server_imports.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/signing.hbs b/src/main/resources/python/signing.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/signing.hbs rename to src/main/resources/python/signing.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/test-requirements.hbs b/src/main/resources/python/test-requirements.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/test-requirements.hbs rename to src/main/resources/python/test-requirements.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/tox.hbs b/src/main/resources/python/tox.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/tox.hbs rename to src/main/resources/python/tox.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/travis.hbs b/src/main/resources/python/travis.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/python/travis.hbs rename to src/main/resources/python/travis.hbs diff --git a/modules/openapi-json-schema-generator/src/main/resources/validator/index.mustache b/src/main/resources/validator/index.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/main/resources/validator/index.mustache rename to src/main/resources/validator/index.mustache diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java b/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java rename to src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/ArchUnitRulesTest.java b/src/test/java/org/openapijsonschematools/codegen/ArchUnitRulesTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/ArchUnitRulesTest.java rename to src/test/java/org/openapijsonschematools/codegen/ArchUnitRulesTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java b/src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java rename to src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TestUtils.java b/src/test/java/org/openapijsonschematools/codegen/TestUtils.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/TestUtils.java rename to src/test/java/org/openapijsonschematools/codegen/TestUtils.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplateTest.java b/src/test/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplateTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplateTest.java rename to src/test/java/org/openapijsonschematools/codegen/clicommands/AuthorTemplateTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateBatchTest.java b/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateBatchTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateBatchTest.java rename to src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateBatchTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateTest.java b/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateTest.java rename to src/test/java/org/openapijsonschematools/codegen/clicommands/GenerateTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/OptionUtilsTest.java b/src/test/java/org/openapijsonschematools/codegen/clicommands/OptionUtilsTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/clicommands/OptionUtilsTest.java rename to src/test/java/org/openapijsonschematools/codegen/clicommands/OptionUtilsTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/JsonCacheTest.java b/src/test/java/org/openapijsonschematools/codegen/common/JsonCacheTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/JsonCacheTest.java rename to src/test/java/org/openapijsonschematools/codegen/common/JsonCacheTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/ModelUtilsTest.java b/src/test/java/org/openapijsonschematools/codegen/common/ModelUtilsTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/ModelUtilsTest.java rename to src/test/java/org/openapijsonschematools/codegen/common/ModelUtilsTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/OnceLoggerTest.java b/src/test/java/org/openapijsonschematools/codegen/common/OnceLoggerTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/OnceLoggerTest.java rename to src/test/java/org/openapijsonschematools/codegen/common/OnceLoggerTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/SerializerUtilsTest.java b/src/test/java/org/openapijsonschematools/codegen/common/SerializerUtilsTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/SerializerUtilsTest.java rename to src/test/java/org/openapijsonschematools/codegen/common/SerializerUtilsTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/StringUtilsTest.java b/src/test/java/org/openapijsonschematools/codegen/common/StringUtilsTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/StringUtilsTest.java rename to src/test/java/org/openapijsonschematools/codegen/common/StringUtilsTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/URLPathUtilsTest.java b/src/test/java/org/openapijsonschematools/codegen/common/URLPathUtilsTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/common/URLPathUtilsTest.java rename to src/test/java/org/openapijsonschematools/codegen/common/URLPathUtilsTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/config/SpecValidationExceptionTest.java b/src/test/java/org/openapijsonschematools/codegen/config/SpecValidationExceptionTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/config/SpecValidationExceptionTest.java rename to src/test/java/org/openapijsonschematools/codegen/config/SpecValidationExceptionTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/config/WorkflowSettingsTest.java b/src/test/java/org/openapijsonschematools/codegen/config/WorkflowSettingsTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/config/WorkflowSettingsTest.java rename to src/test/java/org/openapijsonschematools/codegen/config/WorkflowSettingsTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java b/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java rename to src/test/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunnerTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/AbstractJavaGeneratorExampleValuesTest.java b/src/test/java/org/openapijsonschematools/codegen/generators/AbstractJavaGeneratorExampleValuesTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/AbstractJavaGeneratorExampleValuesTest.java rename to src/test/java/org/openapijsonschematools/codegen/generators/AbstractJavaGeneratorExampleValuesTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java b/src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java rename to src/test/java/org/openapijsonschematools/codegen/generators/DefaultGeneratorTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java b/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java rename to src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/features/DocumentationProviderFeaturesTest.java b/src/test/java/org/openapijsonschematools/codegen/generators/features/DocumentationProviderFeaturesTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/features/DocumentationProviderFeaturesTest.java rename to src/test/java/org/openapijsonschematools/codegen/generators/features/DocumentationProviderFeaturesTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSetTest.java b/src/test/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSetTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSetTest.java rename to src/test/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSetTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/AbstractAnnotationAssert.java b/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/AbstractAnnotationAssert.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/AbstractAnnotationAssert.java rename to src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/AbstractAnnotationAssert.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ConstructorAssert.java b/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ConstructorAssert.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ConstructorAssert.java rename to src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ConstructorAssert.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/JavaFileAssert.java b/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/JavaFileAssert.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/JavaFileAssert.java rename to src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/JavaFileAssert.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/MethodAnnotationAssert.java b/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/MethodAnnotationAssert.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/MethodAnnotationAssert.java rename to src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/MethodAnnotationAssert.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/MethodAssert.java b/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/MethodAssert.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/MethodAssert.java rename to src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/MethodAssert.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ParameterAnnotationAssert.java b/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ParameterAnnotationAssert.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ParameterAnnotationAssert.java rename to src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ParameterAnnotationAssert.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ParameterAssert.java b/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ParameterAssert.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ParameterAssert.java rename to src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/ParameterAssert.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/PropertyAnnotationAssert.java b/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/PropertyAnnotationAssert.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/PropertyAnnotationAssert.java rename to src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/PropertyAnnotationAssert.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/PropertyAssert.java b/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/PropertyAssert.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/PropertyAssert.java rename to src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/PropertyAssert.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/TypeAnnotationAssert.java b/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/TypeAnnotationAssert.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/TypeAnnotationAssert.java rename to src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/TypeAnnotationAssert.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/AbstractOptionsTest.java b/src/test/java/org/openapijsonschematools/codegen/generators/options/AbstractOptionsTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/AbstractOptionsTest.java rename to src/test/java/org/openapijsonschematools/codegen/generators/options/AbstractOptionsTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/OptionsProvider.java b/src/test/java/org/openapijsonschematools/codegen/generators/options/OptionsProvider.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/OptionsProvider.java rename to src/test/java/org/openapijsonschematools/codegen/generators/options/OptionsProvider.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/PythonClientOptionsProvider.java b/src/test/java/org/openapijsonschematools/codegen/generators/options/PythonClientOptionsProvider.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/generators/options/PythonClientOptionsProvider.java rename to src/test/java/org/openapijsonschematools/codegen/generators/options/PythonClientOptionsProvider.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/HandlebarsEngineAdapterTest.java b/src/test/java/org/openapijsonschematools/codegen/templating/HandlebarsEngineAdapterTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/HandlebarsEngineAdapterTest.java rename to src/test/java/org/openapijsonschematools/codegen/templating/HandlebarsEngineAdapterTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/TemplateManagerTest.java b/src/test/java/org/openapijsonschematools/codegen/templating/TemplateManagerTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/TemplateManagerTest.java rename to src/test/java/org/openapijsonschematools/codegen/templating/TemplateManagerTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/handlebars/StringHelpersTest.java b/src/test/java/org/openapijsonschematools/codegen/templating/handlebars/StringHelpersTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/handlebars/StringHelpersTest.java rename to src/test/java/org/openapijsonschematools/codegen/templating/handlebars/StringHelpersTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambdaTest.java b/src/test/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambdaTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambdaTest.java rename to src/test/java/org/openapijsonschematools/codegen/templating/mustache/CamelCaseLambdaTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/IndentedLambdaTest.java b/src/test/java/org/openapijsonschematools/codegen/templating/mustache/IndentedLambdaTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/IndentedLambdaTest.java rename to src/test/java/org/openapijsonschematools/codegen/templating/mustache/IndentedLambdaTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/LambdaTest.java b/src/test/java/org/openapijsonschematools/codegen/templating/mustache/LambdaTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/LambdaTest.java rename to src/test/java/org/openapijsonschematools/codegen/templating/mustache/LambdaTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambdaTest.java b/src/test/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambdaTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambdaTest.java rename to src/test/java/org/openapijsonschematools/codegen/templating/mustache/LowercaseLambdaTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/OnChangeLambdaTest.java b/src/test/java/org/openapijsonschematools/codegen/templating/mustache/OnChangeLambdaTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/OnChangeLambdaTest.java rename to src/test/java/org/openapijsonschematools/codegen/templating/mustache/OnChangeLambdaTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/PascalCaseLambdaTest.java b/src/test/java/org/openapijsonschematools/codegen/templating/mustache/PascalCaseLambdaTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/PascalCaseLambdaTest.java rename to src/test/java/org/openapijsonschematools/codegen/templating/mustache/PascalCaseLambdaTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/SnakecaseLambdaTest.java b/src/test/java/org/openapijsonschematools/codegen/templating/mustache/SnakecaseLambdaTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/SnakecaseLambdaTest.java rename to src/test/java/org/openapijsonschematools/codegen/templating/mustache/SnakecaseLambdaTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/SplitStringLambdaTest.java b/src/test/java/org/openapijsonschematools/codegen/templating/mustache/SplitStringLambdaTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/SplitStringLambdaTest.java rename to src/test/java/org/openapijsonschematools/codegen/templating/mustache/SplitStringLambdaTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/TitlecaseLambdaTest.java b/src/test/java/org/openapijsonschematools/codegen/templating/mustache/TitlecaseLambdaTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/TitlecaseLambdaTest.java rename to src/test/java/org/openapijsonschematools/codegen/templating/mustache/TitlecaseLambdaTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/TrimWhitespaceLambdaTest.java b/src/test/java/org/openapijsonschematools/codegen/templating/mustache/TrimWhitespaceLambdaTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/TrimWhitespaceLambdaTest.java rename to src/test/java/org/openapijsonschematools/codegen/templating/mustache/TrimWhitespaceLambdaTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/UppercaseLambdaTest.java b/src/test/java/org/openapijsonschematools/codegen/templating/mustache/UppercaseLambdaTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/templating/mustache/UppercaseLambdaTest.java rename to src/test/java/org/openapijsonschematools/codegen/templating/mustache/UppercaseLambdaTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/testutils/AssertFile.java b/src/test/java/org/openapijsonschematools/codegen/testutils/AssertFile.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/testutils/AssertFile.java rename to src/test/java/org/openapijsonschematools/codegen/testutils/AssertFile.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/testutils/IntegrationTestPathsConfig.java b/src/test/java/org/openapijsonschematools/codegen/testutils/IntegrationTestPathsConfig.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/testutils/IntegrationTestPathsConfig.java rename to src/test/java/org/openapijsonschematools/codegen/testutils/IntegrationTestPathsConfig.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiOperationValidationsTest.java b/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiOperationValidationsTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiOperationValidationsTest.java rename to src/test/java/org/openapijsonschematools/codegen/validation/OpenApiOperationValidationsTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiParameterValidationsTest.java b/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiParameterValidationsTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiParameterValidationsTest.java rename to src/test/java/org/openapijsonschematools/codegen/validation/OpenApiParameterValidationsTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaTypeTest.java b/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaTypeTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaTypeTest.java rename to src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaTypeTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaValidationsTest.java b/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaValidationsTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaValidationsTest.java rename to src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSchemaValidationsTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSecuritySchemeValidationsTest.java b/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSecuritySchemeValidationsTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSecuritySchemeValidationsTest.java rename to src/test/java/org/openapijsonschematools/codegen/validation/OpenApiSecuritySchemeValidationsTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/validators/GenericValidatorTest.java b/src/test/java/org/openapijsonschematools/codegen/validation/validators/GenericValidatorTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/validators/GenericValidatorTest.java rename to src/test/java/org/openapijsonschematools/codegen/validation/validators/GenericValidatorTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/validators/ValidatedTest.java b/src/test/java/org/openapijsonschematools/codegen/validation/validators/ValidatedTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/validators/ValidatedTest.java rename to src/test/java/org/openapijsonschematools/codegen/validation/validators/ValidatedTest.java diff --git a/modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/validators/ValidationRuleTest.java b/src/test/java/org/openapijsonschematools/codegen/validation/validators/ValidationRuleTest.java similarity index 100% rename from modules/openapi-json-schema-generator/src/test/java/org/openapijsonschematools/codegen/validation/validators/ValidationRuleTest.java rename to src/test/java/org/openapijsonschematools/codegen/validation/validators/ValidationRuleTest.java diff --git a/modules/openapi-json-schema-generator/src/test/resources/1_2/petstore-1.2/api-docs b/src/test/resources/1_2/petstore-1.2/api-docs similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/1_2/petstore-1.2/api-docs rename to src/test/resources/1_2/petstore-1.2/api-docs diff --git a/modules/openapi-json-schema-generator/src/test/resources/1_2/petstore-1.2/pet b/src/test/resources/1_2/petstore-1.2/pet similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/1_2/petstore-1.2/pet rename to src/test/resources/1_2/petstore-1.2/pet diff --git a/modules/openapi-json-schema-generator/src/test/resources/1_2/petstore-1.2/store b/src/test/resources/1_2/petstore-1.2/store similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/1_2/petstore-1.2/store rename to src/test/resources/1_2/petstore-1.2/store diff --git a/modules/openapi-json-schema-generator/src/test/resources/1_2/petstore-1.2/user b/src/test/resources/1_2/petstore-1.2/user similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/1_2/petstore-1.2/user rename to src/test/resources/1_2/petstore-1.2/user diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/additional-properties-for-testing.yaml b/src/test/resources/2_0/additional-properties-for-testing.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/additional-properties-for-testing.yaml rename to src/test/resources/2_0/additional-properties-for-testing.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/allOfTest.yaml b/src/test/resources/2_0/allOfTest.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/allOfTest.yaml rename to src/test/resources/2_0/allOfTest.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/arrayRefBody.yaml b/src/test/resources/2_0/arrayRefBody.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/arrayRefBody.yaml rename to src/test/resources/2_0/arrayRefBody.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/bash-config.json b/src/test/resources/2_0/bash-config.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/bash-config.json rename to src/test/resources/2_0/bash-config.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/binaryDataTest.json b/src/test/resources/2_0/binaryDataTest.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/binaryDataTest.json rename to src/test/resources/2_0/binaryDataTest.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/composed-allof.yaml b/src/test/resources/2_0/composed-allof.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/composed-allof.yaml rename to src/test/resources/2_0/composed-allof.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/datePropertyTest.json b/src/test/resources/2_0/datePropertyTest.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/datePropertyTest.json rename to src/test/resources/2_0/datePropertyTest.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/discriminatorTest.json b/src/test/resources/2_0/discriminatorTest.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/discriminatorTest.json rename to src/test/resources/2_0/discriminatorTest.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/duplicateOperationIds.yaml b/src/test/resources/2_0/duplicateOperationIds.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/duplicateOperationIds.yaml rename to src/test/resources/2_0/duplicateOperationIds.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/emptyBaseModel.yaml b/src/test/resources/2_0/emptyBaseModel.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/emptyBaseModel.yaml rename to src/test/resources/2_0/emptyBaseModel.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/globalConsumesAndProduces.json b/src/test/resources/2_0/globalConsumesAndProduces.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/globalConsumesAndProduces.json rename to src/test/resources/2_0/globalConsumesAndProduces.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/globalProducesConsumesTest.yaml b/src/test/resources/2_0/globalProducesConsumesTest.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/globalProducesConsumesTest.yaml rename to src/test/resources/2_0/globalProducesConsumesTest.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/globalSecurity.json b/src/test/resources/2_0/globalSecurity.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/globalSecurity.json rename to src/test/resources/2_0/globalSecurity.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/issue1226.yaml b/src/test/resources/2_0/issue1226.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/issue1226.yaml rename to src/test/resources/2_0/issue1226.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/issue_9086.yaml b/src/test/resources/2_0/issue_9086.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/issue_9086.yaml rename to src/test/resources/2_0/issue_9086.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/issue_9086_expected.yaml b/src/test/resources/2_0/issue_9086_expected.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/issue_9086_expected.yaml rename to src/test/resources/2_0/issue_9086_expected.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/long_description_issue_7839.json b/src/test/resources/2_0/long_description_issue_7839.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/long_description_issue_7839.json rename to src/test/resources/2_0/long_description_issue_7839.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/mapArgs.yaml b/src/test/resources/2_0/mapArgs.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/mapArgs.yaml rename to src/test/resources/2_0/mapArgs.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/markdown.yaml b/src/test/resources/2_0/markdown.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/markdown.yaml rename to src/test/resources/2_0/markdown.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/npe1.yaml b/src/test/resources/2_0/npe1.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/npe1.yaml rename to src/test/resources/2_0/npe1.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/pathWithHtmlEntity.yaml b/src/test/resources/2_0/pathWithHtmlEntity.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/pathWithHtmlEntity.yaml rename to src/test/resources/2_0/pathWithHtmlEntity.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-bash.json b/src/test/resources/2_0/petstore-bash.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-bash.json rename to src/test/resources/2_0/petstore-bash.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-nullable.yaml b/src/test/resources/2_0/petstore-nullable.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-nullable.yaml rename to src/test/resources/2_0/petstore-nullable.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-orig.json b/src/test/resources/2_0/petstore-orig.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-orig.json rename to src/test/resources/2_0/petstore-orig.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-proto.yaml b/src/test/resources/2_0/petstore-proto.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-proto.yaml rename to src/test/resources/2_0/petstore-proto.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-security-test.yaml b/src/test/resources/2_0/petstore-security-test.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-security-test.yaml rename to src/test/resources/2_0/petstore-security-test.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-vendor-mime.yaml b/src/test/resources/2_0/petstore-vendor-mime.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-vendor-mime.yaml rename to src/test/resources/2_0/petstore-vendor-mime.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-date-field.yaml b/src/test/resources/2_0/petstore-with-date-field.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-date-field.yaml rename to src/test/resources/2_0/petstore-with-date-field.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-for-testing-playframework-with-security.yaml b/src/test/resources/2_0/petstore-with-fake-endpoints-for-testing-playframework-with-security.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-for-testing-playframework-with-security.yaml rename to src/test/resources/2_0/petstore-with-fake-endpoints-for-testing-playframework-with-security.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-saga-and-records.yaml b/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-saga-and-records.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-saga-and-records.yaml rename to src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-saga-and-records.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml b/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml rename to src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml b/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml rename to src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-operations-without-required-params.yaml b/src/test/resources/2_0/petstore-with-operations-without-required-params.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-operations-without-required-params.yaml rename to src/test/resources/2_0/petstore-with-operations-without-required-params.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml b/src/test/resources/2_0/petstore-with-spring-pageable.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml rename to src/test/resources/2_0/petstore-with-spring-pageable.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.json b/src/test/resources/2_0/petstore.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.json rename to src/test/resources/2_0/petstore.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml b/src/test/resources/2_0/petstore.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/petstore.yaml rename to src/test/resources/2_0/petstore.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/petstore_issue_7999.json b/src/test/resources/2_0/petstore_issue_7999.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/petstore_issue_7999.json rename to src/test/resources/2_0/petstore_issue_7999.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/postBodyTest.json b/src/test/resources/2_0/postBodyTest.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/postBodyTest.json rename to src/test/resources/2_0/postBodyTest.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/python-prior/petstore-with-fake-endpoints-models-for-testing.yaml b/src/test/resources/2_0/python-prior/petstore-with-fake-endpoints-models-for-testing.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/python-prior/petstore-with-fake-endpoints-models-for-testing.yaml rename to src/test/resources/2_0/python-prior/petstore-with-fake-endpoints-models-for-testing.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/refAliasedPrimitiveWithValidation.yml b/src/test/resources/2_0/refAliasedPrimitiveWithValidation.yml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/refAliasedPrimitiveWithValidation.yml rename to src/test/resources/2_0/refAliasedPrimitiveWithValidation.yml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/regression_6905.yaml b/src/test/resources/2_0/regression_6905.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/regression_6905.yaml rename to src/test/resources/2_0/regression_6905.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/requiredTest.json b/src/test/resources/2_0/requiredTest.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/requiredTest.json rename to src/test/resources/2_0/requiredTest.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/responseCodeTest.yaml b/src/test/resources/2_0/responseCodeTest.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/responseCodeTest.yaml rename to src/test/resources/2_0/responseCodeTest.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/responseHeaderTest.yaml b/src/test/resources/2_0/responseHeaderTest.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/responseHeaderTest.yaml rename to src/test/resources/2_0/responseHeaderTest.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/responseSelectionTest.json b/src/test/resources/2_0/responseSelectionTest.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/responseSelectionTest.json rename to src/test/resources/2_0/responseSelectionTest.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml b/src/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml rename to src/test/resources/2_0/rust-server/petstore-with-fake-endpoints-models-for-testing.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/rust-server/rust-server-test.yaml b/src/test/resources/2_0/rust-server/rust-server-test.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/rust-server/rust-server-test.yaml rename to src/test/resources/2_0/rust-server/rust-server-test.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml b/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml rename to src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/swift4Test.json b/src/test/resources/2_0/swift4Test.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/swift4Test.json rename to src/test/resources/2_0/swift4Test.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/swift5Test.json b/src/test/resources/2_0/swift5Test.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/swift5Test.json rename to src/test/resources/2_0/swift5Test.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/templates/Java/ApiClient.mustache b/src/test/resources/2_0/templates/Java/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/templates/Java/ApiClient.mustache rename to src/test/resources/2_0/templates/Java/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/ApiClient.mustache b/src/test/resources/2_0/templates/Java/libraries/jersey2/ApiClient.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/ApiClient.mustache rename to src/test/resources/2_0/templates/Java/libraries/jersey2/ApiClient.mustache diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/JSON.mustache b/src/test/resources/2_0/templates/Java/libraries/jersey2/JSON.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/JSON.mustache rename to src/test/resources/2_0/templates/Java/libraries/jersey2/JSON.mustache diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/api.mustache b/src/test/resources/2_0/templates/Java/libraries/jersey2/api.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/api.mustache rename to src/test/resources/2_0/templates/Java/libraries/jersey2/api.mustache diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/build.gradle.mustache b/src/test/resources/2_0/templates/Java/libraries/jersey2/build.gradle.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/build.gradle.mustache rename to src/test/resources/2_0/templates/Java/libraries/jersey2/build.gradle.mustache diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/build.sbt.mustache b/src/test/resources/2_0/templates/Java/libraries/jersey2/build.sbt.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/build.sbt.mustache rename to src/test/resources/2_0/templates/Java/libraries/jersey2/build.sbt.mustache diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache b/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache rename to src/test/resources/2_0/templates/Java/libraries/jersey2/pom.mustache diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/templates/Java/model.mustache b/src/test/resources/2_0/templates/Java/model.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/templates/Java/model.mustache rename to src/test/resources/2_0/templates/Java/model.mustache diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/v1beta3.json b/src/test/resources/2_0/v1beta3.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/v1beta3.json rename to src/test/resources/2_0/v1beta3.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/wordnik.json b/src/test/resources/2_0/wordnik.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/wordnik.json rename to src/test/resources/2_0/wordnik.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/wordnik.yaml b/src/test/resources/2_0/wordnik.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/wordnik.yaml rename to src/test/resources/2_0/wordnik.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/2_0/x-discriminator-value.yaml b/src/test/resources/2_0/x-discriminator-value.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/2_0/x-discriminator-value.yaml rename to src/test/resources/2_0/x-discriminator-value.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/11_regex.yaml b/src/test/resources/3_0/11_regex.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/11_regex.yaml rename to src/test/resources/3_0/11_regex.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/3134-regression.yaml b/src/test/resources/3_0/3134-regression.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/3134-regression.yaml rename to src/test/resources/3_0/3134-regression.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/3248-regression-dates.yaml b/src/test/resources/3_0/3248-regression-dates.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/3248-regression-dates.yaml rename to src/test/resources/3_0/3248-regression-dates.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/3248-regression.yaml b/src/test/resources/3_0/3248-regression.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/3248-regression.yaml rename to src/test/resources/3_0/3248-regression.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/6150_model_json_inline.yaml b/src/test/resources/3_0/6150_model_json_inline.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/6150_model_json_inline.yaml rename to src/test/resources/3_0/6150_model_json_inline.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/70_schema_enum_names.yaml b/src/test/resources/3_0/70_schema_enum_names.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/70_schema_enum_names.yaml rename to src/test/resources/3_0/70_schema_enum_names.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/additional-properties-deeply-nested.yaml b/src/test/resources/3_0/additional-properties-deeply-nested.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/additional-properties-deeply-nested.yaml rename to src/test/resources/3_0/additional-properties-deeply-nested.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/allOf-readonly.yaml b/src/test/resources/3_0/allOf-readonly.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/allOf-readonly.yaml rename to src/test/resources/3_0/allOf-readonly.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/allOf-required-parent.yaml b/src/test/resources/3_0/allOf-required-parent.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/allOf-required-parent.yaml rename to src/test/resources/3_0/allOf-required-parent.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/allOf-required.yaml b/src/test/resources/3_0/allOf-required.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/allOf-required.yaml rename to src/test/resources/3_0/allOf-required.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/allOf.yaml b/src/test/resources/3_0/allOf.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/allOf.yaml rename to src/test/resources/3_0/allOf.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/allOfDuplicatedProperties.yaml b/src/test/resources/3_0/allOfDuplicatedProperties.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/allOfDuplicatedProperties.yaml rename to src/test/resources/3_0/allOfDuplicatedProperties.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/allOfMappingDuplicatedProperties.yaml b/src/test/resources/3_0/allOfMappingDuplicatedProperties.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/allOfMappingDuplicatedProperties.yaml rename to src/test/resources/3_0/allOfMappingDuplicatedProperties.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/allOfMultiParent.yaml b/src/test/resources/3_0/allOfMultiParent.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/allOfMultiParent.yaml rename to src/test/resources/3_0/allOfMultiParent.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/allOf_composition.yaml b/src/test/resources/3_0/allOf_composition.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/allOf_composition.yaml rename to src/test/resources/3_0/allOf_composition.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/allOf_composition_discriminator.yaml b/src/test/resources/3_0/allOf_composition_discriminator.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/allOf_composition_discriminator.yaml rename to src/test/resources/3_0/allOf_composition_discriminator.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/allOf_composition_discriminator_recursive.yaml b/src/test/resources/3_0/allOf_composition_discriminator_recursive.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/allOf_composition_discriminator_recursive.yaml rename to src/test/resources/3_0/allOf_composition_discriminator_recursive.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/allOf_nullable.yaml b/src/test/resources/3_0/allOf_nullable.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/allOf_nullable.yaml rename to src/test/resources/3_0/allOf_nullable.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/anyOf.yaml b/src/test/resources/3_0/anyOf.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/anyOf.yaml rename to src/test/resources/3_0/anyOf.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/anyOfDiscriminator.yaml b/src/test/resources/3_0/anyOfDiscriminator.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/anyOfDiscriminator.yaml rename to src/test/resources/3_0/anyOfDiscriminator.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/any_type.yaml b/src/test/resources/3_0/any_type.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/any_type.yaml rename to src/test/resources/3_0/any_type.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/arrayParameter.yaml b/src/test/resources/3_0/arrayParameter.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/arrayParameter.yaml rename to src/test/resources/3_0/arrayParameter.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/arrayRefBody.yaml b/src/test/resources/3_0/arrayRefBody.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/arrayRefBody.yaml rename to src/test/resources/3_0/arrayRefBody.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/api-docs.json b/src/test/resources/3_0/asciidoc/api-docs.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/api-docs.json rename to src/test/resources/3_0/asciidoc/api-docs.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/GET.json b/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/GET.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/GET.json rename to src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/GET.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/curl-request.adoc b/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/curl-request.adoc similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/curl-request.adoc rename to src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/curl-request.adoc diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/http-request.adoc b/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/http-request.adoc similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/http-request.adoc rename to src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/http-request.adoc diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/http-response.adoc b/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/http-response.adoc similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/http-response.adoc rename to src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/http-response.adoc diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/httpie-request.adoc b/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/httpie-request.adoc similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/httpie-request.adoc rename to src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/httpie-request.adoc diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/request-body.adoc b/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/request-body.adoc similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/request-body.adoc rename to src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/request-body.adoc diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/response-body.adoc b/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/response-body.adoc similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/response-body.adoc rename to src/test/resources/3_0/asciidoc/generated-snippets/rest/project/GET/response-body.adoc diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/specs/rest/project/GET/implementation.adoc b/src/test/resources/3_0/asciidoc/specs/rest/project/GET/implementation.adoc similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/specs/rest/project/GET/implementation.adoc rename to src/test/resources/3_0/asciidoc/specs/rest/project/GET/implementation.adoc diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/specs/rest/project/GET/spec.adoc b/src/test/resources/3_0/asciidoc/specs/rest/project/GET/spec.adoc similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/asciidoc/specs/rest/project/GET/spec.adoc rename to src/test/resources/3_0/asciidoc/specs/rest/project/GET/spec.adoc diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/aspnetcore/petstore.yaml b/src/test/resources/3_0/aspnetcore/petstore.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/aspnetcore/petstore.yaml rename to src/test/resources/3_0/aspnetcore/petstore.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/avro-schema/petstore.yaml b/src/test/resources/3_0/avro-schema/petstore.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/avro-schema/petstore.yaml rename to src/test/resources/3_0/avro-schema/petstore.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/callbacks.yaml b/src/test/resources/3_0/callbacks.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/callbacks.yaml rename to src/test/resources/3_0/callbacks.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/component-deprecated.yml b/src/test/resources/3_0/component-deprecated.yml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/component-deprecated.yml rename to src/test/resources/3_0/component-deprecated.yml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/composed-oneof.yaml b/src/test/resources/3_0/composed-oneof.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/composed-oneof.yaml rename to src/test/resources/3_0/composed-oneof.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/composed-schemas.yaml b/src/test/resources/3_0/composed-schemas.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/composed-schemas.yaml rename to src/test/resources/3_0/composed-schemas.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/conflictingParameter.yaml b/src/test/resources/3_0/conflictingParameter.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/conflictingParameter.yaml rename to src/test/resources/3_0/conflictingParameter.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/container-type-import.yaml b/src/test/resources/3_0/container-type-import.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/container-type-import.yaml rename to src/test/resources/3_0/container-type-import.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/content-data.yaml b/src/test/resources/3_0/content-data.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/content-data.yaml rename to src/test/resources/3_0/content-data.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/cpp-qt/petstore.yaml b/src/test/resources/3_0/cpp-qt/petstore.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/cpp-qt/petstore.yaml rename to src/test/resources/3_0/cpp-qt/petstore.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml rename to src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/deepobject-array-with-pattern.yaml b/src/test/resources/3_0/deepobject-array-with-pattern.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/deepobject-array-with-pattern.yaml rename to src/test/resources/3_0/deepobject-array-with-pattern.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/deepobject.yaml b/src/test/resources/3_0/deepobject.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/deepobject.yaml rename to src/test/resources/3_0/deepobject.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/elm.yaml b/src/test/resources/3_0/elm.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/elm.yaml rename to src/test/resources/3_0/elm.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/example_generator_test.yaml b/src/test/resources/3_0/example_generator_test.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/example_generator_test.yaml rename to src/test/resources/3_0/example_generator_test.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/examples.yaml b/src/test/resources/3_0/examples.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/examples.yaml rename to src/test/resources/3_0/examples.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml b/src/test/resources/3_0/extensions/x-auth-id-alias.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/extensions/x-auth-id-alias.yaml rename to src/test/resources/3_0/extensions/x-auth-id-alias.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/features/dynamic-servers.yaml b/src/test/resources/3_0/features/dynamic-servers.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/features/dynamic-servers.yaml rename to src/test/resources/3_0/features/dynamic-servers.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/features/generate-alias-as-model.yaml b/src/test/resources/3_0/features/generate-alias-as-model.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/features/generate-alias-as-model.yaml rename to src/test/resources/3_0/features/generate-alias-as-model.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/form-duplicated-parameter.yaml b/src/test/resources/3_0/form-duplicated-parameter.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/form-duplicated-parameter.yaml rename to src/test/resources/3_0/form-duplicated-parameter.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/form-multipart-binary-array.yaml b/src/test/resources/3_0/form-multipart-binary-array.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/form-multipart-binary-array.yaml rename to src/test/resources/3_0/form-multipart-binary-array.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/fromParameter.yaml b/src/test/resources/3_0/fromParameter.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/fromParameter.yaml rename to src/test/resources/3_0/fromParameter.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/generic.yaml b/src/test/resources/3_0/generic.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/generic.yaml rename to src/test/resources/3_0/generic.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/src/test/resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml rename to src/test/resources/3_0/go/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/inline_model_resolver.yaml b/src/test/resources/3_0/inline_model_resolver.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/inline_model_resolver.yaml rename to src/test/resources/3_0/inline_model_resolver.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/inline_request_body_no_components.yaml b/src/test/resources/3_0/inline_request_body_no_components.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/inline_request_body_no_components.yaml rename to src/test/resources/3_0/inline_request_body_no_components.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue-11340.yaml b/src/test/resources/3_0/issue-11340.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue-11340.yaml rename to src/test/resources/3_0/issue-11340.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue-4062.yaml b/src/test/resources/3_0/issue-4062.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue-4062.yaml rename to src/test/resources/3_0/issue-4062.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue11242.yaml b/src/test/resources/3_0/issue11242.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue11242.yaml rename to src/test/resources/3_0/issue11242.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue13146_file_abstraction_response.yaml b/src/test/resources/3_0/issue13146_file_abstraction_response.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue13146_file_abstraction_response.yaml rename to src/test/resources/3_0/issue13146_file_abstraction_response.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue392.yaml b/src/test/resources/3_0/issue392.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue392.yaml rename to src/test/resources/3_0/issue392.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue4584.yaml b/src/test/resources/3_0/issue4584.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue4584.yaml rename to src/test/resources/3_0/issue4584.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue4808.yaml b/src/test/resources/3_0/issue4808.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue4808.yaml rename to src/test/resources/3_0/issue4808.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue677.yaml b/src/test/resources/3_0/issue677.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue677.yaml rename to src/test/resources/3_0/issue677.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue7262.yaml b/src/test/resources/3_0/issue7262.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue7262.yaml rename to src/test/resources/3_0/issue7262.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue7356.yaml b/src/test/resources/3_0/issue7356.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue7356.yaml rename to src/test/resources/3_0/issue7356.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue7506.yaml b/src/test/resources/3_0/issue7506.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue7506.yaml rename to src/test/resources/3_0/issue7506.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue796.yaml b/src/test/resources/3_0/issue796.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue796.yaml rename to src/test/resources/3_0/issue796.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue8352.yaml b/src/test/resources/3_0/issue8352.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue8352.yaml rename to src/test/resources/3_0/issue8352.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue855.yaml b/src/test/resources/3_0/issue855.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue855.yaml rename to src/test/resources/3_0/issue855.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue8986.yaml b/src/test/resources/3_0/issue8986.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue8986.yaml rename to src/test/resources/3_0/issue8986.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10056.yaml b/src/test/resources/3_0/issue_10056.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10056.yaml rename to src/test/resources/3_0/issue_10056.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10330.yaml b/src/test/resources/3_0/issue_10330.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10330.yaml rename to src/test/resources/3_0/issue_10330.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10725.yaml b/src/test/resources/3_0/issue_10725.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10725.yaml rename to src/test/resources/3_0/issue_10725.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10792.yaml b/src/test/resources/3_0/issue_10792.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10792.yaml rename to src/test/resources/3_0/issue_10792.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10865_default_values.yaml b/src/test/resources/3_0/issue_10865_default_values.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10865_default_values.yaml rename to src/test/resources/3_0/issue_10865_default_values.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10866_bigdecimal_default.yaml b/src/test/resources/3_0/issue_10866_bigdecimal_default.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_10866_bigdecimal_default.yaml rename to src/test/resources/3_0/issue_10866_bigdecimal_default.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_11521.yaml b/src/test/resources/3_0/issue_11521.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_11521.yaml rename to src/test/resources/3_0/issue_11521.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_11772.yml b/src/test/resources/3_0/issue_11772.yml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_11772.yml rename to src/test/resources/3_0/issue_11772.yml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_12196.yaml b/src/test/resources/3_0/issue_12196.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_12196.yaml rename to src/test/resources/3_0/issue_12196.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_12445.yaml b/src/test/resources/3_0/issue_12445.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_12445.yaml rename to src/test/resources/3_0/issue_12445.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_12857.yaml b/src/test/resources/3_0/issue_12857.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_12857.yaml rename to src/test/resources/3_0/issue_12857.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_13025.yaml b/src/test/resources/3_0/issue_13025.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_13025.yaml rename to src/test/resources/3_0/issue_13025.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_13043_geometry_collection_expected_value.txt b/src/test/resources/3_0/issue_13043_geometry_collection_expected_value.txt similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_13043_geometry_collection_expected_value.txt rename to src/test/resources/3_0/issue_13043_geometry_collection_expected_value.txt diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_13043_recursive_model.yaml b/src/test/resources/3_0/issue_13043_recursive_model.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_13043_recursive_model.yaml rename to src/test/resources/3_0/issue_13043_recursive_model.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_13043_recursive_model_expected_value.txt b/src/test/resources/3_0/issue_13043_recursive_model_expected_value.txt similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_13043_recursive_model_expected_value.txt rename to src/test/resources/3_0/issue_13043_recursive_model_expected_value.txt diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_1347.yaml b/src/test/resources/3_0/issue_1347.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_1347.yaml rename to src/test/resources/3_0/issue_1347.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_1517.yaml b/src/test/resources/3_0/issue_1517.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_1517.yaml rename to src/test/resources/3_0/issue_1517.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_1997.yaml b/src/test/resources/3_0/issue_1997.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_1997.yaml rename to src/test/resources/3_0/issue_1997.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_2053.yaml b/src/test/resources/3_0/issue_2053.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_2053.yaml rename to src/test/resources/3_0/issue_2053.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_241.yaml b/src/test/resources/3_0/issue_241.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_241.yaml rename to src/test/resources/3_0/issue_241.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_2908.yaml b/src/test/resources/3_0/issue_2908.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_2908.yaml rename to src/test/resources/3_0/issue_2908.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_3248.yaml b/src/test/resources/3_0/issue_3248.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_3248.yaml rename to src/test/resources/3_0/issue_3248.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_4832.yaml b/src/test/resources/3_0/issue_4832.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_4832.yaml rename to src/test/resources/3_0/issue_4832.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_4876_format_email.yaml b/src/test/resources/3_0/issue_4876_format_email.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_4876_format_email.yaml rename to src/test/resources/3_0/issue_4876_format_email.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_5381.yaml b/src/test/resources/3_0/issue_5381.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_5381.yaml rename to src/test/resources/3_0/issue_5381.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_5386.yaml b/src/test/resources/3_0/issue_5386.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_5386.yaml rename to src/test/resources/3_0/issue_5386.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_5436.yml b/src/test/resources/3_0/issue_5436.yml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_5436.yml rename to src/test/resources/3_0/issue_5436.yml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_6762.yaml b/src/test/resources/3_0/issue_6762.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_6762.yaml rename to src/test/resources/3_0/issue_6762.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7193.yaml b/src/test/resources/3_0/issue_7193.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7193.yaml rename to src/test/resources/3_0/issue_7193.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7199_array_simple_string.yaml b/src/test/resources/3_0/issue_7199_array_simple_string.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7199_array_simple_string.yaml rename to src/test/resources/3_0/issue_7199_array_simple_string.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7361.yaml b/src/test/resources/3_0/issue_7361.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7361.yaml rename to src/test/resources/3_0/issue_7361.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7372.yaml b/src/test/resources/3_0/issue_7372.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7372.yaml rename to src/test/resources/3_0/issue_7372.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7532.yaml b/src/test/resources/3_0/issue_7532.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7532.yaml rename to src/test/resources/3_0/issue_7532.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7532_tree_example_value_expected.txt b/src/test/resources/3_0/issue_7532_tree_example_value_expected.txt similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7532_tree_example_value_expected.txt rename to src/test/resources/3_0/issue_7532_tree_example_value_expected.txt diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7533.yaml b/src/test/resources/3_0/issue_7533.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7533.yaml rename to src/test/resources/3_0/issue_7533.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7613.yaml b/src/test/resources/3_0/issue_7613.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7613.yaml rename to src/test/resources/3_0/issue_7613.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7614.yaml b/src/test/resources/3_0/issue_7614.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7614.yaml rename to src/test/resources/3_0/issue_7614.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7651.yaml b/src/test/resources/3_0/issue_7651.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7651.yaml rename to src/test/resources/3_0/issue_7651.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7791.yaml b/src/test/resources/3_0/issue_7791.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_7791.yaml rename to src/test/resources/3_0/issue_7791.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_8052_recursive_model.yaml b/src/test/resources/3_0/issue_8052_recursive_model.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_8052_recursive_model.yaml rename to src/test/resources/3_0/issue_8052_recursive_model.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_8052_recursive_model_expected_value.txt b/src/test/resources/3_0/issue_8052_recursive_model_expected_value.txt similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_8052_recursive_model_expected_value.txt rename to src/test/resources/3_0/issue_8052_recursive_model_expected_value.txt diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_8535.yaml b/src/test/resources/3_0/issue_8535.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_8535.yaml rename to src/test/resources/3_0/issue_8535.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_8906.yaml b/src/test/resources/3_0/issue_8906.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_8906.yaml rename to src/test/resources/3_0/issue_8906.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_8945.yaml b/src/test/resources/3_0/issue_8945.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_8945.yaml rename to src/test/resources/3_0/issue_8945.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_9282.yaml b/src/test/resources/3_0/issue_9282.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_9282.yaml rename to src/test/resources/3_0/issue_9282.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_9447.yaml b/src/test/resources/3_0/issue_9447.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_9447.yaml rename to src/test/resources/3_0/issue_9447.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue_9848.yaml b/src/test/resources/3_0/issue_9848.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue_9848.yaml rename to src/test/resources/3_0/issue_9848.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issue______kotlinArrayEnumEmbedded.yaml b/src/test/resources/3_0/issue______kotlinArrayEnumEmbedded.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issue______kotlinArrayEnumEmbedded.yaml rename to src/test/resources/3_0/issue______kotlinArrayEnumEmbedded.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/issues_13069.yaml b/src/test/resources/3_0/issues_13069.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/issues_13069.yaml rename to src/test/resources/3_0/issues_13069.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/java/petstore-group-parameter.yaml b/src/test/resources/3_0/java/petstore-group-parameter.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/java/petstore-group-parameter.yaml rename to src/test/resources/3_0/java/petstore-group-parameter.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature-okhttp-gson.yaml b/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature-okhttp-gson.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature-okhttp-gson.yaml rename to src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature-okhttp-gson.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml rename to src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/javascript/petstore-with-fake-endpoints-models-for-testing.yaml b/src/test/resources/3_0/javascript/petstore-with-fake-endpoints-models-for-testing.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/javascript/petstore-with-fake-endpoints-models-for-testing.yaml rename to src/test/resources/3_0/javascript/petstore-with-fake-endpoints-models-for-testing.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/kotlin/bean-qualifiers.yaml b/src/test/resources/3_0/kotlin/bean-qualifiers.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/kotlin/bean-qualifiers.yaml rename to src/test/resources/3_0/kotlin/bean-qualifiers.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/kotlin/issue10591-enum-defaultValue.yaml b/src/test/resources/3_0/kotlin/issue10591-enum-defaultValue.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/kotlin/issue10591-enum-defaultValue.yaml rename to src/test/resources/3_0/kotlin/issue10591-enum-defaultValue.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/kotlin/issue11088-model-mutable-with-containers.yaml b/src/test/resources/3_0/kotlin/issue11088-model-mutable-with-containers.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/kotlin/issue11088-model-mutable-with-containers.yaml rename to src/test/resources/3_0/kotlin/issue11088-model-mutable-with-containers.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/kotlin/issue13506-defaultValue-numbers.yaml b/src/test/resources/3_0/kotlin/issue13506-defaultValue-numbers.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/kotlin/issue13506-defaultValue-numbers.yaml rename to src/test/resources/3_0/kotlin/issue13506-defaultValue-numbers.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/kotlin/issue5497-use-tags-kotlin.yaml b/src/test/resources/3_0/kotlin/issue5497-use-tags-kotlin.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/kotlin/issue5497-use-tags-kotlin.yaml rename to src/test/resources/3_0/kotlin/issue5497-use-tags-kotlin.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/kotlin/issue7325-use-delegate-reactive-tags-kotlin.yaml b/src/test/resources/3_0/kotlin/issue7325-use-delegate-reactive-tags-kotlin.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/kotlin/issue7325-use-delegate-reactive-tags-kotlin.yaml rename to src/test/resources/3_0/kotlin/issue7325-use-delegate-reactive-tags-kotlin.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/kotlin/reserved_words.yaml b/src/test/resources/3_0/kotlin/reserved_words.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/kotlin/reserved_words.yaml rename to src/test/resources/3_0/kotlin/reserved_words.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/mapSchemas.yaml b/src/test/resources/3_0/mapSchemas.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/mapSchemas.yaml rename to src/test/resources/3_0/mapSchemas.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/markdown/expected/Models/Object.md b/src/test/resources/3_0/markdown/expected/Models/Object.md similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/markdown/expected/Models/Object.md rename to src/test/resources/3_0/markdown/expected/Models/Object.md diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/markdown/expected/Models/Object_InlinedObject.md b/src/test/resources/3_0/markdown/expected/Models/Object_InlinedObject.md similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/markdown/expected/Models/Object_InlinedObject.md rename to src/test/resources/3_0/markdown/expected/Models/Object_InlinedObject.md diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/markdown/expected/Models/ReferencedObject.md b/src/test/resources/3_0/markdown/expected/Models/ReferencedObject.md similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/markdown/expected/Models/ReferencedObject.md rename to src/test/resources/3_0/markdown/expected/Models/ReferencedObject.md diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/markdown/expected/Models/String.md b/src/test/resources/3_0/markdown/expected/Models/String.md similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/markdown/expected/Models/String.md rename to src/test/resources/3_0/markdown/expected/Models/String.md diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/markdown/expected/README.md b/src/test/resources/3_0/markdown/expected/README.md similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/markdown/expected/README.md rename to src/test/resources/3_0/markdown/expected/README.md diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/markdown/issue_6096.yaml b/src/test/resources/3_0/markdown/issue_6096.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/markdown/issue_6096.yaml rename to src/test/resources/3_0/markdown/issue_6096.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/micronaut/content-type.yaml b/src/test/resources/3_0/micronaut/content-type.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/micronaut/content-type.yaml rename to src/test/resources/3_0/micronaut/content-type.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/micronaut/multi-tags-test.yaml b/src/test/resources/3_0/micronaut/multi-tags-test.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/micronaut/multi-tags-test.yaml rename to src/test/resources/3_0/micronaut/multi-tags-test.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/micronaut/oauth2.yaml b/src/test/resources/3_0/micronaut/oauth2.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/micronaut/oauth2.yaml rename to src/test/resources/3_0/micronaut/oauth2.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/micronaut/roles-extension-test.yaml b/src/test/resources/3_0/micronaut/roles-extension-test.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/micronaut/roles-extension-test.yaml rename to src/test/resources/3_0/micronaut/roles-extension-test.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/model-deprecated.yaml b/src/test/resources/3_0/model-deprecated.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/model-deprecated.yaml rename to src/test/resources/3_0/model-deprecated.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/nonCompliantUseDiscriminatorIfCompositionFails.yaml b/src/test/resources/3_0/nonCompliantUseDiscriminatorIfCompositionFails.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/nonCompliantUseDiscriminatorIfCompositionFails.yaml rename to src/test/resources/3_0/nonCompliantUseDiscriminatorIfCompositionFails.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/objectQueryParam.yaml b/src/test/resources/3_0/objectQueryParam.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/objectQueryParam.yaml rename to src/test/resources/3_0/objectQueryParam.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/oneOf.yaml b/src/test/resources/3_0/oneOf.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/oneOf.yaml rename to src/test/resources/3_0/oneOf.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/oneOfArrayMapImport.yaml b/src/test/resources/3_0/oneOfArrayMapImport.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/oneOfArrayMapImport.yaml rename to src/test/resources/3_0/oneOfArrayMapImport.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/oneOfDiscriminator.yaml b/src/test/resources/3_0/oneOfDiscriminator.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/oneOfDiscriminator.yaml rename to src/test/resources/3_0/oneOfDiscriminator.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/oneOf_primitive.yaml b/src/test/resources/3_0/oneOf_primitive.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/oneOf_primitive.yaml rename to src/test/resources/3_0/oneOf_primitive.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml b/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml rename to src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-multiple-required-properties-has-same-oneOf-object.yaml b/src/test/resources/3_0/petstore-multiple-required-properties-has-same-oneOf-object.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-multiple-required-properties-has-same-oneOf-object.yaml rename to src/test/resources/3_0/petstore-multiple-required-properties-has-same-oneOf-object.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-complex-headers.yaml b/src/test/resources/3_0/petstore-with-complex-headers.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-complex-headers.yaml rename to src/test/resources/3_0/petstore-with-complex-headers.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-depreacted-fields.yaml b/src/test/resources/3_0/petstore-with-depreacted-fields.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-depreacted-fields.yaml rename to src/test/resources/3_0/petstore-with-depreacted-fields.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml rename to src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml b/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml rename to src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-nullable-required.yaml b/src/test/resources/3_0/petstore-with-nullable-required.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-nullable-required.yaml rename to src/test/resources/3_0/petstore-with-nullable-required.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-object-as-parameter.yaml b/src/test/resources/3_0/petstore-with-object-as-parameter.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/petstore-with-object-as-parameter.yaml rename to src/test/resources/3_0/petstore-with-object-as-parameter.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.json b/src/test/resources/3_0/petstore.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.json rename to src/test/resources/3_0/petstore.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml b/src/test/resources/3_0/petstore.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/petstore.yaml rename to src/test/resources/3_0/petstore.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/petstore_oas3_test.yaml b/src/test/resources/3_0/petstore_oas3_test.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/petstore_oas3_test.yaml rename to src/test/resources/3_0/petstore_oas3_test.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/php/issue_10244.yaml b/src/test/resources/3_0/php/issue_10244.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/php/issue_10244.yaml rename to src/test/resources/3_0/php/issue_10244.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/ping.yaml b/src/test/resources/3_0/ping.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/ping.yaml rename to src/test/resources/3_0/ping.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/pingBearerAuth.yaml b/src/test/resources/3_0/pingBearerAuth.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/pingBearerAuth.yaml rename to src/test/resources/3_0/pingBearerAuth.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/pingSomeObj.yaml b/src/test/resources/3_0/pingSomeObj.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/pingSomeObj.yaml rename to src/test/resources/3_0/pingSomeObj.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/powershell/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/src/test/resources/3_0/powershell/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/powershell/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml rename to src/test/resources/3_0/powershell/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/powershell/petstore.yaml b/src/test/resources/3_0/powershell/petstore.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/powershell/petstore.yaml rename to src/test/resources/3_0/powershell/petstore.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/produces.yaml b/src/test/resources/3_0/produces.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/produces.yaml rename to src/test/resources/3_0/produces.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/property-deprecated.yaml b/src/test/resources/3_0/property-deprecated.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/property-deprecated.yaml rename to src/test/resources/3_0/property-deprecated.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/protobuf-schema/pet.proto b/src/test/resources/3_0/protobuf-schema/pet.proto similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/protobuf-schema/pet.proto rename to src/test/resources/3_0/protobuf-schema/pet.proto diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/protobuf/petstore.yaml b/src/test/resources/3_0/protobuf/petstore.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/protobuf/petstore.yaml rename to src/test/resources/3_0/protobuf/petstore.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/python-prior/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/src/test/resources/3_0/python-prior/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/python-prior/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml rename to src/test/resources/3_0/python-prior/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/python/petstore_customized.yaml b/src/test/resources/3_0/python/petstore_customized.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/python/petstore_customized.yaml rename to src/test/resources/3_0/python/petstore_customized.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/r/petstore.yaml b/src/test/resources/3_0/r/petstore.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/r/petstore.yaml rename to src/test/resources/3_0/r/petstore.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/recursion.yaml b/src/test/resources/3_0/recursion.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/recursion.yaml rename to src/test/resources/3_0/recursion.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/regression-6734.yaml b/src/test/resources/3_0/regression-6734.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/regression-6734.yaml rename to src/test/resources/3_0/regression-6734.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/response-tests.yaml b/src/test/resources/3_0/response-tests.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/response-tests.yaml rename to src/test/resources/3_0/response-tests.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/rootOperation.yaml b/src/test/resources/3_0/rootOperation.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/rootOperation.yaml rename to src/test/resources/3_0/rootOperation.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/rust-server/multipart-v3.yaml b/src/test/resources/3_0/rust-server/multipart-v3.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/rust-server/multipart-v3.yaml rename to src/test/resources/3_0/rust-server/multipart-v3.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/rust-server/no-example-v3.yaml b/src/test/resources/3_0/rust-server/no-example-v3.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/rust-server/no-example-v3.yaml rename to src/test/resources/3_0/rust-server/no-example-v3.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/rust-server/openapi-v3.yaml b/src/test/resources/3_0/rust-server/openapi-v3.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/rust-server/openapi-v3.yaml rename to src/test/resources/3_0/rust-server/openapi-v3.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/rust-server/ops-v3.yaml b/src/test/resources/3_0/rust-server/ops-v3.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/rust-server/ops-v3.yaml rename to src/test/resources/3_0/rust-server/ops-v3.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/rust-server/ping-bearer-auth.yaml b/src/test/resources/3_0/rust-server/ping-bearer-auth.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/rust-server/ping-bearer-auth.yaml rename to src/test/resources/3_0/rust-server/ping-bearer-auth.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/rust/petstore.yaml b/src/test/resources/3_0/rust/petstore.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/rust/petstore.yaml rename to src/test/resources/3_0/rust/petstore.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/scala-akka/petstore.yaml b/src/test/resources/3_0/scala-akka/petstore.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/scala-akka/petstore.yaml rename to src/test/resources/3_0/scala-akka/petstore.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/scala/issue_10187_operatorName.yaml b/src/test/resources/3_0/scala/issue_10187_operatorName.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/scala/issue_10187_operatorName.yaml rename to src/test/resources/3_0/scala/issue_10187_operatorName.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/scala/petstore.yaml b/src/test/resources/3_0/scala/petstore.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/scala/petstore.yaml rename to src/test/resources/3_0/scala/petstore.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/scala/stripModelName.yaml b/src/test/resources/3_0/scala/stripModelName.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/scala/stripModelName.yaml rename to src/test/resources/3_0/scala/stripModelName.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/scala_reserved_words.yaml b/src/test/resources/3_0/scala_reserved_words.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/scala_reserved_words.yaml rename to src/test/resources/3_0/scala_reserved_words.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/schema-unalias-test.yml b/src/test/resources/3_0/schema-unalias-test.yml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/schema-unalias-test.yml rename to src/test/resources/3_0/schema-unalias-test.yml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/schema-with-nullable-arrays.yaml b/src/test/resources/3_0/schema-with-nullable-arrays.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/schema-with-nullable-arrays.yaml rename to src/test/resources/3_0/schema-with-nullable-arrays.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/schema-with-special-characters.yaml b/src/test/resources/3_0/schema-with-special-characters.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/schema-with-special-characters.yaml rename to src/test/resources/3_0/schema-with-special-characters.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/security.yaml b/src/test/resources/3_0/security.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/security.yaml rename to src/test/resources/3_0/security.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/server-required.yaml b/src/test/resources/3_0/server-required.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/server-required.yaml rename to src/test/resources/3_0/server-required.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/setParameter.yaml b/src/test/resources/3_0/setParameter.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/setParameter.yaml rename to src/test/resources/3_0/setParameter.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/setResponse.yaml b/src/test/resources/3_0/setResponse.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/setResponse.yaml rename to src/test/resources/3_0/setResponse.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/spring/10167-nullable-set.yml b/src/test/resources/3_0/spring/10167-nullable-set.yml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/spring/10167-nullable-set.yml rename to src/test/resources/3_0/spring/10167-nullable-set.yml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml b/src/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml rename to src/test/resources/3_0/spring/date-time-parameter-types-for-testing.yml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/spring/issue_10278.yaml b/src/test/resources/3_0/spring/issue_10278.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/spring/issue_10278.yaml rename to src/test/resources/3_0/spring/issue_10278.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/spring/issue_11323.yml b/src/test/resources/3_0/spring/issue_11323.yml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/spring/issue_11323.yml rename to src/test/resources/3_0/spring/issue_11323.yml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/spring/issue_5026-b.yaml b/src/test/resources/3_0/spring/issue_5026-b.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/spring/issue_5026-b.yaml rename to src/test/resources/3_0/spring/issue_5026-b.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/spring/issue_5026.yaml b/src/test/resources/3_0/spring/issue_5026.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/spring/issue_5026.yaml rename to src/test/resources/3_0/spring/issue_5026.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/spring/issue_8045.yaml b/src/test/resources/3_0/spring/issue_8045.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/spring/issue_8045.yaml rename to src/test/resources/3_0/spring/issue_8045.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/streaming.yaml b/src/test/resources/3_0/streaming.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/streaming.yaml rename to src/test/resources/3_0/streaming.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/tags.yaml b/src/test/resources/3_0/tags.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/tags.yaml rename to src/test/resources/3_0/tags.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/test_regex.yaml b/src/test/resources/3_0/test_regex.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/test_regex.yaml rename to src/test/resources/3_0/test_regex.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/two-responses.yaml b/src/test/resources/3_0/two-responses.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/two-responses.yaml rename to src/test/resources/3_0/two-responses.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/type-alias.yaml b/src/test/resources/3_0/type-alias.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/type-alias.yaml rename to src/test/resources/3_0/type-alias.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/type_alias.yaml b/src/test/resources/3_0/type_alias.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/type_alias.yaml rename to src/test/resources/3_0/type_alias.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/type_mapping_test.yaml b/src/test/resources/3_0/type_mapping_test.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/type_mapping_test.yaml rename to src/test/resources/3_0/type_mapping_test.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/typescript-axios/with-separate-models-and-api-inheritance.yaml b/src/test/resources/3_0/typescript-axios/with-separate-models-and-api-inheritance.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/typescript-axios/with-separate-models-and-api-inheritance.yaml rename to src/test/resources/3_0/typescript-axios/with-separate-models-and-api-inheritance.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/typescript-fetch/enum.yaml b/src/test/resources/3_0/typescript-fetch/enum.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/typescript-fetch/enum.yaml rename to src/test/resources/3_0/typescript-fetch/enum.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/typescript/unique_items.yaml b/src/test/resources/3_0/typescript/unique_items.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/typescript/unique_items.yaml rename to src/test/resources/3_0/typescript/unique_items.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/.gitignore b/src/test/resources/3_0/unit_test_spec/.gitignore similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/.gitignore rename to src/test/resources/3_0/unit_test_spec/.gitignore diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/3_0_3_unit_test_spec.yaml b/src/test/resources/3_0/unit_test_spec/3_0_3_unit_test_spec.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/3_0_3_unit_test_spec.yaml rename to src/test/resources/3_0/unit_test_spec/3_0_3_unit_test_spec.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/LICENSE b/src/test/resources/3_0/unit_test_spec/draft6/LICENSE similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/LICENSE rename to src/test/resources/3_0/unit_test_spec/draft6/LICENSE diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/additionalItems.json b/src/test/resources/3_0/unit_test_spec/draft6/additionalItems.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/additionalItems.json rename to src/test/resources/3_0/unit_test_spec/draft6/additionalItems.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/additionalProperties.json b/src/test/resources/3_0/unit_test_spec/draft6/additionalProperties.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/additionalProperties.json rename to src/test/resources/3_0/unit_test_spec/draft6/additionalProperties.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/allOf.json b/src/test/resources/3_0/unit_test_spec/draft6/allOf.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/allOf.json rename to src/test/resources/3_0/unit_test_spec/draft6/allOf.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/anyOf.json b/src/test/resources/3_0/unit_test_spec/draft6/anyOf.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/anyOf.json rename to src/test/resources/3_0/unit_test_spec/draft6/anyOf.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/boolean_schema.json b/src/test/resources/3_0/unit_test_spec/draft6/boolean_schema.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/boolean_schema.json rename to src/test/resources/3_0/unit_test_spec/draft6/boolean_schema.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/const.json b/src/test/resources/3_0/unit_test_spec/draft6/const.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/const.json rename to src/test/resources/3_0/unit_test_spec/draft6/const.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/contains.json b/src/test/resources/3_0/unit_test_spec/draft6/contains.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/contains.json rename to src/test/resources/3_0/unit_test_spec/draft6/contains.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/default.json b/src/test/resources/3_0/unit_test_spec/draft6/default.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/default.json rename to src/test/resources/3_0/unit_test_spec/draft6/default.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/definitions.json b/src/test/resources/3_0/unit_test_spec/draft6/definitions.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/definitions.json rename to src/test/resources/3_0/unit_test_spec/draft6/definitions.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/dependencies.json b/src/test/resources/3_0/unit_test_spec/draft6/dependencies.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/dependencies.json rename to src/test/resources/3_0/unit_test_spec/draft6/dependencies.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/enum.json b/src/test/resources/3_0/unit_test_spec/draft6/enum.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/enum.json rename to src/test/resources/3_0/unit_test_spec/draft6/enum.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/exclusiveMaximum.json b/src/test/resources/3_0/unit_test_spec/draft6/exclusiveMaximum.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/exclusiveMaximum.json rename to src/test/resources/3_0/unit_test_spec/draft6/exclusiveMaximum.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/exclusiveMinimum.json b/src/test/resources/3_0/unit_test_spec/draft6/exclusiveMinimum.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/exclusiveMinimum.json rename to src/test/resources/3_0/unit_test_spec/draft6/exclusiveMinimum.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/format.json b/src/test/resources/3_0/unit_test_spec/draft6/format.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/format.json rename to src/test/resources/3_0/unit_test_spec/draft6/format.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/id.json b/src/test/resources/3_0/unit_test_spec/draft6/id.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/id.json rename to src/test/resources/3_0/unit_test_spec/draft6/id.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/infinite-loop-detection.json b/src/test/resources/3_0/unit_test_spec/draft6/infinite-loop-detection.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/infinite-loop-detection.json rename to src/test/resources/3_0/unit_test_spec/draft6/infinite-loop-detection.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/items.json b/src/test/resources/3_0/unit_test_spec/draft6/items.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/items.json rename to src/test/resources/3_0/unit_test_spec/draft6/items.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/maxItems.json b/src/test/resources/3_0/unit_test_spec/draft6/maxItems.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/maxItems.json rename to src/test/resources/3_0/unit_test_spec/draft6/maxItems.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/maxLength.json b/src/test/resources/3_0/unit_test_spec/draft6/maxLength.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/maxLength.json rename to src/test/resources/3_0/unit_test_spec/draft6/maxLength.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/maxProperties.json b/src/test/resources/3_0/unit_test_spec/draft6/maxProperties.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/maxProperties.json rename to src/test/resources/3_0/unit_test_spec/draft6/maxProperties.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/maximum.json b/src/test/resources/3_0/unit_test_spec/draft6/maximum.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/maximum.json rename to src/test/resources/3_0/unit_test_spec/draft6/maximum.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/minItems.json b/src/test/resources/3_0/unit_test_spec/draft6/minItems.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/minItems.json rename to src/test/resources/3_0/unit_test_spec/draft6/minItems.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/minLength.json b/src/test/resources/3_0/unit_test_spec/draft6/minLength.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/minLength.json rename to src/test/resources/3_0/unit_test_spec/draft6/minLength.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/minProperties.json b/src/test/resources/3_0/unit_test_spec/draft6/minProperties.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/minProperties.json rename to src/test/resources/3_0/unit_test_spec/draft6/minProperties.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/minimum.json b/src/test/resources/3_0/unit_test_spec/draft6/minimum.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/minimum.json rename to src/test/resources/3_0/unit_test_spec/draft6/minimum.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/multipleOf.json b/src/test/resources/3_0/unit_test_spec/draft6/multipleOf.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/multipleOf.json rename to src/test/resources/3_0/unit_test_spec/draft6/multipleOf.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/not.json b/src/test/resources/3_0/unit_test_spec/draft6/not.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/not.json rename to src/test/resources/3_0/unit_test_spec/draft6/not.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/oneOf.json b/src/test/resources/3_0/unit_test_spec/draft6/oneOf.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/oneOf.json rename to src/test/resources/3_0/unit_test_spec/draft6/oneOf.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/bignum.json b/src/test/resources/3_0/unit_test_spec/draft6/optional/bignum.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/bignum.json rename to src/test/resources/3_0/unit_test_spec/draft6/optional/bignum.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/ecmascript-regex.json b/src/test/resources/3_0/unit_test_spec/draft6/optional/ecmascript-regex.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/ecmascript-regex.json rename to src/test/resources/3_0/unit_test_spec/draft6/optional/ecmascript-regex.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/float-overflow.json b/src/test/resources/3_0/unit_test_spec/draft6/optional/float-overflow.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/float-overflow.json rename to src/test/resources/3_0/unit_test_spec/draft6/optional/float-overflow.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/date-time.json b/src/test/resources/3_0/unit_test_spec/draft6/optional/format/date-time.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/date-time.json rename to src/test/resources/3_0/unit_test_spec/draft6/optional/format/date-time.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/email.json b/src/test/resources/3_0/unit_test_spec/draft6/optional/format/email.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/email.json rename to src/test/resources/3_0/unit_test_spec/draft6/optional/format/email.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/hostname.json b/src/test/resources/3_0/unit_test_spec/draft6/optional/format/hostname.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/hostname.json rename to src/test/resources/3_0/unit_test_spec/draft6/optional/format/hostname.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/ipv4.json b/src/test/resources/3_0/unit_test_spec/draft6/optional/format/ipv4.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/ipv4.json rename to src/test/resources/3_0/unit_test_spec/draft6/optional/format/ipv4.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/ipv6.json b/src/test/resources/3_0/unit_test_spec/draft6/optional/format/ipv6.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/ipv6.json rename to src/test/resources/3_0/unit_test_spec/draft6/optional/format/ipv6.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/json-pointer.json b/src/test/resources/3_0/unit_test_spec/draft6/optional/format/json-pointer.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/json-pointer.json rename to src/test/resources/3_0/unit_test_spec/draft6/optional/format/json-pointer.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/unknown.json b/src/test/resources/3_0/unit_test_spec/draft6/optional/format/unknown.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/unknown.json rename to src/test/resources/3_0/unit_test_spec/draft6/optional/format/unknown.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/uri-reference.json b/src/test/resources/3_0/unit_test_spec/draft6/optional/format/uri-reference.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/uri-reference.json rename to src/test/resources/3_0/unit_test_spec/draft6/optional/format/uri-reference.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/uri-template.json b/src/test/resources/3_0/unit_test_spec/draft6/optional/format/uri-template.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/uri-template.json rename to src/test/resources/3_0/unit_test_spec/draft6/optional/format/uri-template.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/uri.json b/src/test/resources/3_0/unit_test_spec/draft6/optional/format/uri.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/format/uri.json rename to src/test/resources/3_0/unit_test_spec/draft6/optional/format/uri.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/future-keywords.json b/src/test/resources/3_0/unit_test_spec/draft6/optional/future-keywords.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/future-keywords.json rename to src/test/resources/3_0/unit_test_spec/draft6/optional/future-keywords.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/non-bmp-regex.json b/src/test/resources/3_0/unit_test_spec/draft6/optional/non-bmp-regex.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/optional/non-bmp-regex.json rename to src/test/resources/3_0/unit_test_spec/draft6/optional/non-bmp-regex.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/pattern.json b/src/test/resources/3_0/unit_test_spec/draft6/pattern.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/pattern.json rename to src/test/resources/3_0/unit_test_spec/draft6/pattern.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/patternProperties.json b/src/test/resources/3_0/unit_test_spec/draft6/patternProperties.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/patternProperties.json rename to src/test/resources/3_0/unit_test_spec/draft6/patternProperties.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/properties.json b/src/test/resources/3_0/unit_test_spec/draft6/properties.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/properties.json rename to src/test/resources/3_0/unit_test_spec/draft6/properties.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/propertyNames.json b/src/test/resources/3_0/unit_test_spec/draft6/propertyNames.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/propertyNames.json rename to src/test/resources/3_0/unit_test_spec/draft6/propertyNames.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/ref.json b/src/test/resources/3_0/unit_test_spec/draft6/ref.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/ref.json rename to src/test/resources/3_0/unit_test_spec/draft6/ref.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/refRemote.json b/src/test/resources/3_0/unit_test_spec/draft6/refRemote.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/refRemote.json rename to src/test/resources/3_0/unit_test_spec/draft6/refRemote.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/required.json b/src/test/resources/3_0/unit_test_spec/draft6/required.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/required.json rename to src/test/resources/3_0/unit_test_spec/draft6/required.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/type.json b/src/test/resources/3_0/unit_test_spec/draft6/type.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/type.json rename to src/test/resources/3_0/unit_test_spec/draft6/type.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/uniqueItems.json b/src/test/resources/3_0/unit_test_spec/draft6/uniqueItems.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/uniqueItems.json rename to src/test/resources/3_0/unit_test_spec/draft6/uniqueItems.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/unknownKeyword.json b/src/test/resources/3_0/unit_test_spec/draft6/unknownKeyword.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/draft6/unknownKeyword.json rename to src/test/resources/3_0/unit_test_spec/draft6/unknownKeyword.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/openapi_additions/additionalProperties.json b/src/test/resources/3_0/unit_test_spec/openapi_additions/additionalProperties.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/openapi_additions/additionalProperties.json rename to src/test/resources/3_0/unit_test_spec/openapi_additions/additionalProperties.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/openapi_additions/multipleOf.json b/src/test/resources/3_0/unit_test_spec/openapi_additions/multipleOf.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/openapi_additions/multipleOf.json rename to src/test/resources/3_0/unit_test_spec/openapi_additions/multipleOf.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/openapi_additions/ref.json b/src/test/resources/3_0/unit_test_spec/openapi_additions/ref.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/openapi_additions/ref.json rename to src/test/resources/3_0/unit_test_spec/openapi_additions/ref.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/openapi_additions/type.json b/src/test/resources/3_0/unit_test_spec/openapi_additions/type.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/openapi_additions/type.json rename to src/test/resources/3_0/unit_test_spec/openapi_additions/type.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/spec_writer.py b/src/test/resources/3_0/unit_test_spec/spec_writer.py similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unit_test_spec/spec_writer.py rename to src/test/resources/3_0/unit_test_spec/spec_writer.py diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/unusedSchemas.yaml b/src/test/resources/3_0/unusedSchemas.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/unusedSchemas.yaml rename to src/test/resources/3_0/unusedSchemas.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_0/wsdl/petstore.yaml b/src/test/resources/3_0/wsdl/petstore.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_0/wsdl/petstore.yaml rename to src/test/resources/3_0/wsdl/petstore.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_1/null-types-with-type-array.yaml b/src/test/resources/3_1/null-types-with-type-array.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_1/null-types-with-type-array.yaml rename to src/test/resources/3_1/null-types-with-type-array.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_1/null-types.yaml b/src/test/resources/3_1/null-types.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_1/null-types.yaml rename to src/test/resources/3_1/null-types.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/3_1/petstore.yaml b/src/test/resources/3_1/petstore.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/3_1/petstore.yaml rename to src/test/resources/3_1/petstore.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/archunit_ignore_patterns.txt b/src/test/resources/archunit_ignore_patterns.txt similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/archunit_ignore_patterns.txt rename to src/test/resources/archunit_ignore_patterns.txt diff --git a/modules/openapi-json-schema-generator/src/test/resources/batch/common/jaxrs-datelib-j8.json b/src/test/resources/batch/common/jaxrs-datelib-j8.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/batch/common/jaxrs-datelib-j8.json rename to src/test/resources/batch/common/jaxrs-datelib-j8.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/batch/common/jaxrs-datelib-j8.yaml b/src/test/resources/batch/common/jaxrs-datelib-j8.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/batch/common/jaxrs-datelib-j8.yaml rename to src/test/resources/batch/common/jaxrs-datelib-j8.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-double.json b/src/test/resources/batch/jaxrs-datelib-j8-double.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-double.json rename to src/test/resources/batch/jaxrs-datelib-j8-double.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-double.yaml b/src/test/resources/batch/jaxrs-datelib-j8-double.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-double.yaml rename to src/test/resources/batch/jaxrs-datelib-j8-double.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-json-include.yaml b/src/test/resources/batch/jaxrs-datelib-j8-json-include.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-json-include.yaml rename to src/test/resources/batch/jaxrs-datelib-j8-json-include.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested-include-property-merge.yaml b/src/test/resources/batch/jaxrs-datelib-j8-nested-include-property-merge.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested-include-property-merge.yaml rename to src/test/resources/batch/jaxrs-datelib-j8-nested-include-property-merge.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested-include.json b/src/test/resources/batch/jaxrs-datelib-j8-nested-include.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested-include.json rename to src/test/resources/batch/jaxrs-datelib-j8-nested-include.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested-include.yaml b/src/test/resources/batch/jaxrs-datelib-j8-nested-include.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested-include.yaml rename to src/test/resources/batch/jaxrs-datelib-j8-nested-include.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested-property-merge.yaml b/src/test/resources/batch/jaxrs-datelib-j8-nested-property-merge.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested-property-merge.yaml rename to src/test/resources/batch/jaxrs-datelib-j8-nested-property-merge.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested.json b/src/test/resources/batch/jaxrs-datelib-j8-nested.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested.json rename to src/test/resources/batch/jaxrs-datelib-j8-nested.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested.yaml b/src/test/resources/batch/jaxrs-datelib-j8-nested.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-nested.yaml rename to src/test/resources/batch/jaxrs-datelib-j8-nested.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-yaml-include.json b/src/test/resources/batch/jaxrs-datelib-j8-yaml-include.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8-yaml-include.json rename to src/test/resources/batch/jaxrs-datelib-j8-yaml-include.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8.json b/src/test/resources/batch/jaxrs-datelib-j8.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8.json rename to src/test/resources/batch/jaxrs-datelib-j8.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8.yaml b/src/test/resources/batch/jaxrs-datelib-j8.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/batch/jaxrs-datelib-j8.yaml rename to src/test/resources/batch/jaxrs-datelib-j8.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/batch/specs/petstore.yaml b/src/test/resources/batch/specs/petstore.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/batch/specs/petstore.yaml rename to src/test/resources/batch/specs/petstore.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/bugs/Swift5CodeGenerationBug2.yaml b/src/test/resources/bugs/Swift5CodeGenerationBug2.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/bugs/Swift5CodeGenerationBug2.yaml rename to src/test/resources/bugs/Swift5CodeGenerationBug2.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/bugs/Swift5CodeGenerationStackOverflow#2966.yaml b/src/test/resources/bugs/Swift5CodeGenerationStackOverflow#2966.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/bugs/Swift5CodeGenerationStackOverflow#2966.yaml rename to src/test/resources/bugs/Swift5CodeGenerationStackOverflow#2966.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/bugs/issue_11304_kotlin_backticks_reserved_words.yaml b/src/test/resources/bugs/issue_11304_kotlin_backticks_reserved_words.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/bugs/issue_11304_kotlin_backticks_reserved_words.yaml rename to src/test/resources/bugs/issue_11304_kotlin_backticks_reserved_words.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/bugs/issue_11464.yaml b/src/test/resources/bugs/issue_11464.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/bugs/issue_11464.yaml rename to src/test/resources/bugs/issue_11464.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/bugs/issue_11731.yaml b/src/test/resources/bugs/issue_11731.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/bugs/issue_11731.yaml rename to src/test/resources/bugs/issue_11731.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/bugs/issue_11897.yaml b/src/test/resources/bugs/issue_11897.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/bugs/issue_11897.yaml rename to src/test/resources/bugs/issue_11897.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/bugs/issue_11957.yaml b/src/test/resources/bugs/issue_11957.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/bugs/issue_11957.yaml rename to src/test/resources/bugs/issue_11957.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/bugs/issue_12457.yaml b/src/test/resources/bugs/issue_12457.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/bugs/issue_12457.yaml rename to src/test/resources/bugs/issue_12457.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/bugs/issue_12494.yaml b/src/test/resources/bugs/issue_12494.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/bugs/issue_12494.yaml rename to src/test/resources/bugs/issue_12494.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/bugs/issue_12622.json b/src/test/resources/bugs/issue_12622.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/bugs/issue_12622.json rename to src/test/resources/bugs/issue_12622.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/bugs/issue_12692.yml b/src/test/resources/bugs/issue_12692.yml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/bugs/issue_12692.yml rename to src/test/resources/bugs/issue_12692.yml diff --git a/modules/openapi-json-schema-generator/src/test/resources/bugs/issue_12790.yaml b/src/test/resources/bugs/issue_12790.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/bugs/issue_12790.yaml rename to src/test/resources/bugs/issue_12790.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/bugs/issue_7125.json b/src/test/resources/bugs/issue_7125.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/bugs/issue_7125.json rename to src/test/resources/bugs/issue_7125.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/bugs/issue_9719.yaml b/src/test/resources/bugs/issue_9719.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/bugs/issue_9719.yaml rename to src/test/resources/bugs/issue_9719.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/bugs/recursion-bug-4650.yaml b/src/test/resources/bugs/recursion-bug-4650.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/bugs/recursion-bug-4650.yaml rename to src/test/resources/bugs/recursion-bug-4650.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/codegen/scala/JavaTimeObj.scala.txt b/src/test/resources/codegen/scala/JavaTimeObj.scala.txt similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/codegen/scala/JavaTimeObj.scala.txt rename to src/test/resources/codegen/scala/JavaTimeObj.scala.txt diff --git a/modules/openapi-json-schema-generator/src/test/resources/codegen/scala/SomeObj.scala.txt b/src/test/resources/codegen/scala/SomeObj.scala.txt similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/codegen/scala/SomeObj.scala.txt rename to src/test/resources/codegen/scala/SomeObj.scala.txt diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/csharp/general/enum-support-spec.json b/src/test/resources/integrationtests/csharp/general/enum-support-spec.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/csharp/general/enum-support-spec.json rename to src/test/resources/integrationtests/csharp/general/enum-support-spec.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/csharp/general/enum-support.ignore b/src/test/resources/integrationtests/csharp/general/enum-support.ignore similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/csharp/general/enum-support.ignore rename to src/test/resources/integrationtests/csharp/general/enum-support.ignore diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/csharp/general/enum-support.sh b/src/test/resources/integrationtests/csharp/general/enum-support.sh similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/csharp/general/enum-support.sh rename to src/test/resources/integrationtests/csharp/general/enum-support.sh diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/scala/client/required-attributes-spec.json b/src/test/resources/integrationtests/scala/client/required-attributes-spec.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/scala/client/required-attributes-spec.json rename to src/test/resources/integrationtests/scala/client/required-attributes-spec.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/scala/client/required-attributes.sh b/src/test/resources/integrationtests/scala/client/required-attributes.sh similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/scala/client/required-attributes.sh rename to src/test/resources/integrationtests/scala/client/required-attributes.sh diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/.gitignore b/src/test/resources/integrationtests/typescript/additional-properties-expected/.gitignore similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/.gitignore rename to src/test/resources/integrationtests/typescript/additional-properties-expected/.gitignore diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/README.md b/src/test/resources/integrationtests/typescript/additional-properties-expected/README.md similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/README.md rename to src/test/resources/integrationtests/typescript/additional-properties-expected/README.md diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/api.module.ts b/src/test/resources/integrationtests/typescript/additional-properties-expected/api.module.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/api.module.ts rename to src/test/resources/integrationtests/typescript/additional-properties-expected/api.module.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/api/api.ts b/src/test/resources/integrationtests/typescript/additional-properties-expected/api/api.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/api/api.ts rename to src/test/resources/integrationtests/typescript/additional-properties-expected/api/api.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/api/user.service.ts b/src/test/resources/integrationtests/typescript/additional-properties-expected/api/user.service.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/api/user.service.ts rename to src/test/resources/integrationtests/typescript/additional-properties-expected/api/user.service.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/configuration.ts b/src/test/resources/integrationtests/typescript/additional-properties-expected/configuration.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/configuration.ts rename to src/test/resources/integrationtests/typescript/additional-properties-expected/configuration.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/encoder.ts b/src/test/resources/integrationtests/typescript/additional-properties-expected/encoder.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/encoder.ts rename to src/test/resources/integrationtests/typescript/additional-properties-expected/encoder.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/git_push.sh b/src/test/resources/integrationtests/typescript/additional-properties-expected/git_push.sh similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/git_push.sh rename to src/test/resources/integrationtests/typescript/additional-properties-expected/git_push.sh diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/index.ts b/src/test/resources/integrationtests/typescript/additional-properties-expected/index.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/index.ts rename to src/test/resources/integrationtests/typescript/additional-properties-expected/index.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/model/models.ts b/src/test/resources/integrationtests/typescript/additional-properties-expected/model/models.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/model/models.ts rename to src/test/resources/integrationtests/typescript/additional-properties-expected/model/models.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/model/user.ts b/src/test/resources/integrationtests/typescript/additional-properties-expected/model/user.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/model/user.ts rename to src/test/resources/integrationtests/typescript/additional-properties-expected/model/user.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/ng-package.json b/src/test/resources/integrationtests/typescript/additional-properties-expected/ng-package.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/ng-package.json rename to src/test/resources/integrationtests/typescript/additional-properties-expected/ng-package.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/package.json b/src/test/resources/integrationtests/typescript/additional-properties-expected/package.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/package.json rename to src/test/resources/integrationtests/typescript/additional-properties-expected/package.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/param.ts b/src/test/resources/integrationtests/typescript/additional-properties-expected/param.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/param.ts rename to src/test/resources/integrationtests/typescript/additional-properties-expected/param.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/tsconfig.json b/src/test/resources/integrationtests/typescript/additional-properties-expected/tsconfig.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/tsconfig.json rename to src/test/resources/integrationtests/typescript/additional-properties-expected/tsconfig.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/variables.ts b/src/test/resources/integrationtests/typescript/additional-properties-expected/variables.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-expected/variables.ts rename to src/test/resources/integrationtests/typescript/additional-properties-expected/variables.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-spec.json b/src/test/resources/integrationtests/typescript/additional-properties-spec.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/additional-properties-spec.json rename to src/test/resources/integrationtests/typescript/additional-properties-spec.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/.gitignore b/src/test/resources/integrationtests/typescript/array-and-object-expected/.gitignore similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/.gitignore rename to src/test/resources/integrationtests/typescript/array-and-object-expected/.gitignore diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/README.md b/src/test/resources/integrationtests/typescript/array-and-object-expected/README.md similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/README.md rename to src/test/resources/integrationtests/typescript/array-and-object-expected/README.md diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/api.module.ts b/src/test/resources/integrationtests/typescript/array-and-object-expected/api.module.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/api.module.ts rename to src/test/resources/integrationtests/typescript/array-and-object-expected/api.module.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/api/api.ts b/src/test/resources/integrationtests/typescript/array-and-object-expected/api/api.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/api/api.ts rename to src/test/resources/integrationtests/typescript/array-and-object-expected/api/api.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/api/project.service.ts b/src/test/resources/integrationtests/typescript/array-and-object-expected/api/project.service.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/api/project.service.ts rename to src/test/resources/integrationtests/typescript/array-and-object-expected/api/project.service.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/configuration.ts b/src/test/resources/integrationtests/typescript/array-and-object-expected/configuration.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/configuration.ts rename to src/test/resources/integrationtests/typescript/array-and-object-expected/configuration.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/encoder.ts b/src/test/resources/integrationtests/typescript/array-and-object-expected/encoder.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/encoder.ts rename to src/test/resources/integrationtests/typescript/array-and-object-expected/encoder.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/git_push.sh b/src/test/resources/integrationtests/typescript/array-and-object-expected/git_push.sh similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/git_push.sh rename to src/test/resources/integrationtests/typescript/array-and-object-expected/git_push.sh diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/index.ts b/src/test/resources/integrationtests/typescript/array-and-object-expected/index.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/index.ts rename to src/test/resources/integrationtests/typescript/array-and-object-expected/index.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/model/models.ts b/src/test/resources/integrationtests/typescript/array-and-object-expected/model/models.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/model/models.ts rename to src/test/resources/integrationtests/typescript/array-and-object-expected/model/models.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectEntity.ts b/src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectEntity.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectEntity.ts rename to src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectEntity.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectEntityLocation.ts b/src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectEntityLocation.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectEntityLocation.ts rename to src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectEntityLocation.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectList.ts b/src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectList.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectList.ts rename to src/test/resources/integrationtests/typescript/array-and-object-expected/model/projectList.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/ng-package.json b/src/test/resources/integrationtests/typescript/array-and-object-expected/ng-package.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/ng-package.json rename to src/test/resources/integrationtests/typescript/array-and-object-expected/ng-package.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/package.json b/src/test/resources/integrationtests/typescript/array-and-object-expected/package.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/package.json rename to src/test/resources/integrationtests/typescript/array-and-object-expected/package.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/param.ts b/src/test/resources/integrationtests/typescript/array-and-object-expected/param.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/param.ts rename to src/test/resources/integrationtests/typescript/array-and-object-expected/param.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/tsconfig.json b/src/test/resources/integrationtests/typescript/array-and-object-expected/tsconfig.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/tsconfig.json rename to src/test/resources/integrationtests/typescript/array-and-object-expected/tsconfig.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/variables.ts b/src/test/resources/integrationtests/typescript/array-and-object-expected/variables.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-expected/variables.ts rename to src/test/resources/integrationtests/typescript/array-and-object-expected/variables.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-spec.json b/src/test/resources/integrationtests/typescript/array-and-object-spec.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/array-and-object-spec.json rename to src/test/resources/integrationtests/typescript/array-and-object-spec.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/.gitignore b/src/test/resources/integrationtests/typescript/custom-path-params-expected/.gitignore similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/.gitignore rename to src/test/resources/integrationtests/typescript/custom-path-params-expected/.gitignore diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/README.md b/src/test/resources/integrationtests/typescript/custom-path-params-expected/README.md similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/README.md rename to src/test/resources/integrationtests/typescript/custom-path-params-expected/README.md diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/api.module.ts b/src/test/resources/integrationtests/typescript/custom-path-params-expected/api.module.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/api.module.ts rename to src/test/resources/integrationtests/typescript/custom-path-params-expected/api.module.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/api/api.ts b/src/test/resources/integrationtests/typescript/custom-path-params-expected/api/api.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/api/api.ts rename to src/test/resources/integrationtests/typescript/custom-path-params-expected/api/api.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/api/matrixParams.service.ts b/src/test/resources/integrationtests/typescript/custom-path-params-expected/api/matrixParams.service.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/api/matrixParams.service.ts rename to src/test/resources/integrationtests/typescript/custom-path-params-expected/api/matrixParams.service.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/configuration.ts b/src/test/resources/integrationtests/typescript/custom-path-params-expected/configuration.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/configuration.ts rename to src/test/resources/integrationtests/typescript/custom-path-params-expected/configuration.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/encoder.ts b/src/test/resources/integrationtests/typescript/custom-path-params-expected/encoder.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/encoder.ts rename to src/test/resources/integrationtests/typescript/custom-path-params-expected/encoder.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/git_push.sh b/src/test/resources/integrationtests/typescript/custom-path-params-expected/git_push.sh similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/git_push.sh rename to src/test/resources/integrationtests/typescript/custom-path-params-expected/git_push.sh diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/index.ts b/src/test/resources/integrationtests/typescript/custom-path-params-expected/index.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/index.ts rename to src/test/resources/integrationtests/typescript/custom-path-params-expected/index.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/model/complexParams.ts b/src/test/resources/integrationtests/typescript/custom-path-params-expected/model/complexParams.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/model/complexParams.ts rename to src/test/resources/integrationtests/typescript/custom-path-params-expected/model/complexParams.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/model/models.ts b/src/test/resources/integrationtests/typescript/custom-path-params-expected/model/models.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/model/models.ts rename to src/test/resources/integrationtests/typescript/custom-path-params-expected/model/models.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/ng-package.json b/src/test/resources/integrationtests/typescript/custom-path-params-expected/ng-package.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/ng-package.json rename to src/test/resources/integrationtests/typescript/custom-path-params-expected/ng-package.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/package.json b/src/test/resources/integrationtests/typescript/custom-path-params-expected/package.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/package.json rename to src/test/resources/integrationtests/typescript/custom-path-params-expected/package.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/param.ts b/src/test/resources/integrationtests/typescript/custom-path-params-expected/param.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/param.ts rename to src/test/resources/integrationtests/typescript/custom-path-params-expected/param.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/tsconfig.json b/src/test/resources/integrationtests/typescript/custom-path-params-expected/tsconfig.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/tsconfig.json rename to src/test/resources/integrationtests/typescript/custom-path-params-expected/tsconfig.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/variables.ts b/src/test/resources/integrationtests/typescript/custom-path-params-expected/variables.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-expected/variables.ts rename to src/test/resources/integrationtests/typescript/custom-path-params-expected/variables.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-spec.json b/src/test/resources/integrationtests/typescript/custom-path-params-spec.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/custom-path-params-spec.json rename to src/test/resources/integrationtests/typescript/custom-path-params-spec.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/node-es5-expected/.gitignore b/src/test/resources/integrationtests/typescript/node-es5-expected/.gitignore similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/node-es5-expected/.gitignore rename to src/test/resources/integrationtests/typescript/node-es5-expected/.gitignore diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/node-es5-expected/.openapi-generator-ignore b/src/test/resources/integrationtests/typescript/node-es5-expected/.openapi-generator-ignore similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/node-es5-expected/.openapi-generator-ignore rename to src/test/resources/integrationtests/typescript/node-es5-expected/.openapi-generator-ignore diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/node-es5-expected/LICENSE b/src/test/resources/integrationtests/typescript/node-es5-expected/LICENSE similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/node-es5-expected/LICENSE rename to src/test/resources/integrationtests/typescript/node-es5-expected/LICENSE diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/node-es5-expected/api.ts b/src/test/resources/integrationtests/typescript/node-es5-expected/api.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/node-es5-expected/api.ts rename to src/test/resources/integrationtests/typescript/node-es5-expected/api.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/node-es5-expected/git_push.sh b/src/test/resources/integrationtests/typescript/node-es5-expected/git_push.sh similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/node-es5-expected/git_push.sh rename to src/test/resources/integrationtests/typescript/node-es5-expected/git_push.sh diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/node-es5-expected/package.json b/src/test/resources/integrationtests/typescript/node-es5-expected/package.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/node-es5-expected/package.json rename to src/test/resources/integrationtests/typescript/node-es5-expected/package.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/node-es5-expected/tsconfig.json b/src/test/resources/integrationtests/typescript/node-es5-expected/tsconfig.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/node-es5-expected/tsconfig.json rename to src/test/resources/integrationtests/typescript/node-es5-expected/tsconfig.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/node-es5-expected/typings.json b/src/test/resources/integrationtests/typescript/node-es5-expected/typings.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/node-es5-expected/typings.json rename to src/test/resources/integrationtests/typescript/node-es5-expected/typings.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/node-es5-spec.json b/src/test/resources/integrationtests/typescript/node-es5-spec.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/node-es5-spec.json rename to src/test/resources/integrationtests/typescript/node-es5-spec.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.gitignore b/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.gitignore similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.gitignore rename to src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.gitignore diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.openapi-generator-ignore b/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.openapi-generator-ignore similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.openapi-generator-ignore rename to src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.openapi-generator-ignore diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.openapi-generator/VERSION b/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.openapi-generator/VERSION similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.openapi-generator/VERSION rename to src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.openapi-generator/VERSION diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api.ts b/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api.ts rename to src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api/apis.ts b/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api/apis.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api/apis.ts rename to src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api/apis.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api/defaultApi.ts b/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api/defaultApi.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api/defaultApi.ts rename to src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api/defaultApi.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/git_push.sh b/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/git_push.sh similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/git_push.sh rename to src/test/resources/integrationtests/typescript/objectsWithEnums-expected/git_push.sh diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/externalEnum.ts b/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/externalEnum.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/externalEnum.ts rename to src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/externalEnum.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/models.ts b/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/models.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/models.ts rename to src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/models.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/objectWithEnums.ts b/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/objectWithEnums.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/objectWithEnums.ts rename to src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/objectWithEnums.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/package.json b/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/package.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/package.json rename to src/test/resources/integrationtests/typescript/objectsWithEnums-expected/package.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/tsconfig.json b/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/tsconfig.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/tsconfig.json rename to src/test/resources/integrationtests/typescript/objectsWithEnums-expected/tsconfig.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-spec.json b/src/test/resources/integrationtests/typescript/objectsWithEnums-spec.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-spec.json rename to src/test/resources/integrationtests/typescript/objectsWithEnums-spec.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/.gitignore b/src/test/resources/integrationtests/typescript/petstore-expected/.gitignore similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/.gitignore rename to src/test/resources/integrationtests/typescript/petstore-expected/.gitignore diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/README.md b/src/test/resources/integrationtests/typescript/petstore-expected/README.md similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/README.md rename to src/test/resources/integrationtests/typescript/petstore-expected/README.md diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/api.module.ts b/src/test/resources/integrationtests/typescript/petstore-expected/api.module.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/api.module.ts rename to src/test/resources/integrationtests/typescript/petstore-expected/api.module.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/api/api.ts b/src/test/resources/integrationtests/typescript/petstore-expected/api/api.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/api/api.ts rename to src/test/resources/integrationtests/typescript/petstore-expected/api/api.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/api/pet.service.ts b/src/test/resources/integrationtests/typescript/petstore-expected/api/pet.service.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/api/pet.service.ts rename to src/test/resources/integrationtests/typescript/petstore-expected/api/pet.service.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/api/store.service.ts b/src/test/resources/integrationtests/typescript/petstore-expected/api/store.service.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/api/store.service.ts rename to src/test/resources/integrationtests/typescript/petstore-expected/api/store.service.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/api/user.service.ts b/src/test/resources/integrationtests/typescript/petstore-expected/api/user.service.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/api/user.service.ts rename to src/test/resources/integrationtests/typescript/petstore-expected/api/user.service.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/configuration.ts b/src/test/resources/integrationtests/typescript/petstore-expected/configuration.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/configuration.ts rename to src/test/resources/integrationtests/typescript/petstore-expected/configuration.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/encoder.ts b/src/test/resources/integrationtests/typescript/petstore-expected/encoder.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/encoder.ts rename to src/test/resources/integrationtests/typescript/petstore-expected/encoder.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/git_push.sh b/src/test/resources/integrationtests/typescript/petstore-expected/git_push.sh similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/git_push.sh rename to src/test/resources/integrationtests/typescript/petstore-expected/git_push.sh diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/index.ts b/src/test/resources/integrationtests/typescript/petstore-expected/index.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/index.ts rename to src/test/resources/integrationtests/typescript/petstore-expected/index.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/model/apiResponse.ts b/src/test/resources/integrationtests/typescript/petstore-expected/model/apiResponse.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/model/apiResponse.ts rename to src/test/resources/integrationtests/typescript/petstore-expected/model/apiResponse.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/model/category.ts b/src/test/resources/integrationtests/typescript/petstore-expected/model/category.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/model/category.ts rename to src/test/resources/integrationtests/typescript/petstore-expected/model/category.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/model/models.ts b/src/test/resources/integrationtests/typescript/petstore-expected/model/models.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/model/models.ts rename to src/test/resources/integrationtests/typescript/petstore-expected/model/models.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/model/order.ts b/src/test/resources/integrationtests/typescript/petstore-expected/model/order.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/model/order.ts rename to src/test/resources/integrationtests/typescript/petstore-expected/model/order.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/model/pet.ts b/src/test/resources/integrationtests/typescript/petstore-expected/model/pet.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/model/pet.ts rename to src/test/resources/integrationtests/typescript/petstore-expected/model/pet.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/model/tag.ts b/src/test/resources/integrationtests/typescript/petstore-expected/model/tag.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/model/tag.ts rename to src/test/resources/integrationtests/typescript/petstore-expected/model/tag.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/model/user.ts b/src/test/resources/integrationtests/typescript/petstore-expected/model/user.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/model/user.ts rename to src/test/resources/integrationtests/typescript/petstore-expected/model/user.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/ng-package.json b/src/test/resources/integrationtests/typescript/petstore-expected/ng-package.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/ng-package.json rename to src/test/resources/integrationtests/typescript/petstore-expected/ng-package.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/package.json b/src/test/resources/integrationtests/typescript/petstore-expected/package.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/package.json rename to src/test/resources/integrationtests/typescript/petstore-expected/package.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/param.ts b/src/test/resources/integrationtests/typescript/petstore-expected/param.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/param.ts rename to src/test/resources/integrationtests/typescript/petstore-expected/param.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/tsconfig.json b/src/test/resources/integrationtests/typescript/petstore-expected/tsconfig.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/tsconfig.json rename to src/test/resources/integrationtests/typescript/petstore-expected/tsconfig.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/variables.ts b/src/test/resources/integrationtests/typescript/petstore-expected/variables.ts similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-expected/variables.ts rename to src/test/resources/integrationtests/typescript/petstore-expected/variables.ts diff --git a/modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-spec.json b/src/test/resources/integrationtests/typescript/petstore-spec.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/integrationtests/typescript/petstore-spec.json rename to src/test/resources/integrationtests/typescript/petstore-spec.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/jsoncodable.yaml b/src/test/resources/jsoncodable.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/jsoncodable.yaml rename to src/test/resources/jsoncodable.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/logback.xml b/src/test/resources/logback.xml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/logback.xml rename to src/test/resources/logback.xml diff --git a/modules/openapi-json-schema-generator/src/test/resources/npe-test-spec-file.yaml b/src/test/resources/npe-test-spec-file.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/npe-test-spec-file.yaml rename to src/test/resources/npe-test-spec-file.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/npe-test.yaml b/src/test/resources/npe-test.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/npe-test.yaml rename to src/test/resources/npe-test.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/org/openapijsonschematools/codegen/kotlin/KotlinTestUtilsTest/badPack/com/example/SimpleClass.kt b/src/test/resources/org/openapijsonschematools/codegen/kotlin/KotlinTestUtilsTest/badPack/com/example/SimpleClass.kt similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/org/openapijsonschematools/codegen/kotlin/KotlinTestUtilsTest/badPack/com/example/SimpleClass.kt rename to src/test/resources/org/openapijsonschematools/codegen/kotlin/KotlinTestUtilsTest/badPack/com/example/SimpleClass.kt diff --git a/modules/openapi-json-schema-generator/src/test/resources/org/openapijsonschematools/codegen/kotlin/KotlinTestUtilsTest/normalPack/com/example/SimpleClass.kt b/src/test/resources/org/openapijsonschematools/codegen/kotlin/KotlinTestUtilsTest/normalPack/com/example/SimpleClass.kt similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/org/openapijsonschematools/codegen/kotlin/KotlinTestUtilsTest/normalPack/com/example/SimpleClass.kt rename to src/test/resources/org/openapijsonschematools/codegen/kotlin/KotlinTestUtilsTest/normalPack/com/example/SimpleClass.kt diff --git a/modules/openapi-json-schema-generator/src/test/resources/petstore.json b/src/test/resources/petstore.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/petstore.json rename to src/test/resources/petstore.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/sampleConfig.json b/src/test/resources/sampleConfig.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/sampleConfig.json rename to src/test/resources/sampleConfig.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/split-import.json b/src/test/resources/split-import.json similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/split-import.json rename to src/test/resources/split-import.json diff --git a/modules/openapi-json-schema-generator/src/test/resources/swagger.yaml b/src/test/resources/swagger.yaml similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/swagger.yaml rename to src/test/resources/swagger.yaml diff --git a/modules/openapi-json-schema-generator/src/test/resources/templating/templates/.gitignore b/src/test/resources/templating/templates/.gitignore similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/templating/templates/.gitignore rename to src/test/resources/templating/templates/.gitignore diff --git a/modules/openapi-json-schema-generator/src/test/resources/templating/templates/README.md b/src/test/resources/templating/templates/README.md similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/templating/templates/README.md rename to src/test/resources/templating/templates/README.md diff --git a/modules/openapi-json-schema-generator/src/test/resources/templating/templates/jmeter/api.hbs b/src/test/resources/templating/templates/jmeter/api.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/templating/templates/jmeter/api.hbs rename to src/test/resources/templating/templates/jmeter/api.hbs diff --git a/modules/openapi-json-schema-generator/src/test/resources/templating/templates/jmeter/testdata-localhost.hbs b/src/test/resources/templating/templates/jmeter/testdata-localhost.hbs similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/templating/templates/jmeter/testdata-localhost.hbs rename to src/test/resources/templating/templates/jmeter/testdata-localhost.hbs diff --git a/modules/openapi-json-schema-generator/src/test/resources/templating/templates/numbers.handlebars b/src/test/resources/templating/templates/numbers.handlebars similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/templating/templates/numbers.handlebars rename to src/test/resources/templating/templates/numbers.handlebars diff --git a/modules/openapi-json-schema-generator/src/test/resources/templating/templates/simple.mustache b/src/test/resources/templating/templates/simple.mustache similarity index 100% rename from modules/openapi-json-schema-generator/src/test/resources/templating/templates/simple.mustache rename to src/test/resources/templating/templates/simple.mustache From d1f87d49d1d1f15cd39dcd6b92d4b91942d8fb21 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 15:34:11 -0700 Subject: [PATCH 20/43] Removes broken links from pom, removes qos library, increase slf4j version --- pom.xml | 74 +++++-------------- .../codegen/clicommands/GenerateBatch.java | 7 +- 2 files changed, 23 insertions(+), 58 deletions(-) diff --git a/pom.xml b/pom.xml index a08a861a71a..cda04d87a28 100644 --- a/pom.xml +++ b/pom.xml @@ -1,15 +1,15 @@ - org.openapijsonschematools - openapi-json-schema-generator-project - ${revision} - ../.. + org.sonatype.oss + oss-parent + 5 + 4.0.0 - openapi-json-schema-generator + openapi-json-schema-generator-project jar - openapi-json-schema-generator (core library) + openapi-json-schema-generator-project ${revision} @@ -47,6 +47,7 @@ pl.project13.maven git-commit-id-plugin + ${git-commit-id-plugin.version} get-the-git-infos @@ -73,9 +74,19 @@ org.apache.maven.plugins maven-checkstyle-plugin + ${checkstyle.plugin.version} - ${project.parent.basedir}${file.separator}google_checkstyle.xml + google_checkstyle.xml + + + checkstyle-check + + check + + verify + + org.codehaus.mojo @@ -163,50 +174,9 @@ true - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - static-analysis - - - - com.github.spotbugs - spotbugs-maven-plugin - - ${project.parent.basedir}${file.separator}spotbugs-exclude.xml - - - - org.apache.maven.plugins - maven-pmd-plugin - - - se.bjurr.violations - violations-maven-plugin - - - 65 - - - - @@ -302,6 +272,7 @@ org.openrewrite rewrite-maven + ${openrewrite.version} test @@ -403,11 +374,6 @@ lambdaj 2.3.3 - - ch.qos.logback - logback-classic - 1.2.10 - @@ -453,7 +419,7 @@ 0.10 1.3 4.6.1 - 1.7.36 + 2.0.0 3.1.12.2 3.0.0-M6 7.22.0 diff --git a/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java index 9ac1de2725b..8e2f4c87349 100644 --- a/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java +++ b/src/main/java/org/openapijsonschematools/codegen/clicommands/GenerateBatch.java @@ -16,8 +16,7 @@ package org.openapijsonschematools.codegen.clicommands; -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.LoggerContext; +import org.slf4j.ILoggerFactory; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -142,10 +141,10 @@ public void execute() { List configurators = configs.stream().map(config -> CodegenConfigurator.fromFile(config, module)).collect(Collectors.toList()); // it doesn't make sense to interleave INFO level logs, so limit these to only ERROR. - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + ILoggerFactory lc = LoggerFactory.getILoggerFactory(); Stream.of(Logger.ROOT_LOGGER_NAME, "io.swagger", "org.openapijsonschematools") .map(lc::getLogger) - .forEach(logger -> logger.setLevel(Level.ERROR)); + .forEach(logger -> logger.atError()); ExecutorService executor = Executors.newFixedThreadPool(numThreads); From 8f443f0385d4f6213f6cf133b9d3829014169117 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 15:46:17 -0700 Subject: [PATCH 21/43] Removes logToStderr --- .../codegen/clicommands/Generate.java | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java index b26632da0f1..7806dcee5d4 100644 --- a/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java +++ b/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java @@ -19,14 +19,11 @@ import static org.apache.commons.lang3.StringUtils.isNotEmpty; -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.core.spi.FilterAttachable; import io.airlift.airline.Command; import io.airlift.airline.Option; import java.io.File; import java.util.ArrayList; import java.util.List; -import java.util.stream.Stream; import org.apache.commons.lang3.StringUtils; import org.openapijsonschematools.codegen.config.ClientOptInput; @@ -36,6 +33,7 @@ import org.openapijsonschematools.codegen.generators.generatorloader.GeneratorNotFoundException; import org.openapijsonschematools.codegen.config.CodegenConfigurator; import org.openapijsonschematools.codegen.config.CodegenConfiguratorUtils; +import org.slf4j.ILoggerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -258,12 +256,6 @@ public class Generate extends AbstractCommand { arity = 1) private Boolean strictSpecBehavior; - @Option(name = {"--log-to-stderr"}, - title = "Log to STDERR", - description = "write all log messages (not just errors) to STDOUT." - + " Useful for piping the JSON output of debug options (e.g. `--global-property debugOperations`) to an external parser directly while testing a generatorRunner.") - private Boolean logToStderr; - @Option(name = {"--enable-post-process-file"}, title = "enable post-processing of files (in generators supporting it)", description = CodegenConstants.ENABLE_POST_PROCESS_FILE_DESC) private Boolean enablePostProcessFile; @@ -277,16 +269,6 @@ public class Generate extends AbstractCommand { @Override public void execute() { - if (logToStderr != null) { - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); - Stream.of(Logger.ROOT_LOGGER_NAME, "io.swagger", "org.openapijsonschematools") - .map(lc::getLogger) - .peek(logger -> logger.detachAppender("STDOUT")) - .reduce((logger, next) -> logger.getName().equals(Logger.ROOT_LOGGER_NAME) ? logger : next) - .map(root -> root.getAppender("STDERR")) - .ifPresent(FilterAttachable::clearAllFilters); - } - // this initial check allows for field-level package private injection (for unit testing) if (configurator == null) { if (configFile != null && configFile.length() > 0) { From ea009fc75e158ea44538b577621827cf4d4a5b75 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 15:46:36 -0700 Subject: [PATCH 22/43] Removes unused imports --- .../openapijsonschematools/codegen/clicommands/Generate.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java index 7806dcee5d4..9f5f39a08f9 100644 --- a/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java +++ b/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java @@ -33,9 +33,6 @@ import org.openapijsonschematools.codegen.generators.generatorloader.GeneratorNotFoundException; import org.openapijsonschematools.codegen.config.CodegenConfigurator; import org.openapijsonschematools.codegen.config.CodegenConfiguratorUtils; -import org.slf4j.ILoggerFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @SuppressWarnings({"java:S106"}) @Command(name = "generate", description = "Generate code with the specified generatorRunner.") From 2d12692230b9cd09851ea665d988a975dc2d7460 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 17:02:27 -0700 Subject: [PATCH 23/43] Fixes arch tests --- docker-entrypoint.sh | 6 +- .../codegen/clicommands/ConfigHelp.java | 4 +- .../generatormetadata/FeatureSet.java | 23 ++-- .../main/resources/google_checkstyle.xml | 0 .../codegen/AbstractIntegrationTest.java | 73 ---------- .../codegen/ArchUnitRulesTest.java | 2 +- .../codegen/MockDefaultGeneratorRunner.java | 130 ------------------ ...esTest.java => FakeJavaGeneratorTest.java} | 7 +- .../generatormetadata/FeatureSetTest.java | 12 +- .../javaassertions/JavaFileAssert.java | 5 - 10 files changed, 30 insertions(+), 232 deletions(-) rename google_checkstyle.xml => src/main/resources/google_checkstyle.xml (100%) delete mode 100644 src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java delete mode 100644 src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java rename src/test/java/org/openapijsonschematools/codegen/generators/{AbstractJavaGeneratorExampleValuesTest.java => FakeJavaGeneratorTest.java} (94%) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 0770853e11a..99eeb75cc79 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -6,8 +6,8 @@ set -euo pipefail GEN_DIR=${GEN_DIR:-/opt/openapi-json-schema-generator} JAVA_OPTS=${JAVA_OPTS:-"-Xmx1024M -DloggerPath=conf/log4j.properties"} -cli="${GEN_DIR}/modules/openapi-json-schema-generator-cli" -codegen="${cli}/target/openapi-json-schema-generator-cli.jar" +cli="${GEN_DIR}" +codegen="${cli}/target/openapi-json-schema-generator-project.jar" # We code in a list of commands here as source processing is potentially buggy (requires undocumented conventional use of annotations). # A list of known commands helps us determine if we should compile CLI. There's an edge-case where a new command not added to this @@ -31,7 +31,7 @@ if [[ -f "${codegen}" && -n "$(java ${JAVA_OPTS} -jar "${codegen}" completion | elif [[ -n "$(echo $commands | tr ',' '\n' | grep "^$1\$" )" ]]; then # If CLI jar does not exist, and $1 is a known CLI command, build the CLI jar and run that command. if [[ ! -f "${codegen}" ]]; then - (cd "${GEN_DIR}" && exec mvn -am -pl "modules/openapi-json-schema-generator-cli" -Duser.home=$(dirname $MAVEN_CONFIG) package) + (cd "${GEN_DIR}" && exec mvn -am -pl . -Duser.home=$(dirname $MAVEN_CONFIG) package) fi command=$1 shift diff --git a/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java index 5e1fc82fe95..fbf62756149 100644 --- a/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java +++ b/src/main/java/org/openapijsonschematools/codegen/clicommands/ConfigHelp.java @@ -273,7 +273,7 @@ private void generateMdReservedWords(StringBuilder sb, Generator config) { private void generateMdFeatureSets(StringBuilder sb, Generator config) { sb.append(newline).append("## FEATURE SET").append(newline).append(newline); - List flattened = config.getGeneratorMetadata().getFeatureSet().flatten(); + List flattened = config.getGeneratorMetadata().getFeatureSet().flatten(LOGGER); flattened.sort(Comparator.comparing(FeatureSet.FeatureSetFlattened::getFeatureCategory)); AtomicReference lastCategory = new AtomicReference<>(); @@ -485,7 +485,7 @@ private void generatePlainTextHelp(StringBuilder sb, Generator config) { if (Boolean.TRUE.equals(featureSets)) { sb.append(newline).append("FEATURE SET").append(newline); - List flattened = config.getGeneratorMetadata().getFeatureSet().flatten(); + List flattened = config.getGeneratorMetadata().getFeatureSet().flatten(LOGGER); flattened.sort(Comparator.comparing(FeatureSet.FeatureSetFlattened::getFeatureCategory)); AtomicReference lastCategory = new AtomicReference<>(); diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSet.java b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSet.java index 16bc50d9719..00ec0b66305 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSet.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSet.java @@ -27,6 +27,7 @@ import org.openapijsonschematools.codegen.generators.generatormetadata.features.SecurityFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.WireFormatFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.AnnotationType; +import org.slf4j.Logger; import java.lang.annotation.Annotation; import java.util.*; @@ -236,7 +237,7 @@ public List getSource() { } } - public List flatten() { + public List flatten(Logger logger) { // TODO: Look at making this method function more generically. List states = new ArrayList<>(); EnumSet.allOf(ClientModificationFeature.class).forEach(feat -> { @@ -250,7 +251,7 @@ public List flatten() { state.source.add(AnnotationType.fromAnnotation(an.annotationType())); } } catch (NoSuchFieldException e) { - e.printStackTrace(); + logger.error(e.getMessage()); } states.add(state); }); @@ -265,7 +266,7 @@ public List flatten() { state.source.add(AnnotationType.fromAnnotation(an.annotationType())); } } catch (NoSuchFieldException e) { - e.printStackTrace(); + logger.error(e.getMessage()); } states.add(state); @@ -281,7 +282,7 @@ public List flatten() { state.source.add(AnnotationType.fromAnnotation(an.annotationType())); } } catch (NoSuchFieldException e) { - e.printStackTrace(); + logger.error(e.getMessage()); } states.add(state); @@ -297,7 +298,7 @@ public List flatten() { state.source.add(AnnotationType.fromAnnotation(an.annotationType())); } } catch (NoSuchFieldException e) { - e.printStackTrace(); + logger.error(e.getMessage()); } states.add(state); @@ -313,7 +314,7 @@ public List flatten() { state.source.add(AnnotationType.fromAnnotation(an.annotationType())); } } catch (NoSuchFieldException e) { - e.printStackTrace(); + logger.error(e.getMessage()); } states.add(state); @@ -329,7 +330,7 @@ public List flatten() { state.source.add(AnnotationType.fromAnnotation(an.annotationType())); } } catch (NoSuchFieldException e) { - e.printStackTrace(); + logger.error(e.getMessage()); } states.add(state); @@ -345,7 +346,7 @@ public List flatten() { state.source.add(AnnotationType.fromAnnotation(an.annotationType())); } } catch (NoSuchFieldException e) { - e.printStackTrace(); + logger.error(e.getMessage()); } states.add(state); @@ -361,7 +362,7 @@ public List flatten() { state.source.add(AnnotationType.fromAnnotation(an.annotationType())); } } catch (NoSuchFieldException e) { - e.printStackTrace(); + logger.error(e.getMessage()); } states.add(state); @@ -377,7 +378,7 @@ public List flatten() { state.source.add(AnnotationType.fromAnnotation(an.annotationType())); } } catch (NoSuchFieldException e) { - e.printStackTrace(); + logger.error(e.getMessage()); } states.add(state); @@ -393,7 +394,7 @@ public List flatten() { state.source.add(AnnotationType.fromAnnotation(an.annotationType())); } } catch (NoSuchFieldException e) { - e.printStackTrace(); + logger.error(e.getMessage()); } states.add(state); diff --git a/google_checkstyle.xml b/src/main/resources/google_checkstyle.xml similarity index 100% rename from google_checkstyle.xml rename to src/main/resources/google_checkstyle.xml diff --git a/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java b/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java deleted file mode 100644 index a8b260efb23..00000000000 --- a/src/test/java/org/openapijsonschematools/codegen/AbstractIntegrationTest.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) - * Copyright 2018 SmartBear Software - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.openapijsonschematools.codegen; - -import io.swagger.v3.oas.models.OpenAPI; -import org.openapijsonschematools.codegen.config.ClientOptInput; -import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; -import org.openapijsonschematools.codegen.generators.Generator; -import org.openapijsonschematools.codegen.testutils.AssertFile; -import org.openapijsonschematools.codegen.testutils.IntegrationTestPathsConfig; -import org.testng.annotations.Test; -import org.testng.reporters.Files; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -public abstract class AbstractIntegrationTest { - - protected abstract IntegrationTestPathsConfig getIntegrationTestPathsConfig(); - - protected abstract Generator getCodegenConfig(); - - protected abstract Map configProperties(); - - protected Boolean generateMetadata = true; - - protected Map globalPropertyOverrides = new HashMap<>(); - - // @wing328: ignore for the time being until we fix the error with the integration test - @Test(enabled = false) - public void generatesCorrectDirectoryStructure() throws IOException { - DefaultGeneratorRunner codeGen = new DefaultGeneratorRunner(); - codeGen.setGenerateMetadata(generateMetadata); - for (Map.Entry propertyOverride : globalPropertyOverrides.entrySet()) { - codeGen.setGeneratorPropertyDefault(propertyOverride.getKey(), propertyOverride.getValue()); - } - - IntegrationTestPathsConfig integrationTestPathsConfig = getIntegrationTestPathsConfig(); - - String specContent = Files.readFile(integrationTestPathsConfig.getSpecPath().toFile()); - OpenAPI openAPI = TestUtils.parseContent(specContent); - - - Generator generator = getCodegenConfig(); - generator.setOutputDir(integrationTestPathsConfig.getOutputPath().toString()); - generator.setIgnoreFilePathOverride(integrationTestPathsConfig.getIgnoreFilePath().toFile().toString()); - ClientOptInput opts = new ClientOptInput() - .config(generator) - .openAPI(openAPI); - - generator.additionalProperties().putAll(configProperties()); - - codeGen.opts(opts).generate(); - - AssertFile.assertPathEqualsRecursively(integrationTestPathsConfig.getExpectedPath(), integrationTestPathsConfig.getOutputPath()); - } -} diff --git a/src/test/java/org/openapijsonschematools/codegen/ArchUnitRulesTest.java b/src/test/java/org/openapijsonschematools/codegen/ArchUnitRulesTest.java index f02cfc4d18e..f49342b254a 100644 --- a/src/test/java/org/openapijsonschematools/codegen/ArchUnitRulesTest.java +++ b/src/test/java/org/openapijsonschematools/codegen/ArchUnitRulesTest.java @@ -12,7 +12,7 @@ public class ArchUnitRulesTest { private static final JavaClasses CLASSES = new ClassFileImporter() - .importPackages("org.openapijsonschematools.codegen.languages"); + .importPackages("org.openapijsonschematools.codegen.generators"); @Test public void testLoggersAreNotPublicFinalAndNotStatic() { diff --git a/src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java b/src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java deleted file mode 100644 index b61157e6c6f..00000000000 --- a/src/test/java/org/openapijsonschematools/codegen/MockDefaultGeneratorRunner.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.openapijsonschematools.codegen; -import org.openapijsonschematools.codegen.config.ClientOptInput; -import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; -import org.openapijsonschematools.codegen.generatorrunner.GeneratorRunner; -import org.openapijsonschematools.codegen.generators.DefaultGenerator; -import org.openapijsonschematools.codegen.templating.DryRunTemplateManager; -import org.openapijsonschematools.codegen.templating.TemplateManagerOptions; - -import java.io.File; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Decorates {@link DefaultGenerator and tracks some internal calls}. - * - * @deprecated Please avoid using this type, as it is not a mock and invokes real generation. Prefer {@link DefaultGeneratorRunner#DefaultGeneratorRunner(Boolean)} with dryRun=true and/or true mocked spies. - */ -@Deprecated -public class MockDefaultGeneratorRunner extends DefaultGeneratorRunner { - public List getTemplateBasedFiles() { - return templateBasedFiles; - } - - public Map getFiles() { - return files; - } - - // public static final String INPUT_STREAM_CONTENT = "INPUT STREAM CONTENT"; - private List templateBasedFiles = new ArrayList<>(); - private Map files = new HashMap<>(); - - public MockDefaultGeneratorRunner() { - super(true); - } - - public MockDefaultGeneratorRunner(boolean dryRun) { - super(dryRun); - } - - @Override - public GeneratorRunner opts(ClientOptInput opts) { - GeneratorRunner o = super.opts(opts); - TemplateManagerOptions templateManagerOptions = new TemplateManagerOptions(this.generator.isEnableMinimalUpdate(),this.generator.isSkipOverwrite()); - this.templateProcessor = new ObservableDryRunTemplateManager(templateManagerOptions); - return o; - } - - public static class WrittenTemplateBasedFile { - private Map templateData; - private String templateName; - private String outputFilename; - - public WrittenTemplateBasedFile(Map templateData, String templateName, String outputFilename) { - this.templateData = templateData; - this.templateName = templateName; - this.outputFilename = outputFilename; - } - - public Map getTemplateData() { - return templateData; - } - - public String getTemplateName() { - return templateName; - } - - public String getOutputFilename() { - return outputFilename; - } - - @Override - public String toString() { - return "WrittenTemplateBasedFile [" + - "outputFilename=" + outputFilename + ", " + - "templateName=" + templateName + ", " + - "templateData=" + templateData + "]"; - } - } - - class ObservableDryRunTemplateManager extends DryRunTemplateManager { - public ObservableDryRunTemplateManager(TemplateManagerOptions options) { - super(options); - } - - private String normalizePath(String filename) { - return filename.replace("\\", "/").replace("//", "/"); - } - - @Override - public File write(Map data, String template, File target) throws IOException { - String filename = normalizePath(target.toPath().normalize().toString()); - templateBasedFiles.add(new WrittenTemplateBasedFile(data, template, filename)); - - File file = super.write(data, template, target); - if (file != null && file.exists()) { - byte[] contents = Files.readAllBytes(file.toPath()); - files.put(normalizePath(filename), new String(contents, StandardCharsets.UTF_8)); - } - - return file; - } - - @Override - public File writeToFile(String filename, byte[] contents) throws IOException { - files.put(normalizePath(filename), new String(contents, StandardCharsets.UTF_8)); - return super.writeToFile(filename, contents); - } - } -} diff --git a/src/test/java/org/openapijsonschematools/codegen/generators/AbstractJavaGeneratorExampleValuesTest.java b/src/test/java/org/openapijsonschematools/codegen/generators/FakeJavaGeneratorTest.java similarity index 94% rename from src/test/java/org/openapijsonschematools/codegen/generators/AbstractJavaGeneratorExampleValuesTest.java rename to src/test/java/org/openapijsonschematools/codegen/generators/FakeJavaGeneratorTest.java index cb36644171d..996d22e88ea 100644 --- a/src/test/java/org/openapijsonschematools/codegen/generators/AbstractJavaGeneratorExampleValuesTest.java +++ b/src/test/java/org/openapijsonschematools/codegen/generators/FakeJavaGeneratorTest.java @@ -20,7 +20,6 @@ import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; -import org.openapijsonschematools.codegen.generators.AbstractJavaGenerator; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenParameter; import org.openapijsonschematools.codegen.generators.generatormetadata.GeneratorType; import org.testng.Assert; @@ -28,9 +27,9 @@ import java.util.Arrays; -public class AbstractJavaGeneratorExampleValuesTest { +public class FakeJavaGeneratorTest { - private final AbstractJavaGenerator fakeJavaCodegen = new P_AbstractJavaGenerator(); + private final AbstractJavaGenerator fakeJavaCodegen = new FakeJavaGenerator(); @Test void inlineEnum() { @@ -129,7 +128,7 @@ void uuidGivenExample() { Assert.assertEquals(p.example, "UUID.fromString(\"13b48713-b931-45ea-bd60-b07491245960\")"); } - private static class P_AbstractJavaGenerator extends AbstractJavaGenerator { + private static class FakeJavaGenerator extends AbstractJavaGenerator { @Override public GeneratorType getTag() { return null; diff --git a/src/test/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSetTest.java b/src/test/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSetTest.java index bbbd0966182..6e8999f85fc 100644 --- a/src/test/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSetTest.java +++ b/src/test/java/org/openapijsonschematools/codegen/generators/generatormetadata/FeatureSetTest.java @@ -1,5 +1,6 @@ package org.openapijsonschematools.codegen.generators.generatormetadata; +import org.openapijsonschematools.codegen.clicommands.ConfigHelp; import org.openapijsonschematools.codegen.generators.generatormetadata.FeatureSet; import org.openapijsonschematools.codegen.generators.generatormetadata.features.ClientModificationFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.DataTypeFeature; @@ -9,6 +10,8 @@ import org.openapijsonschematools.codegen.generators.generatormetadata.features.SchemaFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.SecurityFeature; import org.openapijsonschematools.codegen.generators.generatormetadata.features.annotations.AnnotationType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.testng.annotations.Test; import java.util.ArrayList; @@ -22,7 +25,8 @@ public class FeatureSetTest { @Test public void flattOnUnspecified() { - List flattened = FeatureSet.UNSPECIFIED.flatten(); + final Logger logger = LoggerFactory.getLogger(FeatureSetTest.class); + List flattened = FeatureSet.UNSPECIFIED.flatten(logger); // There are 73 features at the time of writing this test. This makes sure we get a "Full" flat representation. int knownFeatureCount = 73; int checkedCount = 0; @@ -38,6 +42,7 @@ public void flattOnUnspecified() { @Test public void flattenOnMultipleFeatures() { + final Logger logger = LoggerFactory.getLogger(FeatureSetTest.class); FeatureSet featureSet = FeatureSet.newBuilder() .includeClientModificationFeatures(ClientModificationFeature.BasePath) .includeDataTypeFeatures(DataTypeFeature.Int32, DataTypeFeature.Array) @@ -48,7 +53,7 @@ public void flattenOnMultipleFeatures() { .includeSchemaFeatures(SchemaFeature.OneOf) .build(); - List flattened = featureSet.flatten(); + List flattened = featureSet.flatten(logger); List supported = new ArrayList<>(); flattened.forEach(f -> { if (f.isSupported) { @@ -124,8 +129,9 @@ public void flattenOnMultipleFeatures() { @Test public void flattenOnSingleFeatures() { + final Logger logger = LoggerFactory.getLogger(FeatureSetTest.class); FeatureSet featureSet = FeatureSet.newBuilder().includeClientModificationFeatures(ClientModificationFeature.BasePath).build(); - List flattened = featureSet.flatten(); + List flattened = featureSet.flatten(logger); List supported = new ArrayList<>(); flattened.forEach(f -> { if (f.isSupported) { diff --git a/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/JavaFileAssert.java b/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/JavaFileAssert.java index d16a203bb43..d3ea525fcc0 100644 --- a/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/JavaFileAssert.java +++ b/src/test/java/org/openapijsonschematools/codegen/generators/javaassertions/JavaFileAssert.java @@ -88,11 +88,6 @@ public JavaFileAssert hasImports(final String... imports) { return this; } - public JavaFileAssert printFileContent() { - System.out.println(actual); - return this; - } - public JavaFileAssert fileContains(final String... lines) { final String actualBody = actual.getTokenRange() .orElseThrow(() -> new IllegalStateException("Empty file")) From 41d5b6bbae76137a6f159a44e29471aa36af10db Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 17:25:20 -0700 Subject: [PATCH 24/43] Removes sonatype from pom --- ...le_checkstyle.xml => google_checkstyle.xml | 0 pom.xml | 17 ++------------- .../codegen/TestUtils.java | 21 ------------------- 3 files changed, 2 insertions(+), 36 deletions(-) rename src/main/resources/google_checkstyle.xml => google_checkstyle.xml (100%) diff --git a/src/main/resources/google_checkstyle.xml b/google_checkstyle.xml similarity index 100% rename from src/main/resources/google_checkstyle.xml rename to google_checkstyle.xml diff --git a/pom.xml b/pom.xml index cda04d87a28..67ef7ef7199 100644 --- a/pom.xml +++ b/pom.xml @@ -1,14 +1,9 @@ - - org.sonatype.oss - oss-parent - 5 - - 4.0.0 openapi-json-schema-generator-project jar + org.openapijsonschemagenerator.codegen openapi-json-schema-generator-project ${revision} @@ -375,19 +370,11 @@ 2.3.3 - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - true - - - 3.0.0 + UTF-8 1.8 1.8 0.23.1 diff --git a/src/test/java/org/openapijsonschematools/codegen/TestUtils.java b/src/test/java/org/openapijsonschematools/codegen/TestUtils.java index 8f8fb47186b..724e22a2614 100644 --- a/src/test/java/org/openapijsonschematools/codegen/TestUtils.java +++ b/src/test/java/org/openapijsonschematools/codegen/TestUtils.java @@ -19,11 +19,9 @@ import io.swagger.v3.parser.core.models.ParseOptions; import org.apache.commons.io.IOUtils; -import org.openapijsonschematools.codegen.generatorrunner.DefaultGeneratorRunner; import org.openapijsonschematools.codegen.generators.javaassertions.JavaFileAssert; import org.openapijsonschematools.codegen.common.ModelUtils; import org.openrewrite.maven.internal.RawPom; -import org.testng.Assert; import java.io.ByteArrayInputStream; import java.io.File; @@ -35,7 +33,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Optional; import com.google.common.collect.ImmutableMap; @@ -102,24 +99,6 @@ public static OpenAPI createOpenAPIWithOneSchema(String name, Schema schema) { return openAPI; } - /** - * Extract file from {@link MockDefaultGeneratorRunner} - * - * @param generator GeneratorRunner - * @param root root path - * @param filename filename under root - * - * @return a {@link MockDefaultGeneratorRunner.WrittenTemplateBasedFile} - * @deprecated Since 5.0. Please avoid this method and usage of {@link MockDefaultGeneratorRunner}, prefer {@link DefaultGeneratorRunner#DefaultGeneratorRunner(Boolean)} with dryRun=true. - */ - @Deprecated - public static MockDefaultGeneratorRunner.WrittenTemplateBasedFile getTemplateBasedFile(MockDefaultGeneratorRunner generator, File root, String filename) { - String defaultApiFilename = new File(root, filename).getAbsolutePath().replace("\\", "/"); - Optional optional = generator.getTemplateBasedFiles().stream().filter(f -> defaultApiFilename.equals(f.getOutputFilename())).findFirst(); - Assert.assertTrue(optional.isPresent()); - return optional.get(); - } - public static void ensureContainsFile(List generatedFiles, File root, String filename) { Path path = root.toPath().resolve(filename); assertTrue(generatedFiles.contains(path.toFile()), "File '" + path.toAbsolutePath() + "' was not found in the list of generated files"); From 183c2f725d961aee3814021323b99b2bec1e2771 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 17:42:34 -0700 Subject: [PATCH 25/43] Removes logback xml exclusion --- pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pom.xml b/pom.xml index 67ef7ef7199..17cc673ce62 100644 --- a/pom.xml +++ b/pom.xml @@ -14,9 +14,6 @@ src/main/resources - - logback.xml - From d2181fabc6016e222ade0de2e8f8b8fb8a8c6ed4 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 18:32:39 -0700 Subject: [PATCH 26/43] Fixes groupId and package info --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 17cc673ce62..14bc57abb85 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 openapi-json-schema-generator-project jar - org.openapijsonschemagenerator.codegen + org.openapijsonschematools openapi-json-schema-generator-project ${revision} @@ -34,7 +34,7 @@ target - ${project.artifactId}-${project.version} + ${project.artifactId} pl.project13.maven @@ -92,7 +92,7 @@ - org.openapi-tools.codegen.OpenAPIGenerator + org.openapijsonschematools.codegen.OpenAPIGenerator @@ -127,7 +127,7 @@ development ${project.url} ${project.version} - org.openapi-tools + org.openapijsonschematools From f4e1033f2d9b66fe48db41c31bebff5e9b78aacf Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 19:29:40 -0700 Subject: [PATCH 27/43] Fixes mainClass definition --- pom.xml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 14bc57abb85..a75772ed1a1 100644 --- a/pom.xml +++ b/pom.xml @@ -123,21 +123,11 @@ ${maven-jar-plugin.version} - - development - ${project.url} - ${project.version} - org.openapijsonschematools - + + org.openapijsonschematools.codegen.OpenAPIGenerator + - - - - test-jar - - - org.apache.maven.plugins From 2874a540a4726b6676f04ec445f8bd59cd69adc0 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 19:42:55 -0700 Subject: [PATCH 28/43] Adds shade plugin, fixes jar running --- pom.xml | 50 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index a75772ed1a1..97d0e1a19ee 100644 --- a/pom.xml +++ b/pom.xml @@ -80,21 +80,6 @@ - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - - java - - - - - org.openapijsonschematools.codegen.OpenAPIGenerator - - maven-dependency-plugin @@ -129,6 +114,41 @@ + + org.apache.maven.plugins + maven-shade-plugin + 3.2.0 + + + process-resources + package + + shade + + + false + true + + ${java.io.tmpdir}/dependency-reduced-pom.xml + + + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + org.apache.maven.plugins maven-site-plugin From c5b3b08be2c2011ecffcb8282dbea60bd065386d Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 20:06:03 -0700 Subject: [PATCH 29/43] Fixes version info in docker --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 97d0e1a19ee..b85c554bde2 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ src/main/resources + true From 6d7c77a599610552c85c940c190b30c5152d48b3 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 20:12:33 -0700 Subject: [PATCH 30/43] Removes volume --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index aac0a6c6d7f..e47bac5c7da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,6 @@ FROM maven:3.6.3-jdk-11-openj9 ENV GEN_DIR /opt/openapi-json-schema-generator WORKDIR ${GEN_DIR} -VOLUME ${MAVEN_HOME}/.m2/repository # Required from a licensing standpoint COPY ./LICENSE ${GEN_DIR} From f14b2b1de7285e6fcac904bad5923999d1c02851 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 23:12:20 -0700 Subject: [PATCH 31/43] Adds multi stage docker image --- Dockerfile | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index e47bac5c7da..2750bdaa3d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,25 +1,23 @@ -FROM maven:3.6.3-jdk-11-openj9 +# syntax=docker/dockerfile:1 +FROM maven:3.6.3-jdk-11-openj9 AS builder ENV GEN_DIR /opt/openapi-json-schema-generator WORKDIR ${GEN_DIR} - # Required from a licensing standpoint COPY ./LICENSE ${GEN_DIR} - # Required to compile openapi-generator COPY ./google_checkstyle.xml ${GEN_DIR} - # Modules are copied individually here to allow for caching of docker layers between major.minor versions COPY ./src ${GEN_DIR}/src COPY ./pom.xml ${GEN_DIR} - # Pre-compile openapi-generator-cli RUN mvn -am -pl . package +# # Remove src dir +RUN rm -rf src -# This exists at the end of the file to benefit from cached layers when modifying docker-entrypoint.sh. +# multi stage build, jar in smaller image +FROM openjdk:11.0-jre-buster +ENV GEN_DIR /opt/openapi-json-schema-generator +COPY --from=builder ${GEN_DIR}/target/openapi-json-schema-generator-project.jar ${GEN_DIR}/target/openapi-json-schema-generator-project.jar COPY docker-entrypoint.sh /usr/local/bin/ -RUN ln -s /usr/local/bin/docker-entrypoint.sh /usr/local/bin/openapi-json-schema-generator - -ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] - -CMD ["help"] +ENTRYPOINT ["docker-entrypoint.sh"] From c102fbcd9dffc905e0d9a673a30a35b0e6b3a8f1 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Thu, 20 Jul 2023 23:44:41 -0700 Subject: [PATCH 32/43] Reduces image size further --- Dockerfile | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2750bdaa3d2..712e2270f71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,3 +21,4 @@ ENV GEN_DIR /opt/openapi-json-schema-generator COPY --from=builder ${GEN_DIR}/target/openapi-json-schema-generator-project.jar ${GEN_DIR}/target/openapi-json-schema-generator-project.jar COPY docker-entrypoint.sh /usr/local/bin/ ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["help"] diff --git a/pom.xml b/pom.xml index b85c554bde2..cd8fb506baa 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ shade - false + true true ${java.io.tmpdir}/dependency-reduced-pom.xml From ac85e520f49db3db83558e3e73be0908f22ac3b7 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Fri, 21 Jul 2023 10:25:06 -0700 Subject: [PATCH 33/43] Gets checkstyle working --- pom.xml | 2 +- .../main/resources/google_checkstyle.xml | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename google_checkstyle.xml => src/main/resources/google_checkstyle.xml (100%) diff --git a/pom.xml b/pom.xml index cd8fb506baa..e5e211647d9 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ maven-checkstyle-plugin ${checkstyle.plugin.version} - google_checkstyle.xml + ${project.basedir}/src/main/resources/google_checkstyle.xml diff --git a/google_checkstyle.xml b/src/main/resources/google_checkstyle.xml similarity index 100% rename from google_checkstyle.xml rename to src/main/resources/google_checkstyle.xml From e7383567d8ab7e67a85d9793da96bdb2a9321394 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Fri, 21 Jul 2023 10:34:01 -0700 Subject: [PATCH 34/43] Removes scripts modules and website --- docs/usage.md | 20 - scripts/openapi-generator-cli-completion.bash | 48 - website/.gitignore | 16 - website/blog/2018-12-24-new-website.md | 13 - website/docusaurus.config.js | 186 - website/i18n/en.json | 609 -- website/package.json | 39 - website/sidebars.js | 50 - website/src/css/custom.css | 141 - website/src/dynamic/sponsors.yml | 55 - website/src/dynamic/team.yml | 20 - website/src/dynamic/users.yml | 596 - website/src/pages/index.js | 407 - website/src/pages/styles.module.css | 132 - website/src/pages/team.js | 98 - website/src/pages/users.html.js | 7 - website/src/pages/users.js | 54 - website/static/CNAME | 1 - website/static/css/code-block-buttons.css | 41 - website/static/img/color-logo.svg | 14 - website/static/img/companies/CSUNS.png | Bin 76862 -> 0 bytes .../img/companies/aalborg_university.png | Bin 17144 -> 0 bytes website/static/img/companies/adaptant.png | Bin 21795 -> 0 bytes website/static/img/companies/adesso.png | Bin 25781 -> 0 bytes website/static/img/companies/adyen.png | Bin 939 -> 0 bytes website/static/img/companies/agoda.png | Bin 5588 -> 0 bytes website/static/img/companies/allianz.png | Bin 9670 -> 0 bytes .../static/img/companies/angular-schule.svg | 89 - website/static/img/companies/anz.png | Bin 14784 -> 0 bytes website/static/img/companies/apideck.jpg | Bin 8192 -> 0 bytes website/static/img/companies/arduino.png | Bin 4401 -> 0 bytes website/static/img/companies/b-com.png | Bin 7511 -> 0 bytes website/static/img/companies/banzai_cloud.png | Bin 9737 -> 0 bytes website/static/img/companies/bimdataio.png | Bin 4073 -> 0 bytes website/static/img/companies/bithost.svg | 38 - website/static/img/companies/bosch.png | Bin 9790 -> 0 bytes website/static/img/companies/boxever.svg | 1 - .../static/img/companies/bunker-holding.png | Bin 4142 -> 0 bytes website/static/img/companies/cam.png | Bin 55547 -> 0 bytes website/static/img/companies/camptocamp.png | Bin 5539 -> 0 bytes website/static/img/companies/cisco.png | Bin 35608 -> 0 bytes website/static/img/companies/codecentric.png | Bin 3992 -> 0 bytes website/static/img/companies/coinapi.png | Bin 1576 -> 0 bytes website/static/img/companies/commencis.png | Bin 28232 -> 0 bytes .../static/img/companies/crossover_health.png | Bin 5752 -> 0 bytes website/static/img/companies/cupix.png | Bin 27910 -> 0 bytes website/static/img/companies/datadog.png | Bin 42497 -> 0 bytes website/static/img/companies/db-systel.png | Bin 16664 -> 0 bytes .../static/img/companies/deeproute_logo.jpg | Bin 43758 -> 0 bytes website/static/img/companies/docspring.png | Bin 1841 -> 0 bytes website/static/img/companies/dwango.png | Bin 6508 -> 0 bytes website/static/img/companies/ebaidu.jpeg | Bin 7985 -> 0 bytes website/static/img/companies/edge_impulse.png | Bin 3282 -> 0 bytes website/static/img/companies/elasticemail.png | Bin 4163 -> 0 bytes website/static/img/companies/element_ai.png | Bin 2031 -> 0 bytes website/static/img/companies/emineo.png | Bin 5001 -> 0 bytes website/static/img/companies/fastly.png | Bin 24298 -> 0 bytes website/static/img/companies/fenergo.png | Bin 17149 -> 0 bytes .../img/companies/finc-technologies.png | Bin 24312 -> 0 bytes website/static/img/companies/formapi.png | Bin 831 -> 0 bytes website/static/img/companies/formapi.webp | Bin 464 -> 0 bytes website/static/img/companies/freee.png | Bin 12679 -> 0 bytes website/static/img/companies/freshcells.png | Bin 11686 -> 0 bytes website/static/img/companies/fuseno.png | Bin 9412 -> 0 bytes website/static/img/companies/gantner.png | Bin 6815 -> 0 bytes website/static/img/companies/gantner.webp | Bin 3722 -> 0 bytes website/static/img/companies/getyourguide.png | Bin 5555 -> 0 bytes website/static/img/companies/glovo.svg | 1 - website/static/img/companies/gm.png | Bin 38602 -> 0 bytes website/static/img/companies/godaddy.png | Bin 16674 -> 0 bytes .../img/companies/gradle-enterprise.png | Bin 24342 -> 0 bytes website/static/img/companies/gumtree.png | Bin 2244 -> 0 bytes website/static/img/companies/here.png | Bin 21000 -> 0 bytes website/static/img/companies/ibm.svg | 1 - website/static/img/companies/infotec.png | Bin 5185 -> 0 bytes website/static/img/companies/juststar.png | Bin 3061 -> 0 bytes website/static/img/companies/k6.png | Bin 12353 -> 0 bytes website/static/img/companies/klarna.svg | 11 - website/static/img/companies/kronsoft.png | Bin 5367 -> 0 bytes website/static/img/companies/kubernetes.png | Bin 42001 -> 0 bytes website/static/img/companies/kurusugawa.png | Bin 19252 -> 0 bytes website/static/img/companies/lightbow.png | Bin 14714 -> 0 bytes website/static/img/companies/linode.png | Bin 37797 -> 0 bytes .../static/img/companies/logo-askul-01.gif | Bin 4053 -> 0 bytes website/static/img/companies/lumeris.png | Bin 3771 -> 0 bytes .../img/companies/lvm_versicherungen.png | Bin 26028 -> 0 bytes website/static/img/companies/m3.png | Bin 28221 -> 0 bytes website/static/img/companies/mailslurp.png | Bin 18651 -> 0 bytes website/static/img/companies/mastercard.png | Bin 2821 -> 0 bytes website/static/img/companies/mediavision.jpeg | Bin 73196 -> 0 bytes website/static/img/companies/mergedev.jpeg | Bin 3145 -> 0 bytes website/static/img/companies/metaswitch.svg | 22 - website/static/img/companies/moonvision.png | Bin 10935 -> 0 bytes website/static/img/companies/myworkout.png | Bin 4643 -> 0 bytes website/static/img/companies/namsor.png | Bin 19532 -> 0 bytes website/static/img/companies/nokia.png | Bin 1031 -> 0 bytes website/static/img/companies/numary.png | Bin 3680 -> 0 bytes website/static/img/companies/occ.jpg | Bin 3570 -> 0 bytes website/static/img/companies/onesignal.png | Bin 63900 -> 0 bytes website/static/img/companies/openet.jpg | Bin 18312 -> 0 bytes website/static/img/companies/optim.png | Bin 20509 -> 0 bytes website/static/img/companies/oracle.png | Bin 2720 -> 0 bytes website/static/img/companies/outscale.png | Bin 67937 -> 0 bytes website/static/img/companies/paxos.png | Bin 3494 -> 0 bytes website/static/img/companies/pepabo.png | Bin 4795 -> 0 bytes website/static/img/companies/pexa.png | Bin 3565 -> 0 bytes website/static/img/companies/plaid.png | Bin 29975 -> 0 bytes website/static/img/companies/plaidcojp.jpg | Bin 26742 -> 0 bytes website/static/img/companies/ponicode.png | Bin 5552 -> 0 bytes website/static/img/companies/ponicode.webp | Bin 4244 -> 0 bytes website/static/img/companies/pricefx.png | Bin 7355 -> 0 bytes website/static/img/companies/prometheus.png | Bin 36775 -> 0 bytes website/static/img/companies/puppet.svg | 9 - website/static/img/companies/qovery.png | Bin 3072 -> 0 bytes website/static/img/companies/qulix.png | Bin 86406 -> 0 bytes website/static/img/companies/raiffeisen.png | Bin 3945 -> 0 bytes .../static/img/companies/raksul-corporate.svg | 23 - website/static/img/companies/redhat.png | Bin 4722 -> 0 bytes website/static/img/companies/reprezen.png | Bin 3065 -> 0 bytes website/static/img/companies/rest-united.png | Bin 5875 -> 0 bytes website/static/img/companies/shotstack.svg | 1 - website/static/img/companies/sie.jpeg | Bin 42722 -> 0 bytes website/static/img/companies/smarthr.png | Bin 25299 -> 0 bytes website/static/img/companies/splitit.png | Bin 18953 -> 0 bytes website/static/img/companies/stingray.png | Bin 12636 -> 0 bytes website/static/img/companies/suva.svg | 8 - website/static/img/companies/telstra.svg | 6 - website/static/img/companies/tencent.png | Bin 26874 -> 0 bytes website/static/img/companies/thales.jpg | Bin 7764 -> 0 bytes website/static/img/companies/tiledb.png | Bin 11823 -> 0 bytes website/static/img/companies/traveltime.jpg | Bin 24875 -> 0 bytes website/static/img/companies/tribalscale.png | Bin 11829 -> 0 bytes website/static/img/companies/twitter.png | Bin 4298 -> 0 bytes website/static/img/companies/unblu.svg | 10 - website/static/img/companies/uoa.png | Bin 5006 -> 0 bytes website/static/img/companies/veamly.png | Bin 4818 -> 0 bytes website/static/img/companies/viadee.jpg | Bin 11500 -> 0 bytes .../img/companies/virtualansoftware.png | Bin 8090 -> 0 bytes website/static/img/companies/vmware.png | Bin 3140 -> 0 bytes website/static/img/companies/vonage.png | Bin 4338 -> 0 bytes website/static/img/companies/voucheryio.png | Bin 3294 -> 0 bytes .../static/img/companies/wbt_solutions.png | Bin 60269 -> 0 bytes website/static/img/companies/woleet.png | Bin 71236 -> 0 bytes website/static/img/companies/wso2.png | Bin 35921 -> 0 bytes website/static/img/companies/xero.png | Bin 11253 -> 0 bytes website/static/img/companies/yahoo_japan.png | Bin 22761 -> 0 bytes website/static/img/companies/yelp.png | Bin 37931 -> 0 bytes website/static/img/companies/yitu.jpeg | Bin 4840 -> 0 bytes website/static/img/companies/zalando.jpg | Bin 6356 -> 0 bytes .../img/companies/zozo-technologies.png | Bin 29866 -> 0 bytes website/static/img/docusaurus.svg | 1 - website/static/img/fa-logo.svg | 1 - website/static/img/favicon.png | Bin 2940 -> 0 bytes website/static/img/favicon/favicon.ico | Bin 9662 -> 0 bytes website/static/img/icons/exchange.svg | 2 - website/static/img/icons/github.svg | 1 - website/static/img/icons/gitter.svg | 1 - website/static/img/icons/newspaper-o.svg | 2 - website/static/img/icons/pencil.svg | 2 - website/static/img/icons/plug.svg | 2 - website/static/img/icons/twitter.svg | 1 - website/static/img/mono-logo.svg | 1 - website/static/img/oss_logo.png | Bin 4370 -> 0 bytes .../img/tools/Slack_Mark-256x256-3a29a6b.png | Bin 5888 -> 0 bytes website/static/img/tools/docker.png | Bin 4205 -> 0 bytes website/static/img/tools/homebrew-256x256.png | Bin 19350 -> 0 bytes website/static/img/tools/npm.svg | 1 - website/static/js/code-block-buttons.js | 48 - website/yarn.lock | 9630 ----------------- 169 files changed, 12460 deletions(-) delete mode 100644 scripts/openapi-generator-cli-completion.bash delete mode 100644 website/.gitignore delete mode 100644 website/blog/2018-12-24-new-website.md delete mode 100755 website/docusaurus.config.js delete mode 100644 website/i18n/en.json delete mode 100644 website/package.json delete mode 100755 website/sidebars.js delete mode 100755 website/src/css/custom.css delete mode 100644 website/src/dynamic/sponsors.yml delete mode 100644 website/src/dynamic/team.yml delete mode 100644 website/src/dynamic/users.yml delete mode 100755 website/src/pages/index.js delete mode 100644 website/src/pages/styles.module.css delete mode 100644 website/src/pages/team.js delete mode 100644 website/src/pages/users.html.js delete mode 100755 website/src/pages/users.js delete mode 100644 website/static/CNAME delete mode 100644 website/static/css/code-block-buttons.css delete mode 100644 website/static/img/color-logo.svg delete mode 100644 website/static/img/companies/CSUNS.png delete mode 100644 website/static/img/companies/aalborg_university.png delete mode 100644 website/static/img/companies/adaptant.png delete mode 100644 website/static/img/companies/adesso.png delete mode 100644 website/static/img/companies/adyen.png delete mode 100644 website/static/img/companies/agoda.png delete mode 100644 website/static/img/companies/allianz.png delete mode 100644 website/static/img/companies/angular-schule.svg delete mode 100644 website/static/img/companies/anz.png delete mode 100644 website/static/img/companies/apideck.jpg delete mode 100644 website/static/img/companies/arduino.png delete mode 100644 website/static/img/companies/b-com.png delete mode 100644 website/static/img/companies/banzai_cloud.png delete mode 100644 website/static/img/companies/bimdataio.png delete mode 100644 website/static/img/companies/bithost.svg delete mode 100644 website/static/img/companies/bosch.png delete mode 100644 website/static/img/companies/boxever.svg delete mode 100644 website/static/img/companies/bunker-holding.png delete mode 100644 website/static/img/companies/cam.png delete mode 100644 website/static/img/companies/camptocamp.png delete mode 100644 website/static/img/companies/cisco.png delete mode 100644 website/static/img/companies/codecentric.png delete mode 100644 website/static/img/companies/coinapi.png delete mode 100644 website/static/img/companies/commencis.png delete mode 100644 website/static/img/companies/crossover_health.png delete mode 100644 website/static/img/companies/cupix.png delete mode 100644 website/static/img/companies/datadog.png delete mode 100644 website/static/img/companies/db-systel.png delete mode 100644 website/static/img/companies/deeproute_logo.jpg delete mode 100644 website/static/img/companies/docspring.png delete mode 100755 website/static/img/companies/dwango.png delete mode 100644 website/static/img/companies/ebaidu.jpeg delete mode 100644 website/static/img/companies/edge_impulse.png delete mode 100644 website/static/img/companies/elasticemail.png delete mode 100644 website/static/img/companies/element_ai.png delete mode 100644 website/static/img/companies/emineo.png delete mode 100644 website/static/img/companies/fastly.png delete mode 100644 website/static/img/companies/fenergo.png delete mode 100644 website/static/img/companies/finc-technologies.png delete mode 100644 website/static/img/companies/formapi.png delete mode 100644 website/static/img/companies/formapi.webp delete mode 100644 website/static/img/companies/freee.png delete mode 100644 website/static/img/companies/freshcells.png delete mode 100644 website/static/img/companies/fuseno.png delete mode 100644 website/static/img/companies/gantner.png delete mode 100644 website/static/img/companies/gantner.webp delete mode 100644 website/static/img/companies/getyourguide.png delete mode 100644 website/static/img/companies/glovo.svg delete mode 100644 website/static/img/companies/gm.png delete mode 100644 website/static/img/companies/godaddy.png delete mode 100644 website/static/img/companies/gradle-enterprise.png delete mode 100644 website/static/img/companies/gumtree.png delete mode 100644 website/static/img/companies/here.png delete mode 100644 website/static/img/companies/ibm.svg delete mode 100644 website/static/img/companies/infotec.png delete mode 100644 website/static/img/companies/juststar.png delete mode 100644 website/static/img/companies/k6.png delete mode 100644 website/static/img/companies/klarna.svg delete mode 100644 website/static/img/companies/kronsoft.png delete mode 100644 website/static/img/companies/kubernetes.png delete mode 100644 website/static/img/companies/kurusugawa.png delete mode 100644 website/static/img/companies/lightbow.png delete mode 100644 website/static/img/companies/linode.png delete mode 100644 website/static/img/companies/logo-askul-01.gif delete mode 100644 website/static/img/companies/lumeris.png delete mode 100644 website/static/img/companies/lvm_versicherungen.png delete mode 100644 website/static/img/companies/m3.png delete mode 100644 website/static/img/companies/mailslurp.png delete mode 100644 website/static/img/companies/mastercard.png delete mode 100644 website/static/img/companies/mediavision.jpeg delete mode 100644 website/static/img/companies/mergedev.jpeg delete mode 100644 website/static/img/companies/metaswitch.svg delete mode 100644 website/static/img/companies/moonvision.png delete mode 100644 website/static/img/companies/myworkout.png delete mode 100644 website/static/img/companies/namsor.png delete mode 100644 website/static/img/companies/nokia.png delete mode 100644 website/static/img/companies/numary.png delete mode 100644 website/static/img/companies/occ.jpg delete mode 100644 website/static/img/companies/onesignal.png delete mode 100644 website/static/img/companies/openet.jpg delete mode 100644 website/static/img/companies/optim.png delete mode 100644 website/static/img/companies/oracle.png delete mode 100644 website/static/img/companies/outscale.png delete mode 100644 website/static/img/companies/paxos.png delete mode 100644 website/static/img/companies/pepabo.png delete mode 100644 website/static/img/companies/pexa.png delete mode 100644 website/static/img/companies/plaid.png delete mode 100644 website/static/img/companies/plaidcojp.jpg delete mode 100644 website/static/img/companies/ponicode.png delete mode 100644 website/static/img/companies/ponicode.webp delete mode 100644 website/static/img/companies/pricefx.png delete mode 100644 website/static/img/companies/prometheus.png delete mode 100644 website/static/img/companies/puppet.svg delete mode 100644 website/static/img/companies/qovery.png delete mode 100644 website/static/img/companies/qulix.png delete mode 100644 website/static/img/companies/raiffeisen.png delete mode 100644 website/static/img/companies/raksul-corporate.svg delete mode 100644 website/static/img/companies/redhat.png delete mode 100644 website/static/img/companies/reprezen.png delete mode 100644 website/static/img/companies/rest-united.png delete mode 100755 website/static/img/companies/shotstack.svg delete mode 100644 website/static/img/companies/sie.jpeg delete mode 100644 website/static/img/companies/smarthr.png delete mode 100644 website/static/img/companies/splitit.png delete mode 100644 website/static/img/companies/stingray.png delete mode 100644 website/static/img/companies/suva.svg delete mode 100644 website/static/img/companies/telstra.svg delete mode 100644 website/static/img/companies/tencent.png delete mode 100644 website/static/img/companies/thales.jpg delete mode 100644 website/static/img/companies/tiledb.png delete mode 100644 website/static/img/companies/traveltime.jpg delete mode 100644 website/static/img/companies/tribalscale.png delete mode 100755 website/static/img/companies/twitter.png delete mode 100644 website/static/img/companies/unblu.svg delete mode 100644 website/static/img/companies/uoa.png delete mode 100644 website/static/img/companies/veamly.png delete mode 100644 website/static/img/companies/viadee.jpg delete mode 100644 website/static/img/companies/virtualansoftware.png delete mode 100644 website/static/img/companies/vmware.png delete mode 100644 website/static/img/companies/vonage.png delete mode 100644 website/static/img/companies/voucheryio.png delete mode 100644 website/static/img/companies/wbt_solutions.png delete mode 100644 website/static/img/companies/woleet.png delete mode 100644 website/static/img/companies/wso2.png delete mode 100644 website/static/img/companies/xero.png delete mode 100644 website/static/img/companies/yahoo_japan.png delete mode 100755 website/static/img/companies/yelp.png delete mode 100644 website/static/img/companies/yitu.jpeg delete mode 100644 website/static/img/companies/zalando.jpg delete mode 100644 website/static/img/companies/zozo-technologies.png delete mode 100755 website/static/img/docusaurus.svg delete mode 100644 website/static/img/fa-logo.svg delete mode 100755 website/static/img/favicon.png delete mode 100755 website/static/img/favicon/favicon.ico delete mode 100644 website/static/img/icons/exchange.svg delete mode 100644 website/static/img/icons/github.svg delete mode 100644 website/static/img/icons/gitter.svg delete mode 100644 website/static/img/icons/newspaper-o.svg delete mode 100644 website/static/img/icons/pencil.svg delete mode 100644 website/static/img/icons/plug.svg delete mode 100644 website/static/img/icons/twitter.svg delete mode 100644 website/static/img/mono-logo.svg delete mode 100755 website/static/img/oss_logo.png delete mode 100644 website/static/img/tools/Slack_Mark-256x256-3a29a6b.png delete mode 100644 website/static/img/tools/docker.png delete mode 100644 website/static/img/tools/homebrew-256x256.png delete mode 100644 website/static/img/tools/npm.svg delete mode 100644 website/static/js/code-block-buttons.js delete mode 100644 website/yarn.lock diff --git a/docs/usage.md b/docs/usage.md index dc5b649b414..617744eb315 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -256,26 +256,6 @@ Errors: [error] Spec has 1 errors. ``` -## completion - -Although not documented in the `help` output, the CLI offers a `completion` command, which can be used for auto-completion. - -This command takes one or more parameters representing the args list you would otherwise pass to `openapi-generator`. For example: - -```bash -openapi-generator-cli completion config-help --o ---output ---named-header --g ---generator-name --f ---format ---markdown-header -``` - -An example bash completion script can be found in the repo at [scripts/openapi-generator-cli-completion.bash](https://github.com/OpenAPITools/openapi-generator/blob/master/scripts/openapi-generator-cli-completion.bash). - ## generate The `generate` command is the workhorse of the generator toolset. As such, it has _many_ more options available than the previous commands. The abbreviated options are below, but you may expand the full descriptions. diff --git a/scripts/openapi-generator-cli-completion.bash b/scripts/openapi-generator-cli-completion.bash deleted file mode 100644 index b092dbb3ea8..00000000000 --- a/scripts/openapi-generator-cli-completion.bash +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash - -### -# Provides completion assistance for openapi-generator-cli -# Install -# Mac: -# brew install bash-completion -# cp openapi-generator-cli-completion.bash `brew --prefix`/etc/bash_completion.d -# Linux: many distributions include this automatically. Search for your distro-specific instructions. -# When in doubt, try sourcing this file: -# type complete && source openapi-generator-cli -# -# see http://tldp.org/LDP/abs/html/tabexpansion.html -### - -_openapi_generator_cli_completions() { - COMPREPLY=() - local IFS=$' \t\n' - local options=() - - options+=("$($1 completion ${COMP_WORDS[@]:1})") - - case "${COMP_WORDS[1]}" in - generate) - case "${COMP_WORDS[@]:2}" in - -l|--lang|-g|--generator-name) - # TODO: This is a nice-to-have and not required. - # Apply generator-specific options to additional properties. These can be queried via: - # openapi-generator-cli config-help -l YOUR_LANG | grep '^\t' | grep -v '^\t\s\s\s\s' | tr -d '\t' - # where YOUR_LANG would need to be evaluated as the value after the current switch. - # but rather than switching on 'generate' maybe switch on --additional-properties? - ;; - esac - ;; - *) - # ignore - ;; - esac - - # printf '%s\n' "${options[@]}" - if [[ -n "${options[@]}" ]]; then - COMPREPLY=( $(compgen -W "${options}" -- ${2}) ) - fi -} - -for i in openapi-generator-cli openapi-generator; do - type $i > /dev/null 2>&1 && complete -F _openapi_generator_cli_completions $i -done diff --git a/website/.gitignore b/website/.gitignore deleted file mode 100644 index de37598ab07..00000000000 --- a/website/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -# dependencies -/node_modules -# production -/build -# generated files -.docusaurus -.cache-loader -# misc -.DS_Store -.env.local -.env.development.local -.env.test.local -.env.production.local -npm-debug.log* -yarn-debug.log* -yarn-error.log* diff --git a/website/blog/2018-12-24-new-website.md b/website/blog/2018-12-24-new-website.md deleted file mode 100644 index dee973e29d2..00000000000 --- a/website/blog/2018-12-24-new-website.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: New Website -author: Jim Schubert -authorURL: http://twitter.com/jimschubert ---- - -Every great open source project has great documentation. - -That's why we're proud to announce that we've adopted a new website and design for our official documentation. - - - -We will still continue to maintain the documentation on our GitHub repository. In fact, our website will be generated with [Docusaurus](https://docusaurus.io/en), so our docs on GitHub will still be incorporated into this site! diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js deleted file mode 100755 index 2122691433c..00000000000 --- a/website/docusaurus.config.js +++ /dev/null @@ -1,186 +0,0 @@ -const fs = require('fs'); -const path = require('path'); -const parseYaml = require("js-yaml").safeLoad; - -const loadYaml = relativePath => parseYaml(fs.readFileSync(path.join(__dirname, relativePath), "utf8")); - -// See https://docusaurus.io/docs/site-config for all the possible -// site configuration options. - -const team = loadYaml("src/dynamic/team.yml"); -const users = loadYaml("src/dynamic/users.yml"); -const sponsors = loadYaml("src/dynamic/sponsors.yml"); -const baseUrl = '/'; - -const docusaurusConfig = { - title: 'OpenAPI Generator', - tagline: 'Generate clients, servers, and documentation from OpenAPI 2.0/3.x documents', - url: 'https://openapi-generator.tech', // Your website URL - baseUrl: baseUrl, // Base URL for your project */ - favicon: 'img/favicon.png', - organizationName: 'OpenAPITools', - projectName: 'openapi-generator', - - // // You may provide arbitrary config keys to be used as needed by your - // // template. For example, if you need your repo's URL... - // repoUrl: 'https://github.com/OpenAPITools/openapi-generator', - - plugins: ['@docusaurus/plugin-google-analytics'], - - themeConfig: { - // Open Graph and Twitter card images. - image: 'img/docusaurus.png', - - sidebarCollapsible: true, - - prism: { - theme: require('prism-react-renderer/themes/dracula'), - defaultLanguage: 'bash', - }, - - navbar: { - title: 'OpenAPI Generator', - logo: { - src: 'img/mono-logo.svg', - alt: 'OpenAPI Tools logo', - }, - - links: [ - {to: 'docs/installation', label: 'Getting Started'}, - {to: 'docs/generators', label: 'Generators'}, - {to: 'docs/roadmap', label: 'Roadmap'}, - {to: "docs/faq", label: "FAQ" }, - {to: "team", label: "Team" }, - {to: "blog", label: 'Blog'}, - {to: 'https://api.openapi-generator.tech', label: 'API'}, - ], - }, - - googleAnalytics: { - trackingID: 'UA-132927057-1', - }, - - algolia: { - apiKey: '28e55aff9bab37236baa1c5f0f84f4bb', - indexName: 'openapi-generator', - algoliaOptions: { advancedSyntax: true, hitsPerPage: 5}, - }, - - - footer: { - style: 'dark', - - logo: { - alt: 'OpenAPI Tools', - src: 'img/mono-logo.svg', - href: 'https://openapi-generator.tech/', - }, - - copyright: `Copyright © ${new Date().getFullYear()} OpenAPI-Generator Contributors (https://openapi-generator.tech)`, - links: [ - { - title: 'Docs', - items: [ - { - label: 'Customizing Generators', - to: 'docs/customization', - }, - { - label: 'Installation', - to: 'docs/installation', - }, - { - label: 'Workflow Integrations', - to: 'docs/integrations', - }, - ], - }, - { - title: 'Community', - items: [ - { - label: 'User Showcase', - to: 'users', - }, - { - label: 'Stack Overflow', - href: 'https://stackoverflow.com/questions/tagged/openapi-generator', - }, - { - label: 'Chat Room', - href: 'https://join.slack.com/t/openapi-generator/shared_invite/zt-12jxxd7p2-XUeQM~4pzsU9x~eGLQqX2g', - }, - { - label: 'Twitter', - href: 'https://twitter.com/oas_generator', - }, - ], - }, - { - title: 'More', - items: [ - { - label: 'Blog', - to: 'blog', - }, - { - label: 'GitHub', - href: 'https://github.com/OpenAPITools/openapi-generator', - }, - ], - }, - ] - }, - }, - presets: [ - [ - '@docusaurus/preset-classic', - { - theme: { - customCss: require.resolve('./src/css/custom.css'), - }, - - docs: { - // docs folder path relative to website dir. - path: '../docs', - include: ['**/*.md', '**/*.mdx'], - - // sidebars file relative to website dir. - sidebarPath: require.resolve('./sidebars.js'), - - /** - * Theme components used by the docs pages - */ - docLayoutComponent: '@theme/DocPage', - docItemComponent: '@theme/DocItem', - - editUrl: 'https://github.com/OpenAPITools/openapi-generator/edit/master/website', - - // Equivalent to `docsUrl`. - routeBasePath: 'docs', - // Remark and Rehype plugins passed to MDX. Replaces `markdownOptions` and `markdownPlugins`. - remarkPlugins: [], - rehypePlugins: [], - // Equivalent to `enableUpdateBy`. - showLastUpdateAuthor: true, - // Equivalent to `enableUpdateTime`. - showLastUpdateTime: true, - }, - }, - ], - ], - - // Add custom scripts here that would be placed in