2.0

README.md

@@ -16,3 +16,23 @@ the java library. Each sample contains a README file with details how to run it
 
 ---
 <img src="http://swagger.io/wp-content/uploads/2016/02/logo.jpg"/>
+
+## Security contact
+
+Please disclose any security-related issues or vulnerabilities by emailing [[email protected]](mailto:[email protected]), instead of using the public issue tracker.
+
+## License
+
+```
+Copyright 2019 SmartBear Software
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at [apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+```

java/inflector-dropwizard-guice/.gitignore

@@ -0,0 +1 @@
+dependency-reduced-pom.xml

java/inflector-dropwizard-guice/README.md

@@ -18,7 +18,7 @@ java -jar ./target/inflector-dropwizard-guice-sample-1.0.0-SNAPSHOT.jar server s
 You can get to the swagger file at:
 
 ```
-http://localhost:8080/v2/swagger.json
+http://localhost:8080/v2/openapi.json
 ```
 
 Have fun!

java/inflector-dropwizard-guice/pom.xml

@@ -25,18 +25,91 @@
     <version>1.0.0-SNAPSHOT</version>
 
     <properties>
-        <dropwizard-version>0.8.2</dropwizard-version>
-        <inflector-version>1.0.2</inflector-version>
-        <jackson.version>2.5.1</jackson.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+
+        <dropwizard-version>1.3.1</dropwizard-version>
+        <inflector-version>2.0.0-SNAPSHOT</inflector-version>
+        <jackson.version>2.10.3</jackson.version>
+        <jersey2.version>2.23.1</jersey2.version>
+        <swagger-core-version>2.0.8-SNAPSHOT</swagger-core-version>
     </properties>
 
     <dependencies>
 
+        <dependency>
+            <groupId>io.dropwizard</groupId>
+            <artifactId>dropwizard-core</artifactId>
+            <version>${dropwizard-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-server</artifactId>
+            <version>${jersey2.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet-core</artifactId>
+            <version>${jersey2.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-multipart</artifactId>
+            <version>${jersey2.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.hubspot.dropwizard</groupId>
+            <artifactId>dropwizard-guice</artifactId>
+            <version>1.0.6.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>javax.inject</artifactId>
+                    <groupId>javax.inject</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>jsr305</artifactId>
+                    <groupId>com.google.code.findbugs</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>annotations</artifactId>
+                    <groupId>com.google.code.findbugs</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>aopalliance</artifactId>
+                    <groupId>aopalliance</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>4.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.inject</groupId>
+                    <artifactId>javax.inject</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>aopalliance</groupId>
+                    <artifactId>aopalliance</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-inflector</artifactId>
             <version>${inflector-version}</version>
             <exclusions>
+                <exclusion>
+                    <groupId>org.glassfish.jersey.inject</groupId>
+                    <artifactId>jersey-hk2</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>ch.qos.logback</groupId>
                     <artifactId>logback-classic</artifactId>
@@ -79,55 +152,21 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-yaml</artifactId>
             <version>${jackson.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>io.dropwizard</groupId>
-            <artifactId>dropwizard-core</artifactId>
-            <version>${dropwizard-version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.hubspot.dropwizard</groupId>
-            <artifactId>dropwizard-guice</artifactId>
-            <version>0.8.0</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>javax.inject</artifactId>
-                    <groupId>javax.inject</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>jsr305</artifactId>
-                    <groupId>com.google.code.findbugs</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>annotations</artifactId>
-                    <groupId>com.google.code.findbugs</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>aopalliance</artifactId>
-                    <groupId>aopalliance</groupId>
-                </exclusion>
-            </exclusions>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-            <version>4.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.inject</groupId>
-                    <artifactId>javax.inject</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>aopalliance</groupId>
-                    <artifactId>aopalliance</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-core</artifactId>
+            <version>${swagger-core-version}</version>
         </dependency>
 
     </dependencies>

java/inflector-dropwizard-guice/src/main/java/io/swagger/samples/inflector/dropwizard/InflectorServer.java

@@ -23,14 +23,15 @@
 import io.dropwizard.Application;
 import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
-import io.swagger.inflector.SwaggerInflector;
-import io.swagger.inflector.config.Configuration;
-import io.swagger.inflector.config.ControllerFactory;
-import io.swagger.inflector.processors.JsonNodeExampleSerializer;
-import io.swagger.inflector.processors.XMLExampleProvider;
-import io.swagger.jaxrs.listing.SwaggerSerializers;
+import io.swagger.oas.inflector.OpenAPIInflector;
+import io.swagger.oas.inflector.config.Configuration;
+import io.swagger.oas.inflector.config.ControllerFactory;
+import io.swagger.oas.inflector.processors.JsonNodeExampleSerializer;
+import io.swagger.oas.inflector.processors.XMLExampleProvider;
+import io.swagger.v3.jaxrs2.SwaggerSerializers;
 import io.swagger.util.Json;
 import io.swagger.util.Yaml;
+import io.swagger.v3.oas.models.Operation;
 import org.eclipse.jetty.servlets.CrossOriginFilter;
 import org.slf4j.LoggerFactory;
 
@@ -68,7 +69,7 @@ public void run(InflectorServerConfiguration configuration, Environment environm
 
         Configuration config = Configuration.read(configuration.getConfig());
         config.setControllerFactory(new GuiceControllerFactory(guiceBundle.getInjector()));
-        SwaggerInflector inflector = new SwaggerInflector(config);
+        OpenAPIInflector inflector = new OpenAPIInflector(config);
         environment.jersey().getResourceConfig().registerResources(inflector.getResources());
 
         // add serializers for swagger
@@ -91,7 +92,7 @@ public GuiceControllerFactory(Injector injector) {
             this.injector = injector;
         }
 
-        public Object instantiateController(Class cls) throws IllegalAccessException, InstantiationException {
+        public Object instantiateController(Class cls, Operation operation) throws IllegalAccessException, InstantiationException {
             return this.injector.getInstance(cls);
         }
     }

java/inflector-dropwizard-guice/src/main/java/io/swagger/samples/inflector/dropwizard/controllers/SampleController.java

@@ -16,8 +16,8 @@
 
 package io.swagger.samples.inflector.dropwizard.controllers;
 
-import io.swagger.inflector.models.RequestContext;
-import io.swagger.inflector.models.ResponseContext;
+import io.swagger.oas.inflector.models.RequestContext;
+import io.swagger.oas.inflector.models.ResponseContext;
 import io.swagger.samples.inflector.dropwizard.InflectorServerConfiguration;
 import io.swagger.samples.inflector.dropwizard.models.Pet;
 import org.apache.commons.io.IOUtils;