swagger-api · frantuma · Apr 11, 2019 · Feb 27, 2019 · Mar 20, 2019 · Mar 21, 2019
diff --git a/java/inflector-dropwizard-guice/pom.xml b/java/inflector-dropwizard-guice/pom.xml
@@ -30,8 +30,9 @@
 
         <dropwizard-version>1.3.1</dropwizard-version>
         <inflector-version>2.0.0-SNAPSHOT</inflector-version>
-        <jackson.version>2.9.5</jackson.version>
+        <jackson.version>2.9.8</jackson.version>
         <jersey2.version>2.23.1</jersey2.version>
+        <swagger-core-version>2.0.8-SNAPSHOT</swagger-core-version>
     </properties>
 
     <dependencies>
@@ -162,6 +163,12 @@
             <version>${jackson.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-core</artifactId>
+            <version>${swagger-core-version}</version>
+        </dependency>
+
     </dependencies>
 
     <build>

diff --git a/java/inflector-dropwizard/pom.xml b/java/inflector-dropwizard/pom.xml
@@ -30,8 +30,9 @@
 
         <dropwizard-version>1.3.1</dropwizard-version>
         <inflector-version>2.0.0-SNAPSHOT</inflector-version>
-        <jackson.version>2.9.5</jackson.version>
+        <jackson.version>2.9.8</jackson.version>
         <jersey2.version>2.25.1</jersey2.version>
+        <swagger-core-version>2.0.8-SNAPSHOT</swagger-core-version>
     </properties>
 
     <dependencies>
@@ -113,6 +114,11 @@
             <version>${jackson.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-core</artifactId>
+            <version>${swagger-core-version}</version>
+        </dependency>
     </dependencies>
 
 

diff --git a/java/inflector-jetty-webxml/pom.xml b/java/inflector-jetty-webxml/pom.xml
@@ -115,6 +115,11 @@
             <artifactId>swagger-inflector</artifactId>
             <version>${inflector-version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-core</artifactId>
+            <version>${swagger-core-version}</version>
+        </dependency>
     </dependencies>
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -126,5 +131,6 @@
         <inflector-version>2.0.0-SNAPSHOT</inflector-version>
         <junit-version>4.8.2</junit-version>
         <slf4j-version>1.6.3</slf4j-version>
+        <swagger-core-version>2.0.8-SNAPSHOT</swagger-core-version>
     </properties>
 </project>
diff --git a/java/java-dropwizard/pom.xml b/java/java-dropwizard/pom.xml
@@ -150,5 +150,18 @@
       <version>${swagger-version}</version>
       <scope>compile</scope>
     </dependency>
+
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>${jackson-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.media</groupId>
+      <artifactId>jersey-media-json-jackson</artifactId>
+      <version>${jersey2-version}</version>
+    </dependency>
+
   </dependencies>
 </project>
diff --git a/java/java-dropwizard/src/main/java/io/swagger/sample/SwaggerSampleApplication.java b/java/java-dropwizard/src/main/java/io/swagger/sample/SwaggerSampleApplication.java
@@ -13,7 +13,10 @@
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.info.License;
 import io.swagger.sample.resource.PetResource;
+import io.swagger.v3.oas.models.servers.Server;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -50,6 +53,9 @@ public void run(SwaggerSampleConfiguration configuration, Environment environmen
                     .url("http://www.apache.org/licenses/LICENSE-2.0.html"));
 
     oas.info(info);
+    List<Server> servers = new ArrayList<>();
+    servers.add(new Server().url("/api"));
+    oas.servers(servers);
     SwaggerConfiguration oasConfig = new SwaggerConfiguration()
             .openAPI(oas)
             .prettyPrint(true)

diff --git a/java/java-jaxrs2-openapiservlet/src/main/java/io/swagger/sample/resource/Metadata.java b/java/java-jaxrs2-openapiservlet/src/main/java/io/swagger/sample/resource/Metadata.java
@@ -3,7 +3,9 @@
 
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.info.Info;
+import io.swagger.v3.oas.annotations.servers.Server;
 
-@OpenAPIDefinition(info = @Info(title = "My API", version = "1.2.3", description = "A sample API"))
+@OpenAPIDefinition(info = @Info(title = "My API", version = "1.2.3", description = "A sample API"),
+        servers = @Server(url = "/openapi"))
 public class Metadata {
 }
diff --git a/java/java-jaxrs2-openapiservlet/src/main/webapp/index.html b/java/java-jaxrs2-openapiservlet/src/main/webapp/index.html
@@ -0,0 +1,92 @@
+<!-- HTML for static distribution bundle build -->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Swagger UI</title>
+  <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
+  <link rel="stylesheet" type="text/css" href="./swagger-ui.css" >
+  <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
+  <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
+  <style>
+    html
+    {
+      box-sizing: border-box;
+      overflow: -moz-scrollbars-vertical;
+      overflow-y: scroll;
+    }
+    *,
+    *:before,
+    *:after
+    {
+      box-sizing: inherit;
+    }
+    body {
+      margin:0;
+      background: #fafafa;
+    }
+  </style>
+</head>
+
+<body>
+
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
+  <defs>
+    <symbol viewBox="0 0 20 20" id="unlocked">
+      <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
+    </symbol>
+
+    <symbol viewBox="0 0 20 20" id="locked">
+      <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
+    </symbol>
+
+    <symbol viewBox="0 0 20 20" id="close">
+      <path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
+    </symbol>
+
+    <symbol viewBox="0 0 20 20" id="large-arrow">
+      <path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
+    </symbol>
+
+    <symbol viewBox="0 0 20 20" id="large-arrow-down">
+      <path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
+    </symbol>
+
+
+    <symbol viewBox="0 0 24 24" id="jump-to">
+      <path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
+    </symbol>
+
+    <symbol viewBox="0 0 24 24" id="expand">
+      <path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
+    </symbol>
+
+  </defs>
+</svg>
+
+<div id="swagger-ui"></div>
+
+<script src="./swagger-ui-bundle.js"> </script>
+<script src="./swagger-ui-standalone-preset.js"> </script>
+<script>
+  window.onload = function() {
+    apiUrl = window.location.protocol + "//" + window.location.host + "/openapi/openapi.json";
+    // Build a system
+    const ui = SwaggerUIBundle({
+      url: apiUrl,
+      dom_id: '#swagger-ui',
+      presets: [
+        SwaggerUIBundle.presets.apis,
+        SwaggerUIStandalonePreset
+      ],
+      plugins: [
+        SwaggerUIBundle.plugins.DownloadUrl
+      ],
+      layout: "StandaloneLayout"
+    })
+    window.ui = ui
+  }
+</script>
+</body>
+
+</html>
diff --git a/java/java-jersey2-alternatives/pom.xml b/java/java-jersey2-alternatives/pom.xml
@@ -203,5 +203,17 @@
       <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-xjc</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>${jackson-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.media</groupId>
+      <artifactId>jersey-media-json-jackson</artifactId>
+      <version>${jersey2-version}</version>
+    </dependency>
+
   </dependencies>
 </project>
diff --git a/java/java-jersey2-alternatives/src/main/java/io/swagger/sample/Bootstrap.java b/java/java-jersey2-alternatives/src/main/java/io/swagger/sample/Bootstrap.java
@@ -7,10 +7,13 @@
 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.v3.oas.models.servers.Server;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -32,6 +35,9 @@ public void init(ServletConfig config) throws ServletException {
         .url("http://www.apache.org/licenses/LICENSE-2.0.html"));
 
     oas.info(info);
+    List<Server> servers = new ArrayList<>();
+    servers.add(new Server().url("/api"));
+    oas.servers(servers);
     SwaggerConfiguration oasConfig = new SwaggerConfiguration()
             .openAPI(oas)
             .resourcePackages(Stream.of("io.swagger.sample.resource").collect(Collectors.toSet()));

diff --git a/java/java-jersey2-alternatives/src/main/java/io/swagger/sample/resource/PetResource.java b/java/java-jersey2-alternatives/src/main/java/io/swagger/sample/resource/PetResource.java
@@ -25,6 +25,7 @@
 import io.swagger.sample.model.Pet;
 
 import javax.ws.rs.BeanParam;
+import javax.ws.rs.core.GenericEntity;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
@@ -34,6 +35,7 @@
 import javax.ws.rs.Consumes;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
+import java.util.List;
 
 @Path("/pet")
 @Produces({"application/json", "application/xml"})
@@ -122,7 +124,7 @@ public Response findPetsByStatus(
       @QueryParam("status") String status,
       @BeanParam QueryResultBean qr
 ){
-    return Response.ok(petData.findPetByStatus(status)).build();
+      return Response.ok(new GenericEntity<List<Pet>>(petData.findPetByStatus(status)){}).build();
   }
 
   @GET

diff --git a/java/java-jersey2-alternatives/src/main/resources/openapi-configuration.json b/java/java-jersey2-alternatives/src/main/resources/openapi-configuration.json
@@ -17,6 +17,11 @@
                 "name": "Apache 2.0",
                 "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
             }
-        }
+        },
+        "servers":[
+            {
+                "url": "/api"
+            }
+        ]
     }
 }
diff --git a/java/java-jersey2-alternatives/src/main/webapp/WEB-INF/web.xml b/java/java-jersey2-alternatives/src/main/webapp/WEB-INF/web.xml
@@ -88,13 +88,13 @@
     <servlet-name>OpenApi</servlet-name>
     <url-pattern>/openapi/*</url-pattern>
   </servlet-mapping>
-<!-- alternatively use own Bootstrap servlet
-  <servlet>
-    <servlet-name>Bootstrap</servlet-name>
-    <servlet-class>io.swagger.sample.Bootstrap</servlet-class>
-    <load-on-startup>2</load-on-startup>
-  </servlet>
--->
+  <!-- alternatively use own Bootstrap servlet
+    <servlet>
+      <servlet-name>Bootstrap</servlet-name>
+      <servlet-class>io.swagger.sample.Bootstrap</servlet-class>
+      <load-on-startup>2</load-on-startup>
+    </servlet>
+  -->
 
   <filter>
     <filter-name>ApiOriginFilter</filter-name>

diff --git a/java/java-jersey2-appclasses/pom.xml b/java/java-jersey2-appclasses/pom.xml
@@ -142,12 +142,6 @@
       <scope>compile</scope>
       <version>${swagger-version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.jaxrs</groupId>
-      <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>${jackson-version}</version>
-    </dependency>
-
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
@@ -206,5 +200,15 @@
       <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-xjc</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>${jackson-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.media</groupId>
+      <artifactId>jersey-media-json-jackson</artifactId>
+      <version>${jersey2-version}</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/java/java-jersey2-configfile/pom.xml b/java/java-jersey2-configfile/pom.xml
@@ -142,11 +142,6 @@
       <scope>compile</scope>
       <version>${swagger-version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.jaxrs</groupId>
-      <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>${jackson-version}</version>
-    </dependency>
 
     <dependency>
       <groupId>ch.qos.logback</groupId>
@@ -206,5 +201,15 @@
       <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-xjc</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>${jackson-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.media</groupId>
+      <artifactId>jersey-media-json-jackson</artifactId>
+      <version>${jersey2-version}</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/java/java-jersey2-guice/pom.xml b/java/java-jersey2-guice/pom.xml
@@ -142,11 +142,6 @@
       <scope>compile</scope>
       <version>${swagger-version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.jaxrs</groupId>
-      <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>${jackson-version}</version>
-    </dependency>
 
     <dependency>
       <groupId>ch.qos.logback</groupId>
@@ -226,5 +221,15 @@
       <artifactId>guava</artifactId>
       <version>23.0</version>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>${jackson-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.media</groupId>
+      <artifactId>jersey-media-json-jackson</artifactId>
+      <version>${jersey2-version}</version>
+    </dependency>
   </dependencies>
 </project>