diff --git a/bin/utils/detect_merge_conflict.sh b/bin/utils/detect_merge_conflict.sh index d19c27cc565..84e4d3c42d4 100755 --- a/bin/utils/detect_merge_conflict.sh +++ b/bin/utils/detect_merge_conflict.sh @@ -1,6 +1,6 @@ #!/bin/bash -# grep for '<<<<<<< HEAD' in openapi generator +# grep for '<<<<<<< HEAD' in openapi-generator grep -RUIl '<<<<<<< HEAD' modules/openapi-generator/src if [ $? -ne 1 ]; then diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/OpenAPIGenerator.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/OpenAPIGenerator.java index 64775ec97c1..7c8860992bb 100644 --- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/OpenAPIGenerator.java +++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/OpenAPIGenerator.java @@ -12,7 +12,7 @@ import org.openapitools.codegen.cmd.Version; /** * User: lanwen Date: 24.03.15 Time: 17:56 *

- * Command line interface for openapi generator use `openapi-generator-cli.jar help` for more info + * Command line interface for OpenAPI Generator use `openapi-generator-cli.jar help` for more info * * @since 2.1.3-M1 */ diff --git a/modules/openapi-generator-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml index 99e6f7bc014..740fa027652 100644 --- a/modules/openapi-generator-maven-plugin/pom.xml +++ b/modules/openapi-generator-maven-plugin/pom.xml @@ -10,7 +10,7 @@ openapi-generator-maven-plugin openapi-generator (maven-plugin) maven-plugin - maven plugin to build modules from openapi generator + maven plugin to build modules from OpenAPI Generator 3.2.5 diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java index de762960ed3..2f6c18bfdf1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java @@ -176,16 +176,16 @@ public class CodegenConstants { public static final String OPTIONAL_EMIT_DEFAULT_VALUES_DESC = "Set DataMember's EmitDefaultValue."; public static final String GIT_USER_ID = "gitUserId"; - public static final String GIT_USER_ID_DESC = "Git user ID, e.g. swagger-api."; + public static final String GIT_USER_ID_DESC = "Git user ID, e.g. openapitools."; public static final String GIT_REPO_ID = "gitRepoId"; - public static final String GIT_REPO_ID_DESC = "Git repo ID, e.g. swagger-codegen."; + public static final String GIT_REPO_ID_DESC = "Git repo ID, e.g. openapi-generator."; public static final String RELEASE_NOTE = "releaseNote"; public static final String RELEASE_NOTE_DESC = "Release note, default to 'Minor update'."; public static final String HTTP_USER_AGENT = "httpUserAgent"; - public static final String HTTP_USER_AGENT_DESC = "HTTP user agent, e.g. codegen_csharp_api_client, default to 'Swagger-Codegen/{packageVersion}}/{language}'"; + public static final String HTTP_USER_AGENT_DESC = "HTTP user agent, e.g. codegen_csharp_api_client, default to 'OpenAPI-Generator/{packageVersion}}/{language}'"; public static final String SUPPORTS_ES6 = "supportsES6"; public static final String SUPPORTS_ES6_DESC = "Generate code that conforms to ES6."; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index c8334a6f78b..b5a34bc35d4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -3785,7 +3785,7 @@ public class DefaultCodegen implements CodegenConfig { } /** - * Sets an override location for the .swagger-codegen.ignore location for the first code generation. + * Sets an override location for the '.openapi-generator-ignore' location for the first code generation. * * @param ignoreFileOverride The full path to an ignore file */ @@ -4239,7 +4239,7 @@ public class DefaultCodegen implements CodegenConfig { final ArraySchema arraySchema = (ArraySchema) schema; Schema inner = arraySchema.getItems(); if (inner == null) { - inner = new StringSchema().description("//TODO automatically added by swagger-codegen"); + inner = new StringSchema().description("//TODO automatically added by openapi-generator"); arraySchema.setItems(inner); } CodegenProperty codegenProperty = fromProperty("property", schema); @@ -4272,7 +4272,7 @@ public class DefaultCodegen implements CodegenConfig { } else if (ModelUtils.isMapSchema(schema)) { Schema inner = (Schema) schema.getAdditionalProperties(); if (inner == null) { - inner = new StringSchema().description("//TODO automatically added by swagger-codegen"); + inner = new StringSchema().description("//TODO automatically added by openapi-generator"); schema.setAdditionalProperties(inner); } CodegenProperty codegenProperty = fromProperty("property", schema); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index 5d7811d56d1..bf26b5ecce6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -77,7 +77,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { } /** - * Programmatically disable the output of .swagger-codegen/VERSION, .openapi-generator-ignore, + * Programmatically disable the output of .openapi-generator/VERSION, .openapi-generator-ignore, * or other metadata files used by Swagger Codegen. * @param generateMetadata true: enable outputs, false: disable outputs */ @@ -676,7 +676,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { /* * The following code adds default LICENSE (Apache-2.0) for all generators * To use license other than Apache2.0, update the following file: - * modules/swagger-codegen/src/main/resources/_common/LICENSE + * modules/openapi-generator/src/main/resources/_common/LICENSE * final String apache2License = "LICENSE"; String licenseFileNameTarget = config.outputFolder() + File.separator + apache2License; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index e5d200a97b9..b116b395d0c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -45,18 +45,18 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code protected boolean java8Mode = false; protected boolean withXml = false; protected String invokerPackage = "io.swagger"; - protected String groupId = "io.swagger"; - protected String artifactId = "swagger-java"; + protected String groupId = "org.openapitools"; + protected String artifactId = "openapi-java"; protected String artifactVersion = "1.0.0"; - protected String artifactUrl = "https://github.com/swagger-api/swagger-codegen"; - protected String artifactDescription = "Swagger Java"; - protected String developerName = "Swagger"; - protected String developerEmail = "apiteam@swagger.io"; - protected String developerOrganization = "Swagger"; - protected String developerOrganizationUrl = "http://swagger.io"; - protected String scmConnection = "scm:git:git@github.com:swagger-api/swagger-codegen.git"; - protected String scmDeveloperConnection = "scm:git:git@github.com:swagger-api/swagger-codegen.git"; - protected String scmUrl = "https://github.com/swagger-api/swagger-codegen"; + protected String artifactUrl = "https://github.com/openapitools/openapi-generator"; + protected String artifactDescription = "OpenAPI Java"; + protected String developerName = "OpenAPI"; + protected String developerEmail = "team@openapitools.org"; + protected String developerOrganization = "OpenAPI"; + protected String developerOrganizationUrl = "http://openapitools.org"; + protected String scmConnection = "scm:git:git@github.com:openapitools/openapi-generator.git"; + protected String scmDeveloperConnection = "scm:git:git@github.com:openapitools/openapi-generator.git"; + protected String scmUrl = "https://github.com/openapitools/openapi-generator"; protected String licenseName = "Unlicense"; protected String licenseUrl = "http://unlicense.org"; protected String projectFolder = "src" + File.separator + "main"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java index 41aa83903ba..cbc6edd3cb1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java @@ -30,7 +30,7 @@ public abstract class AbstractJavaJAXRSServerCodegen extends AbstractJavaCodegen protected static final String JAXRS_TEMPLATE_DIRECTORY_NAME = "JavaJaxRS"; protected String implFolder = "src/main/java"; protected String testResourcesFolder = "src/test/resources"; - protected String title = "Swagger Server"; + protected String title = "OpenAPI Server"; protected boolean useBeanValidation = true; @@ -41,7 +41,7 @@ public abstract class AbstractJavaJAXRSServerCodegen extends AbstractJavaCodegen sourceFolder = "src/gen/java"; invokerPackage = "org.openapitools.api"; - artifactId = "swagger-jaxrs-server"; + artifactId = "openapi-jaxrs-server"; dateLibrary = "legacy"; //TODO: add joda support to all jax-rs apiPackage = "org.openapitools.api"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java index dcb321d6e6e..208cccc1310 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java @@ -24,7 +24,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co protected String artifactId; protected String artifactVersion = "1.0.0"; - protected String groupId = "io.swagger"; + protected String groupId = "org.openapitools"; protected String packageName; protected String sourceFolder = "src/main/kotlin"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java index b60280c3647..d04f8848973 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java @@ -128,9 +128,9 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, "The main namespace to use for all classes. e.g. Yay\\Pets")); cliOptions.add(new CliOption(PACKAGE_PATH, "The main package name for classes. e.g. GeneratedPetstore")); cliOptions.add(new CliOption(SRC_BASE_PATH, "The directory under packagePath to serve as source root.")); - // cliOptions.add(new CliOption(COMPOSER_VENDOR_NAME, "The vendor name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. yaypets. IMPORTANT NOTE (2016/03): composerVendorName will be deprecated and replaced by gitUserId in the next swagger-codegen release")); + // cliOptions.add(new CliOption(COMPOSER_VENDOR_NAME, "The vendor name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. yaypets. IMPORTANT NOTE (2016/03): composerVendorName will be deprecated and replaced by gitUserId in the next openapi-generator release")); cliOptions.add(new CliOption(CodegenConstants.GIT_USER_ID, CodegenConstants.GIT_USER_ID_DESC)); - // cliOptions.add(new CliOption(COMPOSER_PROJECT_NAME, "The project name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. petstore-client. IMPORTANT NOTE (2016/03): composerProjectName will be deprecated and replaced by gitRepoId in the next swagger-codegen release")); + // cliOptions.add(new CliOption(COMPOSER_PROJECT_NAME, "The project name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. petstore-client. IMPORTANT NOTE (2016/03): composerProjectName will be deprecated and replaced by gitRepoId in the next openapi-generator release")); cliOptions.add(new CliOption(CodegenConstants.GIT_REPO_ID, CodegenConstants.GIT_REPO_ID_DESC)); cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, "The version to use in the composer package version field. e.g. 1.2.3")); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java index b73860bb3ac..05e78491424 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java @@ -27,8 +27,8 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi public static final String ANDROID_SDK_VERSION = "androidSdkVersion"; public static final String ANDROID_BUILD_TOOLS_VERSION = "androidBuildToolsVersion"; protected String invokerPackage = "io.swagger.client"; - protected String groupId = "io.swagger"; - protected String artifactId = "swagger-android-client"; + protected String groupId = "org.openapitools"; + protected String artifactId = "openapi-android-client"; protected String artifactVersion = "1.0.0"; protected String projectFolder = "src/main"; protected String sourceFolder = projectFolder + "/java"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java index 7fc9bb5d4d4..f62b6756198 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java @@ -41,7 +41,7 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi embeddedTemplateDir = templateDir = "clojure"; cliOptions.add(new CliOption(PROJECT_NAME, - "name of the project (Default: generated from info.title or \"swagger-clj-client\")")); + "name of the project (Default: generated from info.title or \"openapi-clj-client\")")); cliOptions.add(new CliOption(PROJECT_DESCRIPTION, "description of the project (Default: using info.description or \"Client library of \")")); cliOptions.add(new CliOption(PROJECT_VERSION, @@ -122,7 +122,7 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi // default values if (projectName == null) { - projectName = "swagger-clj-client"; + projectName = "openapi-clj-client"; } if (projectVersion == null) { projectVersion = "1.0.0"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java index 85848bc21c2..78357f3a6b7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ConfluenceWikiCodegen.java @@ -14,8 +14,8 @@ import java.util.Map; public class ConfluenceWikiCodegen extends DefaultCodegen implements CodegenConfig { private static final String ALL_OPERATIONS = ""; protected String invokerPackage = "io.swagger.client"; - protected String groupId = "io.swagger"; - protected String artifactId = "swagger-client"; + protected String groupId = "org.openapitools"; + protected String artifactId = "openapi-client"; protected String artifactVersion = "1.0.0"; public ConfluenceWikiCodegen() { @@ -36,8 +36,8 @@ public class ConfluenceWikiCodegen extends DefaultCodegen implements CodegenConf cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_ID, CodegenConstants.ARTIFACT_ID_DESC)); cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, CodegenConstants.ARTIFACT_VERSION_DESC)); - additionalProperties.put("appName", "Swagger Sample"); - additionalProperties.put("appDescription", "A sample swagger server"); + additionalProperties.put("appName", "OpenAPI Sample"); + additionalProperties.put("appDescription", "A sample openapi server"); additionalProperties.put("infoUrl", "https://helloreverb.com"); additionalProperties.put("infoEmail", "hello@helloreverb.com"); additionalProperties.put("licenseInfo", "All rights reserved"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FinchServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FinchServerCodegen.java index 468bfab17df..f64042c4fa1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FinchServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/FinchServerCodegen.java @@ -28,7 +28,7 @@ import java.util.Map; public class FinchServerCodegen extends DefaultCodegen implements CodegenConfig { protected String invokerPackage = "io.swagger.client"; - protected String groupId = "io.swagger"; + protected String groupId = "org.openapitools"; protected String artifactId = "finch-server"; protected String artifactVersion = "1.0.0"; protected String sourceFolder = "src/main/scala"; @@ -106,10 +106,10 @@ public class FinchServerCodegen extends DefaultCodegen implements CodegenConfig additionalProperties.put("modelPackage", modelPackage()); additionalProperties.put("apiPackage", apiPackage()); - additionalProperties.put("appName", "Swagger Sample"); - additionalProperties.put("appDescription", "A sample swagger server"); - additionalProperties.put("infoUrl", "http://swagger.io"); - additionalProperties.put("infoEmail", "apiteam@swagger.io"); + additionalProperties.put("appName", "OpenAPI Sample"); + additionalProperties.put("appDescription", "A sample openapi server"); + additionalProperties.put("infoUrl", "http://org.openapitools"); + additionalProperties.put("infoEmail", "team@openapitools.org"); additionalProperties.put("licenseInfo", "Apache 2.0"); additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html"); additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java index bd6bf72621c..c97ced9278b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoServerCodegen.java @@ -17,7 +17,7 @@ public class GoServerCodegen extends AbstractGoCodegen { protected String apiVersion = "1.0.0"; protected int serverPort = 8080; - protected String projectName = "swagger-server"; + protected String projectName = "openapi-server"; protected String apiPath = "go"; public GoServerCodegen() { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java index 9ee66407fd4..e02cc8abb55 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java @@ -45,7 +45,7 @@ public class JavaCXFClientCodegen extends AbstractJavaCodegen sourceFolder = "src/gen/java"; invokerPackage = "org.openapitools.api"; - artifactId = "swagger-jaxrs-client"; + artifactId = "openapi-jaxrs-client"; dateLibrary = "legacy"; //TODO: add joda support to all jax-rs apiPackage = "org.openapitools.api"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java index 38f84fb6380..59462896d5a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java @@ -1,18 +1,22 @@ package org.openapitools.codegen.languages; -import java.io.File; -import java.util.List; -import java.util.Map; +import io.swagger.v3.oas.models.Operation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.openapitools.codegen.*; +import org.openapitools.codegen.CliOption; +import org.openapitools.codegen.CodegenModel; +import org.openapitools.codegen.CodegenOperation; +import org.openapitools.codegen.CodegenProperty; +import org.openapitools.codegen.SupportingFile; import org.openapitools.codegen.languages.features.CXFServerFeatures; import org.openapitools.codegen.languages.features.GzipTestFeatures; import org.openapitools.codegen.languages.features.LoggingTestFeatures; import org.openapitools.codegen.languages.features.UseGenericResponseFeatures; -import io.swagger.v3.oas.models.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.util.List; +import java.util.Map; public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen implements CXFServerFeatures, GzipTestFeatures, LoggingTestFeatures, UseGenericResponseFeatures { @@ -57,7 +61,7 @@ public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen supportsInheritance = true; - artifactId = "swagger-cxf-server"; + artifactId = "openapi-cxf-server"; outputFolder = "generated-code/JavaJaxRS-CXF"; @@ -167,7 +171,7 @@ public class JavaCXFServerCodegen extends AbstractJavaJAXRSServerCodegen writeOptional(outputFolder, new SupportingFile("server/pom.mustache", "", "pom.xml")); writeOptional(outputFolder, - new SupportingFile("server/swagger-codegen-ignore.mustache", "", ".openapi-generator-ignore")); + new SupportingFile("server/openapi-generator-ignore.mustache", "", ".openapi-generator-ignore")); if (this.generateSpringApplication) { writeOptional(outputFolder, new SupportingFile("server/readme.md", "", "readme.md")); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java index 20a5ce80324..080bddcb9c7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java @@ -57,7 +57,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen outputFolder = "generated-code" + File.separator + "java"; embeddedTemplateDir = templateDir = "Java"; invokerPackage = "io.swagger.client"; - artifactId = "swagger-java-client"; + artifactId = "openapi-java-client"; apiPackage = "io.swagger.client.api"; modelPackage = "io.swagger.client.model"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java index 591d149fa4f..d46a8bbbebf 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaInflectorServerCodegen.java @@ -16,7 +16,7 @@ public class JavaInflectorServerCodegen extends AbstractJavaCodegen { private static final Logger LOGGER = LoggerFactory.getLogger(JavaInflectorServerCodegen.class); - protected String title = "Swagger Inflector"; + protected String title = "OpenAPI Inflector"; protected String implFolder = "src/main/java"; public JavaInflectorServerCodegen() { @@ -26,7 +26,7 @@ public class JavaInflectorServerCodegen extends AbstractJavaCodegen { apiTestTemplateFiles.clear(); // TODO: add test template embeddedTemplateDir = templateDir = "JavaInflector"; invokerPackage = "io.swagger.controllers"; - artifactId = "swagger-inflector-server"; + artifactId = "openapi-inflector-server"; dateLibrary = "legacy"; //TODO: add joda support // clear model and api doc template as this codegen diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java index 28bebad079f..fec358e7d43 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSCXFCDIServerCodegen.java @@ -24,7 +24,7 @@ public class JavaJAXRSCXFCDIServerCodegen extends JavaJAXRSSpecServerCodegen imp */ public JavaJAXRSCXFCDIServerCodegen() { outputFolder = "generated-code/JavaJaxRS-CXF-CDI"; - artifactId = "swagger-jaxrs-cxf-cdi-server"; + artifactId = "openapi-jaxrs-cxf-cdi-server"; sourceFolder = "src" + File.separator + "gen" + File.separator + "java"; // Three API templates to support CDI injection diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java index 35c17a9844d..ed0d16e58e6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java @@ -29,7 +29,7 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen { public JavaJAXRSSpecServerCodegen() { super(); invokerPackage = "io.swagger.api"; - artifactId = "swagger-jaxrs-server"; + artifactId = "openapi-jaxrs-server"; outputFolder = "generated-code/JavaJaxRS-Spec"; modelTemplateFiles.put("model.mustache", ".java"); @@ -94,7 +94,7 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen { } if (interfaceOnly) { // Change default artifactId if genereating interfaces only, before command line options are applied in base class. - artifactId = "swagger-jaxrs-client"; + artifactId = "openapi-jaxrs-client"; } super.processOpts(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java index 1dc4c642997..9e381b28ded 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java @@ -26,7 +26,7 @@ public class JavaPlayFrameworkCodegen extends AbstractJavaCodegen implements Bea public static final String WRAP_CALLS = "wrapCalls"; public static final String USE_SWAGGER_UI = "useSwaggerUI"; - protected String title = "swagger-petstore"; + protected String title = "openapi-java-playframework"; protected String configPackage = "io.swagger.configuration"; protected String basePackage = "io.swagger"; protected boolean controllerOnly = false; @@ -44,7 +44,7 @@ public class JavaPlayFrameworkCodegen extends AbstractJavaCodegen implements Bea apiPackage = "controllers"; modelPackage = "apimodels"; invokerPackage = "io.swagger.api"; - artifactId = "swagger-java-playframework"; + artifactId = "openapi-java-playframework"; projectFolder = ""; sourceFolder = projectFolder + File.separator + "app"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaResteasyEapServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaResteasyEapServerCodegen.java index 4fae951d2fc..1f099d5d144 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaResteasyEapServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaResteasyEapServerCodegen.java @@ -25,7 +25,7 @@ public class JavaResteasyEapServerCodegen extends AbstractJavaJAXRSServerCodegen super(); - artifactId = "swagger-jaxrs-resteasy-eap-server"; + artifactId = "openapi-jaxrs-resteasy-eap-server"; outputFolder = "generated-code/JavaJaxRS-Resteasy-eap"; apiTemplateFiles.put("apiServiceImpl.mustache", ".java"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaResteasyServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaResteasyServerCodegen.java index 552a84cc08d..0861d0779f5 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaResteasyServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaResteasyServerCodegen.java @@ -18,7 +18,7 @@ public class JavaResteasyServerCodegen extends AbstractJavaJAXRSServerCodegen im super(); - artifactId = "swagger-jaxrs-resteasy-server"; + artifactId = "openapi-jaxrs-resteasy-server"; outputFolder = "generated-code/JavaJaxRS-Resteasy"; apiTemplateFiles.put("apiService.mustache", ".java"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java index 1570197a044..bcc4d10fabb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaUndertowServerCodegen.java @@ -22,7 +22,7 @@ public class JavaUndertowServerCodegen extends AbstractJavaCodegen { apiTestTemplateFiles.clear(); // TODO: add test template embeddedTemplateDir = templateDir = "undertow"; invokerPackage = "io.swagger.handler"; - artifactId = "swagger-undertow-server"; + artifactId = "openapi-undertow-server"; dateLibrary = "legacy"; //TODO: add joda support // clear model and api doc template as this codegen diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java index a0826cabfe5..cde1f82f293 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java @@ -63,8 +63,8 @@ public class JavaVertXServerCodegen extends AbstractJavaCodegen { additionalProperties.put(ROOT_PACKAGE, rootPackage); - groupId = "io.swagger"; - artifactId = "swagger-java-vertx-server"; + groupId = "org.openapitools"; + artifactId = "openapi-java-vertx-server"; artifactVersion = apiVersion; this.setDateLibrary("java8"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java index b17c8382899..0c83404285f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java @@ -284,7 +284,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo // default values if (StringUtils.isBlank(projectName)) { - projectName = "swagger-js-client"; + projectName = "openapi-js-client"; } if (StringUtils.isBlank(moduleName)) { moduleName = camelize(underscore(projectName)); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSServerCodegen.java index 96943842a68..ffa63c2b6ac 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSServerCodegen.java @@ -31,7 +31,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig public static final String SERVER_PORT = "serverPort"; protected String apiVersion = "1.0.0"; - protected String projectName = "swagger-server"; + protected String projectName = "openapi-server"; protected String defaultServerPort = "8080"; protected boolean googleCloudFunctions; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java index cc5a0a6314e..e91149d3b3a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ObjcClientCodegen.java @@ -41,9 +41,9 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { protected String podVersion = "1.0.0"; protected String classPrefix = "SWG"; protected String authorName = "Swagger"; - protected String authorEmail = "apiteam@swagger.io"; + protected String authorEmail = "team@openapitools.org"; protected String license = DEFAULT_LICENSE; - protected String gitRepoURL = "https://github.com/swagger-api/swagger-codegen"; + protected String gitRepoURL = "https://github.com/openapitools/openapi-generator"; protected String[] specialWords = {"new", "copy"}; protected String apiDocPath = "docs/"; protected String modelDocPath = "docs/"; @@ -178,9 +178,9 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { cliOptions.add(new CliOption(CodegenConstants.POD_VERSION, "cocoapods package version.") .defaultValue("1.0.0")); cliOptions.add(new CliOption(AUTHOR_NAME, "Name to use in the podspec file.").defaultValue("Swagger")); - cliOptions.add(new CliOption(AUTHOR_EMAIL, "Email to use in the podspec file.").defaultValue("apiteam@swagger.io")); + cliOptions.add(new CliOption(AUTHOR_EMAIL, "Email to use in the podspec file.").defaultValue("team@openapitools.org")); cliOptions.add(new CliOption(GIT_REPO_URL, "URL for the git repo where this podspec should point to.") - .defaultValue("https://github.com/swagger-api/swagger-codegen")); + .defaultValue("https://github.com/openapitools/openapi-generator")); cliOptions.add(new CliOption(CodegenConstants.HIDE_GENERATION_TIMESTAMP, CodegenConstants.HIDE_GENERATION_TIMESTAMP_DESC) .defaultValue(Boolean.TRUE.toString())); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java index 692bc9f55c7..bb4b84cbceb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java @@ -143,9 +143,9 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig { cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, "The main namespace to use for all classes. e.g. Yay\\Pets")); cliOptions.add(new CliOption(PACKAGE_PATH, "The main package name for classes. e.g. GeneratedPetstore")); cliOptions.add(new CliOption(SRC_BASE_PATH, "The directory under packagePath to serve as source root.")); - cliOptions.add(new CliOption(COMPOSER_VENDOR_NAME, "The vendor name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. yaypets. IMPORTANT NOTE (2016/03): composerVendorName will be deprecated and replaced by gitUserId in the next swagger-codegen release")); + cliOptions.add(new CliOption(COMPOSER_VENDOR_NAME, "The vendor name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. yaypets. IMPORTANT NOTE (2016/03): composerVendorName will be deprecated and replaced by gitUserId in the next openapi-generator release")); cliOptions.add(new CliOption(CodegenConstants.GIT_USER_ID, CodegenConstants.GIT_USER_ID_DESC)); - cliOptions.add(new CliOption(COMPOSER_PROJECT_NAME, "The project name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. petstore-client. IMPORTANT NOTE (2016/03): composerProjectName will be deprecated and replaced by gitRepoId in the next swagger-codegen release")); + cliOptions.add(new CliOption(COMPOSER_PROJECT_NAME, "The project name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. petstore-client. IMPORTANT NOTE (2016/03): composerProjectName will be deprecated and replaced by gitRepoId in the next openapi-generator release")); cliOptions.add(new CliOption(CodegenConstants.GIT_REPO_ID, CodegenConstants.GIT_REPO_ID_DESC)); cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, "The version to use in the composer package version field. e.g. 1.2.3")); cliOptions.add(new CliOption(CodegenConstants.HIDE_GENERATION_TIMESTAMP, CodegenConstants.ALLOW_UNICODE_IDENTIFIERS_DESC) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java index b5c39e3e96c..7768089bd12 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSilexServerCodegen.java @@ -23,8 +23,8 @@ import org.apache.commons.lang3.StringUtils; public class PhpSilexServerCodegen extends DefaultCodegen implements CodegenConfig { protected String invokerPackage; - protected String groupId = "io.swagger"; - protected String artifactId = "swagger-server"; + protected String groupId = "org.openapitools"; + protected String artifactId = "openapi-server"; protected String artifactVersion = "1.0.0"; public PhpSilexServerCodegen() { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java index fd76a61eee2..bb1e8b92cc6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java @@ -22,8 +22,8 @@ import java.util.regex.Matcher; public class PhpSlimServerCodegen extends DefaultCodegen implements CodegenConfig { protected String invokerPackage; protected String srcBasePath = "lib"; - protected String groupId = "io.swagger"; - protected String artifactId = "swagger-server"; + protected String groupId = "org.openapitools"; + protected String artifactId = "openapi-server"; protected String artifactVersion = "1.0.0"; protected String packagePath = ""; // empty packagePath (top folder) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java index 8956d26caec..9958230b8db 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java @@ -153,9 +153,9 @@ public class PhpSymfonyServerCodegen extends AbstractPhpCodegen implements Codeg typeMapping.put("ByteArray", "string"); typeMapping.put("UUID", "string"); - cliOptions.add(new CliOption(COMPOSER_VENDOR_NAME, "The vendor name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. yaypets. IMPORTANT NOTE (2016/03): composerVendorName will be deprecated and replaced by gitUserId in the next swagger-codegen release")); + cliOptions.add(new CliOption(COMPOSER_VENDOR_NAME, "The vendor name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. yaypets. IMPORTANT NOTE (2016/03): composerVendorName will be deprecated and replaced by gitUserId in the next openapi-generator release")); cliOptions.add(new CliOption(BUNDLE_NAME, "The name of the Symfony bundle. The template uses {{bundleName}}")); - cliOptions.add(new CliOption(COMPOSER_PROJECT_NAME, "The project name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. petstore-client. IMPORTANT NOTE (2016/03): composerProjectName will be deprecated and replaced by gitRepoId in the next swagger-codegen release")); + cliOptions.add(new CliOption(COMPOSER_PROJECT_NAME, "The project name used in the composer package name. The template uses {{composerVendorName}}/{{composerProjectName}} for the composer package name. e.g. petstore-client. IMPORTANT NOTE (2016/03): composerProjectName will be deprecated and replaced by gitRepoId in the next openapi-generator release")); cliOptions.add(new CliOption(CodegenConstants.HIDE_GENERATION_TIMESTAMP, CodegenConstants.HIDE_GENERATION_TIMESTAMP_DESC) .defaultValue(Boolean.TRUE.toString())); cliOptions.add(new CliOption(PHP_LEGACY_SUPPORT, "Should the generated code be compatible with PHP 5.x?").defaultValue(Boolean.TRUE.toString())); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java index 2c1f1c28a33..6bcf6946a7e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RubyClientCodegen.java @@ -44,7 +44,7 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { protected String libFolder = "lib"; protected String gemLicense = "proprietary"; protected String gemRequiredRubyVersion = ">= 1.9"; - protected String gemHomepage = "http://swagger.io"; + protected String gemHomepage = "http://org.openapitools"; protected String gemSummary = "A ruby wrapper for the swagger APIs"; protected String gemDescription = "This gem maps to a swagger API"; protected String gemAuthor = ""; @@ -152,7 +152,7 @@ public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig { defaultValue(">= 1.9")); cliOptions.add(new CliOption(GEM_HOMEPAGE, "gem homepage. "). - defaultValue("http://swagger.io")); + defaultValue("http://org.openapitools")); cliOptions.add(new CliOption(GEM_SUMMARY, "gem summary. "). defaultValue("A ruby wrapper for the swagger APIs")); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java index 22a187907cd..ecd2922e3a4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java @@ -28,7 +28,7 @@ public class RustServerCodegen extends DefaultCodegen implements CodegenConfig { protected String apiVersion = "1.0.0"; protected String serverHost = "localhost"; protected int serverPort = 8080; - protected String projectName = "swagger-server"; + protected String projectName = "openapi-server"; protected String apiPath = "rust-server"; protected String packageName; protected String packageVersion; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java index 59a3f92cd4e..595daf2917d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java @@ -4,8 +4,11 @@ import com.google.common.base.CaseFormat; import com.samskivert.mustache.Mustache; import com.samskivert.mustache.Template; +import io.swagger.v3.oas.models.media.ArraySchema; +import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.security.SecurityScheme; -import org.openapitools.codegen.CliOption; + +import org.apache.commons.lang3.StringUtils; import org.openapitools.codegen.CodegenConfig; import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenOperation; @@ -15,11 +18,6 @@ import org.openapitools.codegen.CodegenSecurity; import org.openapitools.codegen.CodegenType; import org.openapitools.codegen.SupportingFile; import org.openapitools.codegen.utils.ModelUtils; -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.Operation; -import io.swagger.v3.oas.models.media.*; - -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +36,7 @@ import java.util.Map; public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements CodegenConfig { protected String mainPackage = "io.swagger.client"; protected String groupId = "io.swagger"; - protected String artifactId = "swagger-client"; + protected String artifactId = "openapi-client"; protected String artifactVersion = "1.0.0"; protected String resourcesFolder = "src/main/resources"; protected String configKey = "apiRequest"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttpClientCodegen.java index d6c1e88f255..f68a11a128a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttpClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttpClientCodegen.java @@ -1,20 +1,24 @@ package org.openapitools.codegen.languages; -import org.openapitools.codegen.*; +import org.apache.commons.lang3.StringUtils; +import org.openapitools.codegen.CliOption; +import org.openapitools.codegen.CodegenConfig; +import org.openapitools.codegen.CodegenConstants; +import org.openapitools.codegen.CodegenProperty; +import org.openapitools.codegen.CodegenType; +import org.openapitools.codegen.SupportingFile; import java.io.File; import java.util.Arrays; import java.util.HashMap; -import org.apache.commons.lang3.StringUtils; - public class ScalaHttpClientCodegen extends AbstractScalaCodegen implements CodegenConfig { protected String authScheme = ""; protected String gradleWrapperPackage = "gradle.wrapper"; protected boolean authPreemptive; protected boolean asyncHttpClient = !authScheme.isEmpty(); protected String groupId = "io.swagger"; - protected String artifactId = "swagger-scala-client"; + protected String artifactId = "openapi-scala-client"; protected String artifactVersion = "1.0.0"; protected String clientName = "AsyncClient"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaLagomServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaLagomServerCodegen.java index edbbbc23f23..c4937ff96b9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaLagomServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaLagomServerCodegen.java @@ -9,7 +9,7 @@ public class ScalaLagomServerCodegen extends AbstractScalaCodegen implements Cod private String authScheme = ""; private boolean authPreemptive = false; - protected String groupId = "io.swagger"; + protected String groupId = "org.openapitools"; protected String artifactId = "scala-lagom-server"; protected String artifactVersion = "1.0.0"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java index 6384b3bbc60..89760ea683f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalatraServerCodegen.java @@ -17,8 +17,8 @@ import java.util.Map; public class ScalatraServerCodegen extends AbstractScalaCodegen implements CodegenConfig { - protected String groupId = "io.swagger"; - protected String artifactId = "swagger-server"; + protected String groupId = "org.openapitools"; + protected String artifactId = "openapi-server"; protected String artifactVersion = "1.0.0"; public ScalatraServerCodegen() { @@ -67,10 +67,10 @@ public class ScalatraServerCodegen extends AbstractScalaCodegen implements Codeg // mapped to String as a workaround typeMapping.put("binary", "String"); - additionalProperties.put("appName", "Swagger Sample"); - additionalProperties.put("appDescription", "A sample swagger server"); - additionalProperties.put("infoUrl", "http://swagger.io"); - additionalProperties.put("infoEmail", "apiteam@swagger.io"); + additionalProperties.put("appName", "OpenAPI Sample"); + additionalProperties.put("appDescription", "A sample openapi server"); + additionalProperties.put("infoUrl", "http://org.openapitools"); + additionalProperties.put("infoEmail", "team@openapitools.org"); additionalProperties.put("licenseInfo", "All rights reserved"); additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html"); additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java index 515927ebac5..ceefff51eb9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java @@ -34,7 +34,7 @@ public class SpringCodegen extends AbstractJavaCodegen public static final String IMPLICIT_HEADERS = "implicitHeaders"; public static final String SWAGGER_DOCKET_CONFIG = "swaggerDocketConfig"; - protected String title = "swagger-petstore"; + protected String title = "OpenAPI Spring"; protected String configPackage = "io.swagger.configuration"; protected String basePackage = "io.swagger"; protected boolean interfaceOnly = false; @@ -58,7 +58,7 @@ public class SpringCodegen extends AbstractJavaCodegen apiPackage = "io.swagger.api"; modelPackage = "io.swagger.model"; invokerPackage = "io.swagger.api"; - artifactId = "swagger-spring"; + artifactId = "openapi-spring"; additionalProperties.put(CONFIG_PACKAGE, configPackage); additionalProperties.put(BASE_PACKAGE, basePackage); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticDocCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticDocCodegen.java index 5d8932a616b..4c5d353fcc8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticDocCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticDocCodegen.java @@ -11,8 +11,8 @@ import java.io.File; public class StaticDocCodegen extends DefaultCodegen implements CodegenConfig { protected String invokerPackage = "io.swagger.client"; - protected String groupId = "io.swagger"; - protected String artifactId = "swagger-client"; + protected String groupId = "org.openapitools"; + protected String artifactId = "openapi-client"; protected String artifactVersion = "1.0.0"; protected String sourceFolder = "docs"; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java index 6bfac618f40..ce06bf2ff81 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtml2Generator.java @@ -31,8 +31,8 @@ public class StaticHtml2Generator extends DefaultCodegen implements CodegenConfi protected String invokerPackage = "io.swagger.client"; // default for Java and Android protected String phpInvokerPackage = "Swagger\\Client"; // default for PHP protected String packageName = "IO.Swagger"; // default for C# - protected String groupId = "io.swagger"; - protected String artifactId = "swagger-client"; + protected String groupId = "org.openapitools"; + protected String artifactId = "openapi-client"; protected String artifactVersion = "1.0.0"; protected String jsProjectName; protected String jsModuleName; @@ -61,8 +61,8 @@ public class StaticHtml2Generator extends DefaultCodegen implements CodegenConfi cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_ID, CodegenConstants.ARTIFACT_ID_DESC)); cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, CodegenConstants.ARTIFACT_VERSION_DESC)); - additionalProperties.put("appName", "Swagger Sample"); - additionalProperties.put("appDescription", "A sample swagger server"); + additionalProperties.put("appName", "OpenAPI Sample"); + additionalProperties.put("appDescription", "A sample openapi server"); additionalProperties.put("infoUrl", "https://helloreverb.com"); additionalProperties.put("infoEmail", "hello@helloreverb.com"); additionalProperties.put("licenseInfo", "All rights reserved"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java index 35f1eb15b48..f6c80195cdb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/StaticHtmlGenerator.java @@ -29,8 +29,8 @@ import com.samskivert.mustache.Mustache.Compiler; public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig { protected String invokerPackage = "io.swagger.client"; - protected String groupId = "io.swagger"; - protected String artifactId = "swagger-client"; + protected String groupId = "org.openapitools"; + protected String artifactId = "openapi-client"; protected String artifactVersion = "1.0.0"; public StaticHtmlGenerator() { @@ -51,8 +51,8 @@ public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_ID, CodegenConstants.ARTIFACT_ID_DESC)); cliOptions.add(new CliOption(CodegenConstants.ARTIFACT_VERSION, CodegenConstants.ARTIFACT_VERSION_DESC)); - additionalProperties.put("appName", "Swagger Sample"); - additionalProperties.put("appDescription", "A sample swagger server"); + additionalProperties.put("appName", "OpenAPI Sample"); + additionalProperties.put("appDescription", "A sample openapi server"); additionalProperties.put("infoUrl", "https://helloreverb.com"); additionalProperties.put("infoEmail", "hello@helloreverb.com"); additionalProperties.put("licenseInfo", "All rights reserved"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java index f11e275d097..66de59931ed 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java @@ -46,7 +46,7 @@ public class Swift3Codegen extends DefaultCodegen implements CodegenConfig { protected static final String LIBRARY_PROMISE_KIT = "PromiseKit"; protected static final String LIBRARY_RX_SWIFT = "RxSwift"; protected static final String[] RESPONSE_LIBRARIES = {LIBRARY_PROMISE_KIT, LIBRARY_RX_SWIFT}; - protected String projectName = "SwaggerClient"; + protected String projectName = "OpenAPIClient"; protected boolean unwrapRequired; protected boolean objcCompatible = false; protected boolean lenientTypeCast = false; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java index 3d0d35ce56d..307b68bd536 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java @@ -53,7 +53,7 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig { protected static final String LIBRARY_PROMISE_KIT = "PromiseKit"; protected static final String LIBRARY_RX_SWIFT = "RxSwift"; protected static final String[] RESPONSE_LIBRARIES = {LIBRARY_PROMISE_KIT, LIBRARY_RX_SWIFT}; - protected String projectName = "SwaggerClient"; + protected String projectName = "OpenAPIClient"; protected boolean unwrapRequired; protected boolean objcCompatible = false; protected boolean lenientTypeCast = false; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftClientCodegen.java index 058acc13e3e..d7cad9375fe 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftClientCodegen.java @@ -49,7 +49,7 @@ public class SwiftClientCodegen extends DefaultCodegen implements CodegenConfig protected static final String LIBRARY_PROMISE_KIT = "PromiseKit"; protected static final String LIBRARY_RX_SWIFT = "RxSwift"; protected static final String[] RESPONSE_LIBRARIES = { LIBRARY_PROMISE_KIT, LIBRARY_RX_SWIFT }; - protected String projectName = "SwaggerClient"; + protected String projectName = "OpenAPIClient"; protected boolean unwrapRequired; protected boolean swiftUseApiNamespace; protected String[] responseAs = new String[0]; diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/swagger-codegen-ignore.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/openapi-generator-ignore.mustache similarity index 78% rename from modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/swagger-codegen-ignore.mustache rename to modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/openapi-generator-ignore.mustache index 70b88e71039..4886bc8b2e1 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/swagger-codegen-ignore.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/server/openapi-generator-ignore.mustache @@ -1,11 +1,11 @@ -# Swagger Codegen Ignore -# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator # Use this file to prevent files from being overwritten by the generator. # The patterns follow closely to .gitignore or .dockerignore. # As an example, the C# client generator defines ApiClient.cs. -# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line: +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: #ApiClient.cs # You can match any string of characters against a directory, file or extension with a single asterisk (*): diff --git a/modules/openapi-generator/src/main/resources/_common/.openapi-generator-ignore b/modules/openapi-generator/src/main/resources/_common/.openapi-generator-ignore index 6fa32398dc8..7484ee590a3 100644 --- a/modules/openapi-generator/src/main/resources/_common/.openapi-generator-ignore +++ b/modules/openapi-generator/src/main/resources/_common/.openapi-generator-ignore @@ -1,11 +1,11 @@ -# Openapi Generator Ignore +# OpenAPI Generator Ignore # Generated by openapi-generator https://github.com/openapitools/openapi-generator # Use this file to prevent files from being overwritten by the generator. # The patterns follow closely to .gitignore or .dockerignore. # As an example, the C# client generator defines ApiClient.cs. -# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line: +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: #ApiClient.cs # You can match any string of characters against a directory, file or extension with a single asterisk (*): diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/ObjcClientOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/ObjcClientOptionsProvider.java index e1a2aa76d8d..c0ffc1b41a9 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/ObjcClientOptionsProvider.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/ObjcClientOptionsProvider.java @@ -13,8 +13,8 @@ public class ObjcClientOptionsProvider implements OptionsProvider { public static final String POD_NAME_VALUE = "SwaggerClientObjc"; public static final String POD_VERSION_VALUE = "1.0.0-SNAPSHOT"; public static final String AUTHOR_NAME_VALUE = "SwaggerObjc"; - public static final String AUTHOR_EMAIL_VALUE = "objc@swagger.io"; - public static final String GIT_REPO_URL_VALUE = "https://github.com/swagger-api/swagger-codegen"; + public static final String AUTHOR_EMAIL_VALUE = "objc@openapitools.org"; + public static final String GIT_REPO_URL_VALUE = "https://github.com/openapitools/openapi-generator"; @Override public String getLanguage() { diff --git a/samples/server/petstore/scalatra/.swagger-codegen/VERSION b/samples/server/petstore/scalatra/.swagger-codegen/VERSION deleted file mode 100644 index 096bf47efe3..00000000000 --- a/samples/server/petstore/scalatra/.swagger-codegen/VERSION +++ /dev/null @@ -1 +0,0 @@ -3.0.0-SNAPSHOT \ No newline at end of file