Merge pull request #105 from swagger-api/ticket-2485

Versioning and naming - refs #2485

Author: frantuma

java/java-dropwizard/pom.xml

@@ -1,6 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>io.swagger</groupId>
+    <groupId>io.swagger.samples.v3</groupId>
     <artifactId>swagger-samples-project</artifactId>
     <version>2.0.0</version>
     <relativePath>../..</relativePath>
@@ -140,7 +140,7 @@
       <artifactId>dropwizard-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>io.swagger</groupId>
+      <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-jaxrs2</artifactId>
       <version>${swagger-version}</version>
       <scope>compile</scope>

java/java-dropwizard/src/main/java/io/swagger/sample/SwaggerSampleApplication.java

@@ -5,12 +5,12 @@
 import io.dropwizard.Application;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
-import io.swagger.jaxrs2.integration.resources.OpenApiResource;
-import io.swagger.oas.integration.SwaggerConfiguration;
-import io.swagger.oas.models.OpenAPI;
-import io.swagger.oas.models.info.Contact;
-import io.swagger.oas.models.info.Info;
-import io.swagger.oas.models.info.License;
+import io.swagger.v3.jaxrs2.integration.resources.OpenApiResource;
+import io.swagger.v3.oas.integration.SwaggerConfiguration;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
 import io.swagger.sample.resource.PetResource;
 
 import java.util.stream.Collectors;

java/java-dropwizard/src/main/java/io/swagger/sample/model/Order.java

@@ -16,7 +16,7 @@
 
 package io.swagger.sample.model;
 
-import io.swagger.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.util.Date;
 

java/java-dropwizard/src/main/java/io/swagger/sample/model/Pet.java

@@ -16,7 +16,7 @@
 
 package io.swagger.sample.model;
 
-import io.swagger.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.util.List;
 import java.util.ArrayList;

java/java-dropwizard/src/main/java/io/swagger/sample/model/User.java

@@ -16,7 +16,7 @@
 
 package io.swagger.sample.model;
 
-import io.swagger.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import javax.xml.bind.annotation.*;
 

java/java-dropwizard/src/main/java/io/swagger/sample/resource/PetResource.java

@@ -16,11 +16,11 @@
 
 package io.swagger.sample.resource;
 
-import io.swagger.oas.annotations.Operation;
-import io.swagger.oas.annotations.Parameter;
-import io.swagger.oas.annotations.media.Content;
-import io.swagger.oas.annotations.media.Schema;
-import io.swagger.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.sample.data.PetData;
 import io.swagger.sample.model.Pet;
 

java/java-jersey2/pom.xml

@@ -1,12 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>io.swagger</groupId>
+    <groupId>io.swagger.samples.v3</groupId>
     <artifactId>swagger-samples-project</artifactId>
     <version>2.0.0</version>
     <relativePath>../..</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>io.swagger</groupId>
+  <groupId>io.swagger.samples.v3</groupId>
   <artifactId>swagger-jersey2-sample-app</artifactId>
   <packaging>war</packaging>
   <name>swagger-jersey2-jaxrs-app</name>
@@ -134,7 +134,7 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>io.swagger</groupId>
+      <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-jaxrs2</artifactId>
       <scope>compile</scope>
       <version>${swagger-version}</version>

java/java-jersey2/src/main/java/io/swagger/sample/Bootstrap.java

@@ -1,12 +1,12 @@
 package io.swagger.sample;
 
-import io.swagger.jaxrs2.integration.JaxrsOpenApiContextBuilder;
-import io.swagger.oas.integration.SwaggerConfiguration;
-import io.swagger.oas.integration.OpenApiConfigurationException;
-import io.swagger.oas.models.OpenAPI;
-import io.swagger.oas.models.info.Contact;
-import io.swagger.oas.models.info.Info;
-import io.swagger.oas.models.info.License;
+import io.swagger.v3.jaxrs2.integration.JaxrsOpenApiContextBuilder;
+import io.swagger.v3.oas.integration.SwaggerConfiguration;
+import io.swagger.v3.oas.integration.OpenApiConfigurationException;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;

java/java-jersey2/src/main/java/io/swagger/sample/MyApplication.java

@@ -0,0 +1,14 @@
+package io.swagger.sample;
+
+import org.glassfish.jersey.server.ResourceConfig;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/test")
+public class MyApplication extends ResourceConfig {
+
+    public MyApplication() {
+        super();
+    }
+}

java/java-jersey2/src/main/java/io/swagger/sample/model/AuthenticationInfo.java

@@ -1,6 +1,6 @@
 package io.swagger.sample.model;
 
-import io.swagger.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import javax.ws.rs.HeaderParam;
 

java/java-jersey2/src/main/java/io/swagger/sample/model/Order.java

@@ -16,7 +16,7 @@
 
 package io.swagger.sample.model;
 
-import io.swagger.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

java/java-jersey2/src/main/java/io/swagger/sample/model/Pet.java

@@ -16,7 +16,7 @@
 
 package io.swagger.sample.model;
 
-import io.swagger.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
@@ -33,6 +33,17 @@ public class Pet {
   private List<Tag> tags = new ArrayList<Tag>();
   private String status;
 
+  @Schema(required = true, example = "[2, 3]")
+  private int[] lorem;
+
+  public int[] getLorem() {
+    return lorem;
+  }
+
+  public void setLorem(int[] lorem) {
+    this.lorem = lorem;
+  }
+
   @XmlElement(name = "id")
   public long getId() {
     return id;

java/java-jersey2/src/main/java/io/swagger/sample/model/User.java

@@ -16,7 +16,7 @@
 
 package io.swagger.sample.model;
 
-import io.swagger.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.media.Schema;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

java/java-jersey2/src/main/java/io/swagger/sample/resource/Metadata.java

@@ -1,8 +1,8 @@
 package io.swagger.sample.resource;
 
 
-import io.swagger.oas.annotations.OpenAPIDefinition;
-import io.swagger.oas.annotations.info.Info;
+import io.swagger.v3.oas.annotations.OpenAPIDefinition;
+import io.swagger.v3.oas.annotations.info.Info;
 
 @OpenAPIDefinition(info = @Info(title = "My API", version = "1.2.3", description = "A sample API"))
 public class Metadata {

java/java-jersey2/src/main/java/io/swagger/sample/resource/PetResource.java

@@ -16,11 +16,11 @@
 
 package io.swagger.sample.resource;
 
-import io.swagger.oas.annotations.Operation;
-import io.swagger.oas.annotations.Parameter;
-import io.swagger.oas.annotations.media.Content;
-import io.swagger.oas.annotations.media.Schema;
-import io.swagger.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.sample.data.PetData;
 import io.swagger.sample.model.Pet;
 

java/java-jersey2/src/main/java/io/swagger/sample/resource/PetStoreResource.java

@@ -16,11 +16,11 @@
 
 package io.swagger.sample.resource;
 
-import io.swagger.oas.annotations.Operation;
-import io.swagger.oas.annotations.Parameter;
-import io.swagger.oas.annotations.media.Content;
-import io.swagger.oas.annotations.media.Schema;
-import io.swagger.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.sample.data.StoreData;
 import io.swagger.sample.model.AuthenticationInfo;
 import io.swagger.sample.model.Order;

java/java-jersey2/src/main/java/io/swagger/sample/resource/UserResource.java

@@ -16,11 +16,11 @@
 
 package io.swagger.sample.resource;
 
-import io.swagger.oas.annotations.Operation;
-import io.swagger.oas.annotations.Parameter;
-import io.swagger.oas.annotations.media.Content;
-import io.swagger.oas.annotations.media.Schema;
-import io.swagger.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.sample.data.UserData;
 import io.swagger.sample.exception.ApiException;
 import io.swagger.sample.model.User;

java/java-jersey2/src/main/java/io/swagger/sample/util/ApiAuthorizationFilterImpl.java

@@ -16,9 +16,9 @@
 
 package io.swagger.sample.util;
 
-import io.swagger.core.filter.AbstractSpecFilter;
-import io.swagger.model.ApiDescription;
-import io.swagger.oas.models.Operation;
+import io.swagger.v3.core.filter.AbstractSpecFilter;
+import io.swagger.v3.core.model.ApiDescription;
+import io.swagger.v3.oas.models.Operation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

java/java-jersey2/src/main/java/io/swagger/sample/util/JsonProvider.java

@@ -1,7 +1,7 @@
 package io.swagger.sample.util;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.swagger.util.Json;
+import io.swagger.v3.core.util.Json;
 
 import javax.ws.rs.ext.ContextResolver;
 import javax.ws.rs.ext.Provider;

java/java-jersey2/src/main/webapp/WEB-INF/web.xml

@@ -12,14 +12,14 @@
     </init-param>
     <init-param>
       <param-name>jersey.config.server.provider.packages</param-name>
-      <!-- adding 'io.swagger.jaxrs2.integration.resources' is sufficent on it own to register the following paths:
+      <!-- adding 'io.swagger.v3.jaxrs2.integration.resources' is sufficent on it own to register the following paths:
       /openapi.json : OpenApi spec in json
       /openapi.yaml : OpenApi spec in yaml
       /openapi (Accept:  : "application/json" : OpenApi spec in json
       /openapi (Accept:  : "application/yaml" : OpenApi spec in yaml
       -->
       <param-value>
-        com.fasterxml.jackson.jaxrs.json,io.swagger.jaxrs2.integration.resources,io.swagger.sample.resource
+        com.fasterxml.jackson.jaxrs.json,io.swagger.v3.jaxrs2.integration.resources,io.swagger.sample.resource
       </param-value>
 
       <!--
@@ -28,12 +28,18 @@
             </param-value>
       -->
     </init-param>
+<!--
+    <init-param>
+      <param-name>javax.ws.rs.Application</param-name>
+      <param-value>io.swagger.sample.MyApplication</param-value>
+    </init-param>
+-->
     <!-- alternatively specify resources classes
     <init-param>
       <param-name>jersey.config.server.provider.classnames</param-name>
 
       <param-value>
-        io.swagger.jaxrs2.integration.resources.OpenApiResource,
+        io.swagger.v3.jaxrs2.integration.resources.OpenApiResource,
         io.swagger.sample.resource.PetResource,
         io.swagger.sample.resource.UserResource
       </param-value>
@@ -64,7 +70,7 @@
   <servlet>
     <!-- use OpenApi servlet to serve spec -->
     <servlet-name>OpenApi</servlet-name>
-    <servlet-class>io.swagger.jaxrs2.integration.OpenApiServlet</servlet-class>
+    <servlet-class>io.swagger.v3.jaxrs2.integration.OpenApiServlet</servlet-class>
 
 <!-- alternatively specify resource package
     <init-param>

pom.xml

@@ -5,7 +5,7 @@
     <version>5</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>io.swagger</groupId>
+  <groupId>io.swagger.samples.v3</groupId>
   <artifactId>swagger-samples-project</artifactId>
   <packaging>pom</packaging>
   <name>swagger-samples</name>