[springfox#667] Renaming springfox-swagger 1.2 module and package nam…

…espace. Renaming springfox-swagger module to springfox-swagger1
jjnnzb · Apr 12, 2015 · 86fd802 · 86fd802
1 parent 7464ada
commit 86fd802
Show file tree

Hide file tree

Showing 128 changed files with 322 additions and 294 deletions.
diff --git a/README.md b/README.md
@@ -62,7 +62,7 @@ __Maven__
 <!-- for swagger spec 1.2 optionally -->
 <dependency>
     <groupId>io.springfox</groupId>
-    <artifactId>springfox-swagger</artifactId>
+    <artifactId>springfox-swagger1</artifactId>
     <version>2.0.0</version>
 </dependency>
 ```
@@ -81,7 +81,7 @@ compile "io.springfox:springfox-schema:2.0.0"
 compile "io.springfox:springfox-spring-web:2.0.0"
 compile "io.springfox:springfox-swagger2:2.0.0"
 //Optional for swagger 1.2
-compile "io.springfox:springfox-swagger:2.0.0"
+compile "io.springfox:springfox-swagger1:2.0.0"
 ```
 
 #### Snapshot version
@@ -120,7 +120,7 @@ __Maven__
 <!-- for swagger 1.2 optionally -->
 <dependency>
     <groupId>io.springfox</groupId>
-    <artifactId>springfox-swagger</artifactId>
+    <artifactId>springfox-swagger1</artifactId>
     <version>2.0.0-SNAPSHOT</version>
 </dependency>
 ```

diff --git a/settings.gradle b/settings.gradle
@@ -4,7 +4,7 @@ include 'springfox-spi'
 include 'springfox-schema'
 include 'springfox-spring-web'
 include 'springfox-swagger-common'
-include 'springfox-swagger'
+include 'springfox-swagger1'
 include 'springfox-swagger2'
 include 'springfox-swagger-ui'
 include 'swagger-contract-tests'

diff --git a/...agger-common/src/main/java/springfox/documentation/swagger/web/ApiResourceController.java b/...agger-common/src/main/java/springfox/documentation/swagger/web/ApiResourceController.java
@@ -51,7 +51,7 @@ public class ApiResourceController {
   @RequestMapping(value = "/swagger-resources")
   @ResponseBody
   ResponseEntity<List<SwaggerResource>> swaggerResources() {
-    Class swagger1Controller = classOrNull("springfox.documentation.swagger.web.DefaultSwaggerController");
+    Class swagger1Controller = classOrNull("springfox.documentation.swagger1.web.DefaultSwaggerController");
     Class swagger2Controller = classOrNull("springfox.documentation.swagger2.web.Swagger2Controller");
 
     List<SwaggerResource> resources = new ArrayList<SwaggerResource>();

diff --git a/springfox-swagger/build.gradle → springfox-swagger1/build.gradle b/springfox-swagger/build.gradle → springfox-swagger1/build.gradle
diff --git a/...on/swagger/annotations/EnableSwagger.java → ...n/swagger1/annotations/EnableSwagger.java b/...on/swagger/annotations/EnableSwagger.java → ...n/swagger1/annotations/EnableSwagger.java
@@ -17,10 +17,10 @@
  *
  */
 
-package springfox.documentation.swagger.annotations;
+package springfox.documentation.swagger1.annotations;
 
 import org.springframework.context.annotation.Import;
-import springfox.documentation.swagger.configuration.SwaggerSpringMvcDocumentationConfiguration;
+import springfox.documentation.swagger1.configuration.SwaggerSpringMvcDocumentationConfiguration;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

diff --git a/...r/configuration/SwaggerJacksonModule.java → ...1/configuration/SwaggerJacksonModule.java b/...r/configuration/SwaggerJacksonModule.java → ...1/configuration/SwaggerJacksonModule.java
@@ -17,40 +17,40 @@
  *
  */
 
-package springfox.documentation.swagger.configuration;
+package springfox.documentation.swagger1.configuration;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import springfox.documentation.swagger.dto.AllowableListValues;
-import springfox.documentation.swagger.dto.AllowableRangeValues;
-import springfox.documentation.swagger.dto.ApiDescription;
-import springfox.documentation.swagger.dto.ApiInfo;
-import springfox.documentation.swagger.dto.ApiKey;
-import springfox.documentation.swagger.dto.ApiListing;
-import springfox.documentation.swagger.dto.ApiListingReference;
-import springfox.documentation.swagger.dto.Authorization;
-import springfox.documentation.swagger.dto.AuthorizationCodeGrant;
-import springfox.documentation.swagger.dto.AuthorizationScope;
-import springfox.documentation.swagger.dto.BasicAuth;
-import springfox.documentation.swagger.dto.ContainerDataType;
-import springfox.documentation.swagger.dto.DataType;
-import springfox.documentation.swagger.dto.ImplicitGrant;
-import springfox.documentation.swagger.dto.LoginEndpoint;
-import springfox.documentation.swagger.dto.ModelDto;
-import springfox.documentation.swagger.dto.ModelPropertyDto;
-import springfox.documentation.swagger.dto.OAuth;
-import springfox.documentation.swagger.dto.Parameter;
-import springfox.documentation.swagger.dto.PrimitiveDataType;
-import springfox.documentation.swagger.dto.PrimitiveFormatDataType;
-import springfox.documentation.swagger.dto.ReferenceDataType;
-import springfox.documentation.swagger.dto.ResourceListing;
-import springfox.documentation.swagger.dto.ResponseMessage;
-import springfox.documentation.swagger.dto.TokenEndpoint;
-import springfox.documentation.swagger.dto.TokenRequestEndpoint;
+import springfox.documentation.swagger1.dto.AllowableListValues;
+import springfox.documentation.swagger1.dto.AllowableRangeValues;
+import springfox.documentation.swagger1.dto.ApiDescription;
+import springfox.documentation.swagger1.dto.ApiInfo;
+import springfox.documentation.swagger1.dto.ApiKey;
+import springfox.documentation.swagger1.dto.ApiListing;
+import springfox.documentation.swagger1.dto.ApiListingReference;
+import springfox.documentation.swagger1.dto.Authorization;
+import springfox.documentation.swagger1.dto.AuthorizationCodeGrant;
+import springfox.documentation.swagger1.dto.AuthorizationScope;
+import springfox.documentation.swagger1.dto.BasicAuth;
+import springfox.documentation.swagger1.dto.ContainerDataType;
+import springfox.documentation.swagger1.dto.DataType;
+import springfox.documentation.swagger1.dto.ImplicitGrant;
+import springfox.documentation.swagger1.dto.LoginEndpoint;
+import springfox.documentation.swagger1.dto.ModelDto;
+import springfox.documentation.swagger1.dto.ModelPropertyDto;
+import springfox.documentation.swagger1.dto.OAuth;
+import springfox.documentation.swagger1.dto.Parameter;
+import springfox.documentation.swagger1.dto.PrimitiveDataType;
+import springfox.documentation.swagger1.dto.PrimitiveFormatDataType;
+import springfox.documentation.swagger1.dto.ReferenceDataType;
+import springfox.documentation.swagger1.dto.ResourceListing;
+import springfox.documentation.swagger1.dto.ResponseMessage;
+import springfox.documentation.swagger1.dto.TokenEndpoint;
+import springfox.documentation.swagger1.dto.TokenRequestEndpoint;
 
 public class SwaggerJacksonModule extends SimpleModule {
 

diff --git a/...rSpringMvcDocumentationConfiguration.java → ...rSpringMvcDocumentationConfiguration.java b/...rSpringMvcDocumentationConfiguration.java → ...rSpringMvcDocumentationConfiguration.java
@@ -17,25 +17,26 @@
  *
  */
 
-package springfox.documentation.swagger.configuration;
+package springfox.documentation.swagger1.configuration;
 
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import springfox.documentation.schema.configuration.ObjectMapperConfigured;
 import springfox.documentation.spring.web.SpringMvcDocumentationConfiguration;
+import springfox.documentation.swagger.configuration.SwaggerCommonConfiguration;
 
-import static springfox.documentation.swagger.configuration.SwaggerJacksonModule.*;
+import static springfox.documentation.swagger1.configuration.SwaggerJacksonModule.*;
 
 @Configuration
 @Import({ SpringMvcDocumentationConfiguration.class, SwaggerCommonConfiguration.class})
 @ComponentScan(basePackages = {
-    "springfox.documentation.swagger.schema",
-    "springfox.documentation.swagger.web",
-    "springfox.documentation.swagger.readers.operation",
-    "springfox.documentation.swagger.readers.parameter",
-    "springfox.documentation.swagger.mappers"
+        "springfox.documentation.swagger1.schema",
+        "springfox.documentation.swagger1.web",
+        "springfox.documentation.swagger1.readers.operation",
+        "springfox.documentation.swagger1.readers.parameter",
+        "springfox.documentation.swagger1.mappers",
 })
 public class SwaggerSpringMvcDocumentationConfiguration implements ApplicationListener<ObjectMapperConfigured> {
   @Override

diff --git a/...tion/swagger/dto/AllowableListValues.java → ...ion/swagger1/dto/AllowableListValues.java b/...tion/swagger/dto/AllowableListValues.java → ...ion/swagger1/dto/AllowableListValues.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/...ion/swagger/dto/AllowableRangeValues.java → ...on/swagger1/dto/AllowableRangeValues.java b/...ion/swagger/dto/AllowableRangeValues.java → ...on/swagger1/dto/AllowableRangeValues.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...entation/swagger/dto/AllowableValues.java → ...ntation/swagger1/dto/AllowableValues.java b/...entation/swagger/dto/AllowableValues.java → ...ntation/swagger1/dto/AllowableValues.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 

diff --git a/...mentation/swagger/dto/ApiDescription.java → ...entation/swagger1/dto/ApiDescription.java b/...mentation/swagger/dto/ApiDescription.java → ...entation/swagger1/dto/ApiDescription.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;

diff --git a/...ox/documentation/swagger/dto/ApiInfo.java → ...x/documentation/swagger1/dto/ApiInfo.java b/...ox/documentation/swagger/dto/ApiInfo.java → ...x/documentation/swagger1/dto/ApiInfo.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 public class ApiInfo {
 

diff --git a/...fox/documentation/swagger/dto/ApiKey.java → ...ox/documentation/swagger1/dto/ApiKey.java b/...fox/documentation/swagger/dto/ApiKey.java → ...ox/documentation/swagger1/dto/ApiKey.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 public class ApiKey extends AuthorizationType {
   private String keyname;

diff --git a/...documentation/swagger/dto/ApiListing.java → ...ocumentation/swagger1/dto/ApiListing.java b/...documentation/swagger/dto/ApiListing.java → ...ocumentation/swagger1/dto/ApiListing.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/...tion/swagger/dto/ApiListingReference.java → ...ion/swagger1/dto/ApiListingReference.java b/...tion/swagger/dto/ApiListingReference.java → ...ion/swagger1/dto/ApiListingReference.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 public class ApiListingReference {
   private String path;

diff --git a/...umentation/swagger/dto/Authorization.java → ...mentation/swagger1/dto/Authorization.java b/...umentation/swagger/dto/Authorization.java → ...mentation/swagger1/dto/Authorization.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 import java.util.List;
 

diff --git a/...n/swagger/dto/AuthorizationCodeGrant.java → .../swagger1/dto/AuthorizationCodeGrant.java b/...n/swagger/dto/AuthorizationCodeGrant.java → .../swagger1/dto/AuthorizationCodeGrant.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 public class AuthorizationCodeGrant extends GrantType {
 

diff --git a/...ation/swagger/dto/AuthorizationScope.java → ...tion/swagger1/dto/AuthorizationScope.java b/...ation/swagger/dto/AuthorizationScope.java → ...tion/swagger1/dto/AuthorizationScope.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 public class AuthorizationScope {
   private String scope;

diff --git a/...tation/swagger/dto/AuthorizationType.java → ...ation/swagger1/dto/AuthorizationType.java b/...tation/swagger/dto/AuthorizationType.java → ...ation/swagger1/dto/AuthorizationType.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 public abstract class AuthorizationType {
   protected final String type;

diff --git a/.../documentation/swagger/dto/BasicAuth.java → ...documentation/swagger1/dto/BasicAuth.java b/.../documentation/swagger/dto/BasicAuth.java → ...documentation/swagger1/dto/BasicAuth.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 public class BasicAuth extends AuthorizationType {
   public BasicAuth() {

diff --git a/...tation/swagger/dto/ContainerDataType.java → ...ation/swagger1/dto/ContainerDataType.java b/...tation/swagger/dto/ContainerDataType.java → ...ation/swagger1/dto/ContainerDataType.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...x/documentation/swagger/dto/DataType.java → .../documentation/swagger1/dto/DataType.java b/...x/documentation/swagger/dto/DataType.java → .../documentation/swagger1/dto/DataType.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;

diff --git a/.../documentation/swagger/dto/GrantType.java → ...documentation/swagger1/dto/GrantType.java b/.../documentation/swagger/dto/GrantType.java → ...documentation/swagger1/dto/GrantType.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 public class GrantType {
   private String type;

diff --git a/...umentation/swagger/dto/ImplicitGrant.java → ...mentation/swagger1/dto/ImplicitGrant.java b/...umentation/swagger/dto/ImplicitGrant.java → ...mentation/swagger1/dto/ImplicitGrant.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 
 public class ImplicitGrant extends GrantType {

diff --git a/...umentation/swagger/dto/LoginEndpoint.java → ...mentation/swagger1/dto/LoginEndpoint.java b/...umentation/swagger/dto/LoginEndpoint.java → ...mentation/swagger1/dto/LoginEndpoint.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 public class LoginEndpoint {
   private String url;

diff --git a/...x/documentation/swagger/dto/ModelDto.java → .../documentation/swagger1/dto/ModelDto.java b/...x/documentation/swagger/dto/ModelDto.java → .../documentation/swagger1/dto/ModelDto.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/...ntation/swagger/dto/ModelPropertyDto.java → ...tation/swagger1/dto/ModelPropertyDto.java b/...ntation/swagger/dto/ModelPropertyDto.java → ...tation/swagger1/dto/ModelPropertyDto.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/...gfox/documentation/swagger/dto/OAuth.java → ...fox/documentation/swagger1/dto/OAuth.java b/...gfox/documentation/swagger/dto/OAuth.java → ...fox/documentation/swagger1/dto/OAuth.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

diff --git a/.../documentation/swagger/dto/Operation.java → ...documentation/swagger1/dto/Operation.java b/.../documentation/swagger/dto/Operation.java → ...documentation/swagger1/dto/Operation.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;

diff --git a/.../documentation/swagger/dto/Parameter.java → ...documentation/swagger1/dto/Parameter.java b/.../documentation/swagger/dto/Parameter.java → ...documentation/swagger1/dto/Parameter.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;

diff --git a/...tation/swagger/dto/PrimitiveDataType.java → ...ation/swagger1/dto/PrimitiveDataType.java b/...tation/swagger/dto/PrimitiveDataType.java → ...ation/swagger1/dto/PrimitiveDataType.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 public class PrimitiveDataType implements SwaggerDataType {
   private String type;

diff --git a/.../swagger/dto/PrimitiveFormatDataType.java → ...swagger1/dto/PrimitiveFormatDataType.java b/.../swagger/dto/PrimitiveFormatDataType.java → ...swagger1/dto/PrimitiveFormatDataType.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 
 public class PrimitiveFormatDataType implements SwaggerDataType {

diff --git a/...tation/swagger/dto/ReferenceDataType.java → ...ation/swagger1/dto/ReferenceDataType.java b/...tation/swagger/dto/ReferenceDataType.java → ...ation/swagger1/dto/ReferenceDataType.java
@@ -17,7 +17,7 @@
  *
  */
 
-package springfox.documentation.swagger.dto;
+package springfox.documentation.swagger1.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ @@
      *
      */
-    package springfox.documentation.swagger.dto;
+    package springfox.documentation.swagger1.dto;
     import com.fasterxml.jackson.annotation.JsonProperty;
@@ Expand Down @@