From 568ca267471fc70f3289afaa63a5f90aeeb92ac0 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Sat, 4 Apr 2015 11:53:02 -0700 Subject: [PATCH] renamed folder --- ...degen.java => SpringMVCServerCodegen.java} | 28 +++++++++---------- .../README.mustache | 0 .../api.mustache | 0 .../apiException.mustache} | 0 .../apiOriginFilter.mustache} | 0 .../apiResponseMessage.mustache} | 0 .../bodyParams.mustache | 0 .../formParams.mustache | 0 .../headerParams.mustache | 0 .../model.mustache | 0 .../notFoundException.mustache} | 0 .../pathParams.mustache | 0 .../pom.mustache | 0 .../project/build.properties | 0 .../project/plugins.sbt | 0 .../queryParams.mustache | 0 .../swagger.properties | 0 .../swaggerConfig.mustache} | 0 .../webApplication.mustache | 0 .../webMvcConfiguration.mustache | 0 .../com.wordnik.swagger.codegen.CodegenConfig | 2 +- .../main/resources/htmlDocs/index.mustache | 2 +- .../src/test/scala/SwaggerMigratorTest.scala | 5 +++- 23 files changed, 20 insertions(+), 17 deletions(-) rename modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/{SpringfoxServerCodegen.java => SpringMVCServerCodegen.java} (92%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox => JavaSpringMVC}/README.mustache (100%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox => JavaSpringMVC}/api.mustache (100%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox/ApiException.mustache => JavaSpringMVC/apiException.mustache} (100%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox/ApiOriginFilter.mustache => JavaSpringMVC/apiOriginFilter.mustache} (100%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox/ApiResponseMessage.mustache => JavaSpringMVC/apiResponseMessage.mustache} (100%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox => JavaSpringMVC}/bodyParams.mustache (100%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox => JavaSpringMVC}/formParams.mustache (100%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox => JavaSpringMVC}/headerParams.mustache (100%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox => JavaSpringMVC}/model.mustache (100%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox/NotFoundException.mustache => JavaSpringMVC/notFoundException.mustache} (100%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox => JavaSpringMVC}/pathParams.mustache (100%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox => JavaSpringMVC}/pom.mustache (100%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox => JavaSpringMVC}/project/build.properties (100%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox => JavaSpringMVC}/project/plugins.sbt (100%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox => JavaSpringMVC}/queryParams.mustache (100%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox => JavaSpringMVC}/swagger.properties (100%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox/SwaggerConfig.mustache => JavaSpringMVC/swaggerConfig.mustache} (100%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox => JavaSpringMVC}/webApplication.mustache (100%) rename modules/swagger-codegen/src/main/resources/{JavaSpringfox => JavaSpringMVC}/webMvcConfiguration.mustache (100%) diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringfoxServerCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringMVCServerCodegen.java similarity index 92% rename from modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringfoxServerCodegen.java rename to modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringMVCServerCodegen.java index 0f210a33b3e0..48b515c47172 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringfoxServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SpringMVCServerCodegen.java @@ -9,7 +9,7 @@ import com.wordnik.swagger.models.properties.*; import java.util.*; import java.io.File; -public class SpringfoxServerCodegen extends JavaClientCodegen implements CodegenConfig { +public class SpringMVCServerCodegen extends JavaClientCodegen implements CodegenConfig { protected String invokerPackage = "io.swagger.api"; protected String groupId = "io.swagger"; protected String artifactId = "swagger-server"; @@ -24,19 +24,19 @@ public class SpringfoxServerCodegen extends JavaClientCodegen implements Codegen } public String getName() { - return "springfox"; + return "spring-mvc"; } public String getHelp() { - return "Generates a Java Springfox Server application."; + return "Generates a Java Spring-MVC Server application using the SpringFox integration."; } - public SpringfoxServerCodegen() { + public SpringMVCServerCodegen() { super(); - outputFolder = "generated-code/javaSpringfox"; + outputFolder = "generated-code/javaSpringMVC"; modelTemplateFiles.put("model.mustache", ".java"); apiTemplateFiles.put("api.mustache", ".java"); - templateDir = "JavaSpringfox"; + templateDir = "JavaSpringMVC"; apiPackage = "io.swagger.api"; modelPackage = "io.swagger.model"; configPackage = "io.swagger.configuration"; @@ -72,14 +72,14 @@ public class SpringfoxServerCodegen extends JavaClientCodegen implements Codegen ("src.main.resources").replace(".", java.io.File.separator), "swagger.properties")); languageSpecificPrimitives = new HashSet( - Arrays.asList( - "String", - "boolean", - "Boolean", - "Double", - "Integer", - "Long", - "Float") + Arrays.asList( + "String", + "boolean", + "Boolean", + "Double", + "Integer", + "Long", + "Float") ); } diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/README.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/README.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/README.mustache rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/README.mustache diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/api.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/api.mustache rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/api.mustache diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/ApiException.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiException.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/ApiException.mustache rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiException.mustache diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/ApiOriginFilter.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiOriginFilter.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/ApiOriginFilter.mustache rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiOriginFilter.mustache diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/ApiResponseMessage.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiResponseMessage.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/ApiResponseMessage.mustache rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/apiResponseMessage.mustache diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/bodyParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/bodyParams.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/bodyParams.mustache rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/bodyParams.mustache diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/formParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/formParams.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/formParams.mustache rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/formParams.mustache diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/headerParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/headerParams.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/headerParams.mustache rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/headerParams.mustache diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/model.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/model.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/model.mustache rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/model.mustache diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/NotFoundException.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/notFoundException.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/NotFoundException.mustache rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/notFoundException.mustache diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/pathParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pathParams.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/pathParams.mustache rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/pathParams.mustache diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/pom.mustache rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/project/build.properties b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/project/build.properties similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/project/build.properties rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/project/build.properties diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/project/plugins.sbt b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/project/plugins.sbt similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/project/plugins.sbt rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/project/plugins.sbt diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/queryParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/queryParams.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/queryParams.mustache rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/queryParams.mustache diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/swagger.properties b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swagger.properties similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/swagger.properties rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/swagger.properties diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/SwaggerConfig.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerConfig.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/SwaggerConfig.mustache rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/swaggerConfig.mustache diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/webApplication.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webApplication.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/webApplication.mustache rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/webApplication.mustache diff --git a/modules/swagger-codegen/src/main/resources/JavaSpringfox/webMvcConfiguration.mustache b/modules/swagger-codegen/src/main/resources/JavaSpringMVC/webMvcConfiguration.mustache similarity index 100% rename from modules/swagger-codegen/src/main/resources/JavaSpringfox/webMvcConfiguration.mustache rename to modules/swagger-codegen/src/main/resources/JavaSpringMVC/webMvcConfiguration.mustache diff --git a/modules/swagger-codegen/src/main/resources/META-INF/services/com.wordnik.swagger.codegen.CodegenConfig b/modules/swagger-codegen/src/main/resources/META-INF/services/com.wordnik.swagger.codegen.CodegenConfig index 6535948ad88c..a888ec169243 100644 --- a/modules/swagger-codegen/src/main/resources/META-INF/services/com.wordnik.swagger.codegen.CodegenConfig +++ b/modules/swagger-codegen/src/main/resources/META-INF/services/com.wordnik.swagger.codegen.CodegenConfig @@ -10,7 +10,7 @@ com.wordnik.swagger.codegen.languages.PythonClientCodegen com.wordnik.swagger.codegen.languages.RubyClientCodegen com.wordnik.swagger.codegen.languages.ScalaClientCodegen com.wordnik.swagger.codegen.languages.ScalatraServerCodegen -com.wordnik.swagger.codegen.languages.SpringfoxServerCodegen +com.wordnik.swagger.codegen.languages.SpringMVCServerCodegen com.wordnik.swagger.codegen.languages.StaticDocCodegen com.wordnik.swagger.codegen.languages.StaticHtmlGenerator com.wordnik.swagger.codegen.languages.SwaggerGenerator diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache index dd2a573d751a..8e2282579516 100644 --- a/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache +++ b/modules/swagger-codegen/src/main/resources/htmlDocs/index.mustache @@ -13,7 +13,7 @@
{{{licenseInfo}}}
{{{licenseUrl}}}

Access

-
Access to the API requires an api key to be provided by {{partner}} for all requests. The api key is passed as a header with the name `api_key` and the value provided by Reverb Technologies, Inc. Unless otherwise agreed upon, access to the Reverb API is intended solely for usage by {{partner}} and not third parties.
+
Customize this message as you see fit!

Methods

{{#apiInfo}} {{#apis}} diff --git a/modules/swagger-codegen/src/test/scala/SwaggerMigratorTest.scala b/modules/swagger-codegen/src/test/scala/SwaggerMigratorTest.scala index 8051e84e660a..b05059a218a5 100644 --- a/modules/swagger-codegen/src/test/scala/SwaggerMigratorTest.scala +++ b/modules/swagger-codegen/src/test/scala/SwaggerMigratorTest.scala @@ -1,6 +1,8 @@ import com.wordnik.swagger.models._ import io.swagger.parser._ +import com.wordnik.swagger.util.Json + import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner import org.scalatest.FlatSpec @@ -14,6 +16,7 @@ class SwaggerMigratorTest extends FlatSpec with Matchers { it should "read a 1.2 spec" in { val loader = new SwaggerParser() - loader.read("src/test/resources/1_2/petstore-1.2/api-docs") + val swagger = loader.read("src/test/resources/1_2/petstore-1.2/api-docs") + Json.prettyPrint(swagger) } } \ No newline at end of file