From f2b28d578f67ae897a2d0b16cd2edf5ab03ea5e2 Mon Sep 17 00:00:00 2001 From: wing328 Date: Wed, 7 Mar 2018 12:00:00 +0800 Subject: [PATCH] rename plug-in, generator --- .../README.md | 18 +++---- .../examples/java-client.xml | 8 ++-- .../examples/swagger.yaml | 0 .../pom.xml | 18 +++---- .../codegen/plugin/CodeGenMojo.java | 48 +++++++++---------- .../Dockerfile | 0 .../pom.xml | 18 +++---- .../sample.json | 0 .../codegen/online}/Bootstrap.java | 14 +++--- .../codegen/online}/DynamicSwaggerConfig.java | 8 ++-- .../online}/exception/ApiException.java | 2 +- .../exception/BadRequestException.java | 2 +- .../online}/exception/NotFoundException.java | 2 +- .../codegen/online/http}/Generator.java | 18 +++---- .../codegen/online}/model/ApiResponse.java | 2 +- .../codegen/online}/model/Generated.java | 2 +- .../codegen/online}/model/GeneratorInput.java | 2 +- .../codegen/online}/model/InputOption.java | 2 +- .../codegen/online}/model/ResponseCode.java | 2 +- .../online}/resource/ExceptionWriter.java | 12 ++--- .../online}/resource/SwaggerResource.java | 20 ++++---- .../codegen/online}/util/ApiOriginFilter.java | 2 +- .../online}/util/JacksonJsonProvider.java | 2 +- .../online}/util/ValidationException.java | 2 +- .../online}/util/ValidationMessage.java | 2 +- .../codegen/online}/util/ZipUtil.java | 2 +- .../src/main/resources/logback.xml | 0 .../src/main/resources/version.prop | 0 .../src/main/webapp/WEB-INF/web.xml | 8 ++-- .../src/main/webapp/index.html | 0 .../online/OnlineGeneratorOptionsTest.java | 17 +++---- .../online/OnlineJavaClientOptionsTest.java | 13 ++--- .../src/test/resources/petstore.json | 0 .../swagger/generator/GeneratorInputTest.java | 15 ------ pom.xml | 4 +- 35 files changed, 126 insertions(+), 139 deletions(-) rename modules/{swagger-codegen-maven-plugin => openapi-generator-maven-plugin}/README.md (87%) rename modules/{swagger-codegen-maven-plugin => openapi-generator-maven-plugin}/examples/java-client.xml (96%) rename modules/{swagger-codegen-maven-plugin => openapi-generator-maven-plugin}/examples/swagger.yaml (100%) rename modules/{swagger-codegen-maven-plugin => openapi-generator-maven-plugin}/pom.xml (87%) rename modules/{swagger-codegen-maven-plugin/src/main/java/io/swagger => openapi-generator-maven-plugin/src/main/java/org/openapitools}/codegen/plugin/CodeGenMojo.java (91%) rename modules/{swagger-generator => openapi-generator-online}/Dockerfile (100%) rename modules/{swagger-generator => openapi-generator-online}/pom.xml (95%) rename modules/{swagger-generator => openapi-generator-online}/sample.json (100%) rename modules/{swagger-generator/src/main/java/io/swagger/generator => openapi-generator-online/src/main/java/org/openapitools/codegen/online}/Bootstrap.java (77%) rename modules/{swagger-generator/src/main/java/io/swagger/generator => openapi-generator-online/src/main/java/org/openapitools/codegen/online}/DynamicSwaggerConfig.java (94%) rename modules/{swagger-generator/src/main/java/io/swagger/generator => openapi-generator-online/src/main/java/org/openapitools/codegen/online}/exception/ApiException.java (94%) rename modules/{swagger-generator/src/main/java/io/swagger/generator => openapi-generator-online/src/main/java/org/openapitools/codegen/online}/exception/BadRequestException.java (94%) rename modules/{swagger-generator/src/main/java/io/swagger/generator => openapi-generator-online/src/main/java/org/openapitools/codegen/online}/exception/NotFoundException.java (94%) rename modules/{swagger-generator/src/main/java/io/swagger/generator/online => openapi-generator-online/src/main/java/org/openapitools/codegen/online/http}/Generator.java (92%) rename modules/{swagger-generator/src/main/java/io/swagger/generator => openapi-generator-online/src/main/java/org/openapitools/codegen/online}/model/ApiResponse.java (97%) rename modules/{swagger-generator/src/main/java/io/swagger/generator => openapi-generator-online/src/main/java/org/openapitools/codegen/online}/model/Generated.java (95%) rename modules/{swagger-generator/src/main/java/io/swagger/generator => openapi-generator-online/src/main/java/org/openapitools/codegen/online}/model/GeneratorInput.java (96%) rename modules/{swagger-generator/src/main/java/io/swagger/generator => openapi-generator-online/src/main/java/org/openapitools/codegen/online}/model/InputOption.java (97%) rename modules/{swagger-generator/src/main/java/io/swagger/generator => openapi-generator-online/src/main/java/org/openapitools/codegen/online}/model/ResponseCode.java (94%) rename modules/{swagger-generator/src/main/java/io/swagger/generator => openapi-generator-online/src/main/java/org/openapitools/codegen/online}/resource/ExceptionWriter.java (83%) rename modules/{swagger-generator/src/main/java/io/swagger/generator => openapi-generator-online/src/main/java/org/openapitools/codegen/online}/resource/SwaggerResource.java (94%) rename modules/{swagger-generator/src/main/java/io/swagger/generator => openapi-generator-online/src/main/java/org/openapitools/codegen/online}/util/ApiOriginFilter.java (97%) rename modules/{swagger-generator/src/main/java/io/swagger/generator => openapi-generator-online/src/main/java/org/openapitools/codegen/online}/util/JacksonJsonProvider.java (91%) rename modules/{swagger-generator/src/main/java/io/swagger/generator => openapi-generator-online/src/main/java/org/openapitools/codegen/online}/util/ValidationException.java (91%) rename modules/{swagger-generator/src/main/java/io/swagger/generator => openapi-generator-online/src/main/java/org/openapitools/codegen/online}/util/ValidationMessage.java (91%) rename modules/{swagger-generator/src/main/java/io/swagger/generator => openapi-generator-online/src/main/java/org/openapitools/codegen/online}/util/ZipUtil.java (98%) rename modules/{swagger-generator => openapi-generator-online}/src/main/resources/logback.xml (100%) rename modules/{swagger-generator => openapi-generator-online}/src/main/resources/version.prop (100%) rename modules/{swagger-generator => openapi-generator-online}/src/main/webapp/WEB-INF/web.xml (87%) rename modules/{swagger-generator => openapi-generator-online}/src/main/webapp/index.html (100%) rename modules/{swagger-generator/src/test/java/io/swagger/generator => openapi-generator-online/src/test/java/org/openapitools/codegen}/online/OnlineGeneratorOptionsTest.java (94%) rename modules/{swagger-generator/src/test/java/io/swagger/generator => openapi-generator-online/src/test/java/org/openapitools/codegen}/online/OnlineJavaClientOptionsTest.java (62%) rename modules/{swagger-generator => openapi-generator-online}/src/test/resources/petstore.json (100%) delete mode 100644 modules/swagger-generator/src/test/java/io/swagger/generator/GeneratorInputTest.java diff --git a/modules/swagger-codegen-maven-plugin/README.md b/modules/openapi-generator-maven-plugin/README.md similarity index 87% rename from modules/swagger-codegen-maven-plugin/README.md rename to modules/openapi-generator-maven-plugin/README.md index a357057c7464..dfd735ee8988 100644 --- a/modules/swagger-codegen-maven-plugin/README.md +++ b/modules/openapi-generator-maven-plugin/README.md @@ -1,7 +1,7 @@ -swagger-codegen-maven-plugin +openapi-generator-maven-plugin ============================ -A Maven plugin to support the [swagger](http://swagger.io) code generation project +A Maven plugin to support the OpenAPI generator project Usage ============================ @@ -9,8 +9,8 @@ Usage Add to your `build->plugins` section (default phase is `generate-sources` phase) ```xml - io.swagger - swagger-codegen-maven-plugin + org.openapitools + openapi-generator-maven-plugin 2.3.1 @@ -49,7 +49,7 @@ mvn clean compile - `withXml` - enable XML annotations inside the generated models and API (only works with Java `language` and libraries that provide support for JSON and XML) - `configOptions` - a map of language-specific parameters (see below) - `configHelp` - dumps the configuration help for the specified library (generates no sources) -- `ignoreFileOverride` - specifies the full path to a `.swagger-codegen-ignore` used for pattern based overrides of generated outputs +- `ignoreFileOverride` - specifies the full path to a `.openapi-generator-ignore` used for pattern based overrides of generated outputs - `generateApis` - generate the apis (`true` by default) - `generateApiTests` - generate the api tests (`true` by default. Only available if `generateApis` is `true`) - `generateApiDocumentation` - generate the api documentation (`true` by default. Only available if `generateApis` is `true`) @@ -67,9 +67,9 @@ Specifying a custom generator is a bit different. It doesn't support the classpa ```xml - io.swagger - swagger-codegen-maven-plugin - ${swagger-codegen-maven-plugin-version} + org.openapitools + openapi-generator-maven-plugin + ${openapi-generator-maven-plugin-version} @@ -77,7 +77,7 @@ Specifying a custom generator is a bit different. It doesn't support the classpa src/main/resources/yaml/yamlfilename.yaml - + com.my.package.for.GeneratorLanguage myTemplateDir diff --git a/modules/swagger-codegen-maven-plugin/examples/java-client.xml b/modules/openapi-generator-maven-plugin/examples/java-client.xml similarity index 96% rename from modules/swagger-codegen-maven-plugin/examples/java-client.xml rename to modules/openapi-generator-maven-plugin/examples/java-client.xml index 4ad322b060d8..34d16d1ca4fd 100644 --- a/modules/swagger-codegen-maven-plugin/examples/java-client.xml +++ b/modules/openapi-generator-maven-plugin/examples/java-client.xml @@ -1,6 +1,6 @@ 4.0.0 - io.swagger + org.openapitools sample-project jar 1.0-SNAPSHOT @@ -10,8 +10,8 @@ - io.swagger - swagger-codegen-maven-plugin + org.openapitools + openapi-generator-maven-plugin 2.2.2-SNAPSHOT @@ -45,7 +45,7 @@ - io.swagger + org.openapitools swagger-annotations ${swagger-annotations-version} diff --git a/modules/swagger-codegen-maven-plugin/examples/swagger.yaml b/modules/openapi-generator-maven-plugin/examples/swagger.yaml similarity index 100% rename from modules/swagger-codegen-maven-plugin/examples/swagger.yaml rename to modules/openapi-generator-maven-plugin/examples/swagger.yaml diff --git a/modules/swagger-codegen-maven-plugin/pom.xml b/modules/openapi-generator-maven-plugin/pom.xml similarity index 87% rename from modules/swagger-codegen-maven-plugin/pom.xml rename to modules/openapi-generator-maven-plugin/pom.xml index 28236f345ad4..d29b60618a7b 100644 --- a/modules/swagger-codegen-maven-plugin/pom.xml +++ b/modules/openapi-generator-maven-plugin/pom.xml @@ -2,15 +2,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - io.swagger - swagger-codegen-project - 2.4.0-SNAPSHOT + org.openapitools + openapi-generator-project + 3.0.0-SNAPSHOT ../.. - swagger-codegen-maven-plugin - swagger-codegen (maven-plugin) + openapi-generator-maven-plugin + openapi-generator (maven-plugin) maven-plugin - maven plugin to build modules from swagger codegen + maven plugin to build modules from openapi generator 3.2.5 @@ -45,8 +45,8 @@ 3.4 - io.swagger - swagger-codegen + org.openapitools + openapi-generator ${project.version} @@ -89,7 +89,7 @@ net.revelc.code formatter-maven-plugin - + ${project.basedir}${file.separator}${project.parent.relativePath}${file.separator}eclipse-formatter.xml diff --git a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java b/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java similarity index 91% rename from modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java rename to modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java index 446acc9849e0..07786d75c338 100644 --- a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java +++ b/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java @@ -1,4 +1,4 @@ -package io.swagger.codegen.plugin; +package org.openapitools.codegen.plugin; /* * Copyright 2001-2005 The Apache Software Foundation. @@ -14,18 +14,18 @@ package io.swagger.codegen.plugin; * the License. */ -import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyAdditionalPropertiesKvp; -import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyImportMappingsKvp; -import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyInstantiationTypesKvp; -import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyLanguageSpecificPrimitivesCsv; -import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyTypeMappingsKvp; -import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyReservedWordsMappingsKvp; -import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyAdditionalPropertiesKvpList; -import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyImportMappingsKvpList; -import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyInstantiationTypesKvpList; -import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyLanguageSpecificPrimitivesCsvList; -import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyTypeMappingsKvpList; -import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyReservedWordsMappingsKvpList; +import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applyAdditionalPropertiesKvp; +import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applyImportMappingsKvp; +import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applyInstantiationTypesKvp; +import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applyLanguageSpecificPrimitivesCsv; +import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applyTypeMappingsKvp; +import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applyReservedWordsMappingsKvp; +import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applyAdditionalPropertiesKvpList; +import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applyImportMappingsKvpList; +import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applyInstantiationTypesKvpList; +import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applyLanguageSpecificPrimitivesCsvList; +import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applyTypeMappingsKvpList; +import static org.openapitools.codegen.config.CodegenConfiguratorUtils.applyReservedWordsMappingsKvpList; import static org.apache.commons.lang3.StringUtils.isNotEmpty; import java.io.File; @@ -40,15 +40,15 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; -import io.swagger.codegen.CliOption; -import io.swagger.codegen.ClientOptInput; -import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenConstants; -import io.swagger.codegen.DefaultGenerator; -import io.swagger.codegen.config.CodegenConfigurator; +import org.openapitools.codegen.CliOption; +import org.openapitools.codegen.ClientOptInput; +import org.openapitools.codegen.CodegenConfig; +import org.openapitools.codegen.CodegenConstants; +import org.openapitools.codegen.DefaultGenerator; +import org.openapitools.codegen.config.CodegenConfigurator; /** - * Goal which generates client/server code from a swagger json/yaml definition. + * Goal which generates client/server code from a OpenAPI json/yaml definition. */ @Mojo(name = "generate", defaultPhase = LifecyclePhase.GENERATE_SOURCES) public class CodeGenMojo extends AbstractMojo { @@ -65,12 +65,12 @@ public class CodeGenMojo extends AbstractMojo { /** * Location of the output directory. */ - @Parameter(name = "output", property = "swagger.codegen.maven.plugin.output", - defaultValue = "${project.build.directory}/generated-sources/swagger") + @Parameter(name = "output", property = "openapi.generator.maven.plugin.output", + defaultValue = "${project.build.directory}/generated-sources/openapi") private File output; /** - * Location of the swagger spec, as URL or file. + * Location of the OpenAPI spec, as URL or file. */ @Parameter(name = "inputSpec", required = true) private String inputSpec; @@ -82,7 +82,7 @@ public class CodeGenMojo extends AbstractMojo { private String gitUserId; /** - * Git repo ID, e.g. swagger-codegen. + * Git repo ID, e.g. openapi-generator. */ @Parameter(name = "gitRepoId", required = false) private String gitRepoId; diff --git a/modules/swagger-generator/Dockerfile b/modules/openapi-generator-online/Dockerfile similarity index 100% rename from modules/swagger-generator/Dockerfile rename to modules/openapi-generator-online/Dockerfile diff --git a/modules/swagger-generator/pom.xml b/modules/openapi-generator-online/pom.xml similarity index 95% rename from modules/swagger-generator/pom.xml rename to modules/openapi-generator-online/pom.xml index bca8c7e48b8a..36414c3282a2 100644 --- a/modules/swagger-generator/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -2,14 +2,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - io.swagger - swagger-codegen-project - 2.4.0-SNAPSHOT + org.openapitools + openapi-generator-project + 3.0.0-SNAPSHOT ../.. - swagger-generator + openapi-generator-online war - swagger-generator + openapi-generator-online src/main/java @@ -136,13 +136,13 @@ ${swagger-core-version} - io.swagger - swagger-codegen + org.openapitools + openapi-generator ${project.parent.version} - io.swagger - swagger-codegen + org.openapitools + openapi-generator ${project.parent.version} test-jar test diff --git a/modules/swagger-generator/sample.json b/modules/openapi-generator-online/sample.json similarity index 100% rename from modules/swagger-generator/sample.json rename to modules/openapi-generator-online/sample.json diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/Bootstrap.java similarity index 77% rename from modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java rename to modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/Bootstrap.java index a48a21355fc9..9f52e73096d9 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/Bootstrap.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/Bootstrap.java @@ -12,7 +12,7 @@ * the License. */ -package io.swagger.generator; +package org.openapitools.codegen.online; import org.apache.commons.io.IOUtils; @@ -29,11 +29,11 @@ public class Bootstrap extends HttpServlet { public void init(ServletConfig config) throws ServletException { DynamicSwaggerConfig bc = new DynamicSwaggerConfig(); bc.setBasePath("/api"); - bc.setTitle("Swagger Generator"); - bc.setDescription("This is an online swagger codegen server. You can find out more " - + "at https://github.com/swagger-api/swagger-codegen or on [irc.freenode.net, #swagger](http://swagger.io/irc/)."); - bc.setTermsOfServiceUrl("http://swagger.io/terms/"); - bc.setContact("apiteam@swagger.io"); + bc.setTitle("OpenAPI Generator"); + bc.setDescription("This is an online OpenAPI generator. You can find out more " + + "at https://github.com/openapi-tools/openapi-generator"); + bc.setTermsOfServiceUrl("https://www.apache.org/licenses/LICENSE-2.0"); + bc.setContact("openapi-generator@gmail.com"); bc.setLicense("Apache 2.0"); InputStream stream = getClass().getResourceAsStream("/version.prop"); if (stream == null) { @@ -48,7 +48,7 @@ public class Bootstrap extends HttpServlet { } bc.setLicenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html"); - bc.setResourcePackage("io.swagger.generator.resource"); + bc.setResourcePackage("org.openapitools.codegen.online.resource"); bc.setScan(true); } } diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/DynamicSwaggerConfig.java similarity index 94% rename from modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java rename to modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/DynamicSwaggerConfig.java index 35d143d4b7e6..0aac6577a68e 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/DynamicSwaggerConfig.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/DynamicSwaggerConfig.java @@ -1,8 +1,8 @@ -package io.swagger.generator; +package org.openapitools.codegen.online; -import io.swagger.codegen.Codegen; -import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenType; +import org.openapitools.codegen.Codegen; +import org.openapitools.codegen.CodegenConfig; +import org.openapitools.codegen.CodegenType; import io.swagger.jaxrs.config.BeanConfig; import io.swagger.models.Operation; import io.swagger.models.Path; diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/ApiException.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/exception/ApiException.java similarity index 94% rename from modules/swagger-generator/src/main/java/io/swagger/generator/exception/ApiException.java rename to modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/exception/ApiException.java index ee5df08dade4..ff85b42a2d8f 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/ApiException.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/exception/ApiException.java @@ -12,7 +12,7 @@ * the License. */ -package io.swagger.generator.exception; +package org.openapitools.codegen.online.exception; public class ApiException extends Exception { private static final long serialVersionUID = -5085112752305370687L; diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/BadRequestException.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/exception/BadRequestException.java similarity index 94% rename from modules/swagger-generator/src/main/java/io/swagger/generator/exception/BadRequestException.java rename to modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/exception/BadRequestException.java index 6fa19c94c643..447128ebf1bd 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/BadRequestException.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/exception/BadRequestException.java @@ -12,7 +12,7 @@ * the License. */ -package io.swagger.generator.exception; +package org.openapitools.codegen.online.exception; import org.apache.http.HttpStatus; diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/NotFoundException.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/exception/NotFoundException.java similarity index 94% rename from modules/swagger-generator/src/main/java/io/swagger/generator/exception/NotFoundException.java rename to modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/exception/NotFoundException.java index f41d1402a48e..467fadec7095 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/exception/NotFoundException.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/exception/NotFoundException.java @@ -12,7 +12,7 @@ * the License. */ -package io.swagger.generator.exception; +package org.openapitools.codegen.online.exception; import org.apache.http.HttpStatus; diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/http/Generator.java similarity index 92% rename from modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java rename to modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/http/Generator.java index 2435a3170ca1..f469b169ac51 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/online/Generator.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/http/Generator.java @@ -1,12 +1,12 @@ -package io.swagger.generator.online; +package org.openapitools.codegen.online.http; import com.fasterxml.jackson.databind.JsonNode; -import io.swagger.codegen.*; -import io.swagger.generator.exception.ApiException; -import io.swagger.generator.exception.BadRequestException; -import io.swagger.generator.model.GeneratorInput; -import io.swagger.generator.model.InputOption; -import io.swagger.generator.util.ZipUtil; +import org.openapitools.codegen.*; +import org.openapitools.codegen.online.exception.ApiException; +import org.openapitools.codegen.online.exception.BadRequestException; +import org.openapitools.codegen.online.model.GeneratorInput; +import org.openapitools.codegen.online.model.InputOption; +import org.openapitools.codegen.online.util.ZipUtil; import io.swagger.models.Swagger; import io.swagger.models.auth.AuthorizationValue; import io.swagger.parser.SwaggerParser; @@ -86,7 +86,7 @@ public class Generator { swagger = new SwaggerParser().read(opts.getSwaggerUrl()); } } else { - throw new BadRequestException("No swagger specification was supplied"); + throw new BadRequestException("No OpenAPI specification was supplied"); } } else if (opts.getAuthorizationValue() != null) { List authorizationValues = new ArrayList(); @@ -96,7 +96,7 @@ public class Generator { swagger = new SwaggerParser().read(node, true); } if (swagger == null) { - throw new BadRequestException("The swagger specification supplied was not valid"); + throw new BadRequestException("The OpenAPI specification supplied was not valid"); } String destPath = null; diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/model/ApiResponse.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/ApiResponse.java similarity index 97% rename from modules/swagger-generator/src/main/java/io/swagger/generator/model/ApiResponse.java rename to modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/ApiResponse.java index 28d4bdc0b1ae..b086eda99e76 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/model/ApiResponse.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/ApiResponse.java @@ -12,7 +12,7 @@ * the License. */ -package io.swagger.generator.model; +package org.openapitools.codegen.online.model; import javax.xml.bind.annotation.XmlTransient; diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/model/Generated.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/Generated.java similarity index 95% rename from modules/swagger-generator/src/main/java/io/swagger/generator/model/Generated.java rename to modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/Generated.java index b1d68a5da17d..c806db5efcc6 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/model/Generated.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/Generated.java @@ -12,7 +12,7 @@ * the License. */ -package io.swagger.generator.model; +package org.openapitools.codegen.online.model; public class Generated { private String filename; diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/model/GeneratorInput.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/GeneratorInput.java similarity index 96% rename from modules/swagger-generator/src/main/java/io/swagger/generator/model/GeneratorInput.java rename to modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/GeneratorInput.java index 439c730c8bde..9f2699c0b490 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/model/GeneratorInput.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/GeneratorInput.java @@ -1,4 +1,4 @@ -package io.swagger.generator.model; +package org.openapitools.codegen.online.model; import com.fasterxml.jackson.databind.JsonNode; import io.swagger.annotations.ApiModelProperty; diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/model/InputOption.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/InputOption.java similarity index 97% rename from modules/swagger-generator/src/main/java/io/swagger/generator/model/InputOption.java rename to modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/InputOption.java index 371f21a9a8cd..1e072a5d30bb 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/model/InputOption.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/InputOption.java @@ -12,7 +12,7 @@ * the License. */ -package io.swagger.generator.model; +package org.openapitools.codegen.online.model; public class InputOption { private String name; diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/model/ResponseCode.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/ResponseCode.java similarity index 94% rename from modules/swagger-generator/src/main/java/io/swagger/generator/model/ResponseCode.java rename to modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/ResponseCode.java index 37f20c9c04cf..f21d86233572 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/model/ResponseCode.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/model/ResponseCode.java @@ -1,4 +1,4 @@ -package io.swagger.generator.model; +package org.openapitools.codegen.online.model; import io.swagger.annotations.ApiModelProperty; diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/ExceptionWriter.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/resource/ExceptionWriter.java similarity index 83% rename from modules/swagger-generator/src/main/java/io/swagger/generator/resource/ExceptionWriter.java rename to modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/resource/ExceptionWriter.java index e2fac57d7d07..eca58d7b50c0 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/ExceptionWriter.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/resource/ExceptionWriter.java @@ -1,10 +1,10 @@ -package io.swagger.generator.resource; +package org.openapitools.codegen.online.resource; -import io.swagger.generator.exception.ApiException; -import io.swagger.generator.exception.BadRequestException; -import io.swagger.generator.exception.NotFoundException; -import io.swagger.generator.model.ApiResponse; -import io.swagger.generator.util.ValidationException; +import org.openapitools.codegen.online.exception.ApiException; +import org.openapitools.codegen.online.exception.BadRequestException; +import org.openapitools.codegen.online.exception.NotFoundException; +import org.openapitools.codegen.online.model.ApiResponse; +import org.openapitools.codegen.online.util.ValidationException; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/resource/SwaggerResource.java similarity index 94% rename from modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java rename to modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/resource/SwaggerResource.java index 4220e1034a63..0a977afa1602 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/resource/SwaggerResource.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/resource/SwaggerResource.java @@ -1,17 +1,17 @@ -package io.swagger.generator.resource; +package org.openapitools.codegen.online.resource; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import io.swagger.codegen.CliOption; -import io.swagger.codegen.Codegen; -import io.swagger.codegen.CodegenConfig; -import io.swagger.codegen.CodegenType; -import io.swagger.generator.exception.BadRequestException; -import io.swagger.generator.model.Generated; -import io.swagger.generator.model.GeneratorInput; -import io.swagger.generator.model.ResponseCode; -import io.swagger.generator.online.Generator; +import org.openapitools.codegen.CliOption; +import org.openapitools.codegen.Codegen; +import org.openapitools.codegen.CodegenConfig; +import org.openapitools.codegen.CodegenType; +import org.openapitools.codegen.online.exception.BadRequestException; +import org.openapitools.codegen.online.model.Generated; +import org.openapitools.codegen.online.model.GeneratorInput; +import org.openapitools.codegen.online.model.ResponseCode; +import org.openapitools.codegen.online.http.Generator; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ApiOriginFilter.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/util/ApiOriginFilter.java similarity index 97% rename from modules/swagger-generator/src/main/java/io/swagger/generator/util/ApiOriginFilter.java rename to modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/util/ApiOriginFilter.java index b4eb8d92ff75..7939dcab4a35 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ApiOriginFilter.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/util/ApiOriginFilter.java @@ -12,7 +12,7 @@ * the License. */ -package io.swagger.generator.util; +package org.openapitools.codegen.online.util; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/util/JacksonJsonProvider.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/util/JacksonJsonProvider.java similarity index 91% rename from modules/swagger-generator/src/main/java/io/swagger/generator/util/JacksonJsonProvider.java rename to modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/util/JacksonJsonProvider.java index c26f11aa6d2f..f40f968878a4 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/util/JacksonJsonProvider.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/util/JacksonJsonProvider.java @@ -1,4 +1,4 @@ -package io.swagger.generator.util; +package org.openapitools.codegen.online.util; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationException.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/util/ValidationException.java similarity index 91% rename from modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationException.java rename to modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/util/ValidationException.java index 99eb397e9962..9de3c943b03e 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationException.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/util/ValidationException.java @@ -1,4 +1,4 @@ -package io.swagger.generator.util; +package org.openapitools.codegen.online.util; public class ValidationException extends Exception { private static final long serialVersionUID = 6861195361018260380L; diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationMessage.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/util/ValidationMessage.java similarity index 91% rename from modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationMessage.java rename to modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/util/ValidationMessage.java index 40b265625010..fc447981ced3 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ValidationMessage.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/util/ValidationMessage.java @@ -1,4 +1,4 @@ -package io.swagger.generator.util; +package org.openapitools.codegen.online.util; public class ValidationMessage { private String path, message, severity; diff --git a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ZipUtil.java b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/util/ZipUtil.java similarity index 98% rename from modules/swagger-generator/src/main/java/io/swagger/generator/util/ZipUtil.java rename to modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/util/ZipUtil.java index 80c1872b9993..06ca91f96c93 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/generator/util/ZipUtil.java +++ b/modules/openapi-generator-online/src/main/java/org/openapitools/codegen/online/util/ZipUtil.java @@ -12,7 +12,7 @@ * the License. */ -package io.swagger.generator.util; +package org.openapitools.codegen.online.util; import java.io.BufferedInputStream; import java.io.File; diff --git a/modules/swagger-generator/src/main/resources/logback.xml b/modules/openapi-generator-online/src/main/resources/logback.xml similarity index 100% rename from modules/swagger-generator/src/main/resources/logback.xml rename to modules/openapi-generator-online/src/main/resources/logback.xml diff --git a/modules/swagger-generator/src/main/resources/version.prop b/modules/openapi-generator-online/src/main/resources/version.prop similarity index 100% rename from modules/swagger-generator/src/main/resources/version.prop rename to modules/openapi-generator-online/src/main/resources/version.prop diff --git a/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml b/modules/openapi-generator-online/src/main/webapp/WEB-INF/web.xml similarity index 87% rename from modules/swagger-generator/src/main/webapp/WEB-INF/web.xml rename to modules/openapi-generator-online/src/main/webapp/WEB-INF/web.xml index 904e0e34fb0b..190c07f4bd5f 100644 --- a/modules/swagger-generator/src/main/webapp/WEB-INF/web.xml +++ b/modules/openapi-generator-online/src/main/webapp/WEB-INF/web.xml @@ -10,14 +10,14 @@ jersey.config.server.provider.packages io.swagger.jaxrs.json, - io.swagger.generator.resource + org.openapitools.codegen.online.resource jersey.config.server.provider.classnames io.swagger.online.ExceptionWriter, - io.swagger.generator.util.JacksonJsonProvider, + org.openapitools.codegen.online.util.JacksonJsonProvider, io.swagger.jaxrs.listing.ApiListingResource, io.swagger.jersey.listing.JerseyApiDeclarationProvider, io.swagger.jersey.listing.JerseyResourceListingProvider @@ -37,11 +37,11 @@ ApiOriginFilter - io.swagger.generator.util.ApiOriginFilter + org.openapitools.codegen.online.util.ApiOriginFilter Bootstrap - io.swagger.generator.Bootstrap + org.openapitools.codegen.online.Bootstrap generator.host localhost:8080 diff --git a/modules/swagger-generator/src/main/webapp/index.html b/modules/openapi-generator-online/src/main/webapp/index.html similarity index 100% rename from modules/swagger-generator/src/main/webapp/index.html rename to modules/openapi-generator-online/src/main/webapp/index.html diff --git a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java b/modules/openapi-generator-online/src/test/java/org/openapitools/codegen/online/OnlineGeneratorOptionsTest.java similarity index 94% rename from modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java rename to modules/openapi-generator-online/src/test/java/org/openapitools/codegen/online/OnlineGeneratorOptionsTest.java index c24307ea4fdb..8175db5381cc 100644 --- a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineGeneratorOptionsTest.java +++ b/modules/openapi-generator-online/src/test/java/org/openapitools/codegen/online/OnlineGeneratorOptionsTest.java @@ -1,17 +1,18 @@ -package io.swagger.generator.online; +package org.openapitools.codegen.online; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import io.swagger.codegen.CliOption; -import io.swagger.codegen.CodegenConfigLoader; -import io.swagger.codegen.CodegenConstants; -import io.swagger.codegen.languages.JavaClientCodegen; -import io.swagger.codegen.options.*; -import io.swagger.generator.exception.ApiException; -import io.swagger.generator.model.GeneratorInput; +import org.openapitools.codegen.CliOption; +import org.openapitools.codegen.CodegenConfigLoader; +import org.openapitools.codegen.CodegenConstants; +import org.openapitools.codegen.languages.JavaClientCodegen; +import org.openapitools.codegen.options.*; +import org.openapitools.codegen.online.exception.ApiException; +import org.openapitools.codegen.online.http.Generator; +import org.openapitools.codegen.online.model.GeneratorInput; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.testng.annotations.DataProvider; diff --git a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java b/modules/openapi-generator-online/src/test/java/org/openapitools/codegen/online/OnlineJavaClientOptionsTest.java similarity index 62% rename from modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java rename to modules/openapi-generator-online/src/test/java/org/openapitools/codegen/online/OnlineJavaClientOptionsTest.java index e3ad18ecbdcb..d6f2f72dc913 100644 --- a/modules/swagger-generator/src/test/java/io/swagger/generator/online/OnlineJavaClientOptionsTest.java +++ b/modules/openapi-generator-online/src/test/java/org/openapitools/codegen/online/OnlineJavaClientOptionsTest.java @@ -1,13 +1,14 @@ -package io.swagger.generator.online; +package org.openapitools.codegen.online; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import io.swagger.codegen.CliOption; -import io.swagger.codegen.CodegenConstants; -import io.swagger.codegen.languages.JavaClientCodegen; -import io.swagger.codegen.options.JavaOptionsProvider; -import io.swagger.generator.exception.ApiException; +import org.openapitools.codegen.CliOption; +import org.openapitools.codegen.CodegenConstants; +import org.openapitools.codegen.languages.JavaClientCodegen; +import org.openapitools.codegen.options.JavaOptionsProvider; +import org.openapitools.codegen.online.exception.ApiException; +import org.openapitools.codegen.online.http.Generator; import org.testng.annotations.Test; diff --git a/modules/swagger-generator/src/test/resources/petstore.json b/modules/openapi-generator-online/src/test/resources/petstore.json similarity index 100% rename from modules/swagger-generator/src/test/resources/petstore.json rename to modules/openapi-generator-online/src/test/resources/petstore.json diff --git a/modules/swagger-generator/src/test/java/io/swagger/generator/GeneratorInputTest.java b/modules/swagger-generator/src/test/java/io/swagger/generator/GeneratorInputTest.java deleted file mode 100644 index 6b6b22fd6756..000000000000 --- a/modules/swagger-generator/src/test/java/io/swagger/generator/GeneratorInputTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.swagger.generator; - -import io.swagger.generator.model.GeneratorInput; - -import org.testng.annotations.Test; - -@SuppressWarnings("static-method") -public class GeneratorInputTest { - - @Test(description = "write an object") - public void writeObjectTest() { - final GeneratorInput generatorInput = new GeneratorInput(); - generatorInput.setSwaggerUrl("http://petstore.swagger.io/v2/swagger.json"); - } -} diff --git a/pom.xml b/pom.xml index f1b0b74dd185..360fb275130c 100644 --- a/pom.xml +++ b/pom.xml @@ -860,8 +860,8 @@ modules/openapi-generator modules/openapi-generator-cli - + modules/openapi-generator-maven-plugin + modules/openapi-generator-online target/site