From 8abf8497311d805d257166b985457ecf9a9dc8bd Mon Sep 17 00:00:00 2001 From: Rafael Lopez Date: Wed, 27 Feb 2019 01:00:33 +0100 Subject: [PATCH 01/10] Initial Updates - General Change --- java/inflector-dropwizard-guice/pom.xml | 3 +- java/inflector-dropwizard/pom.xml | 8 +- java/inflector-jetty-webxml/pom.xml | 6 ++ .../src/main/webapp/index.html | 92 +++++++++++++++++++ .../swagger/sample/resource/PetResource.java | 4 +- pom.xml | 4 +- 6 files changed, 112 insertions(+), 5 deletions(-) create mode 100644 java/java-jaxrs2-openapiservlet/src/main/webapp/index.html diff --git a/java/inflector-dropwizard-guice/pom.xml b/java/inflector-dropwizard-guice/pom.xml index 0cf5d79a..8864ca72 100644 --- a/java/inflector-dropwizard-guice/pom.xml +++ b/java/inflector-dropwizard-guice/pom.xml @@ -30,8 +30,9 @@ 1.3.1 2.0.0-SNAPSHOT - 2.9.5 + 2.9.8 2.23.1 + 2.0.7-SNAPSHOT diff --git a/java/inflector-dropwizard/pom.xml b/java/inflector-dropwizard/pom.xml index 42ab5db8..1f7bcd7a 100644 --- a/java/inflector-dropwizard/pom.xml +++ b/java/inflector-dropwizard/pom.xml @@ -30,8 +30,9 @@ 1.3.1 2.0.0-SNAPSHOT - 2.9.5 + 2.9.8 2.25.1 + 2.0.7-SNAPSHOT @@ -113,6 +114,11 @@ ${jackson.version} + + io.swagger + swagger-core + ${swagger-core-version} + diff --git a/java/inflector-jetty-webxml/pom.xml b/java/inflector-jetty-webxml/pom.xml index 04b68127..2d4c172e 100644 --- a/java/inflector-jetty-webxml/pom.xml +++ b/java/inflector-jetty-webxml/pom.xml @@ -115,6 +115,11 @@ swagger-inflector ${inflector-version} + + io.swagger + swagger-core + ${swagger-core-version} + 1.8 @@ -126,5 +131,6 @@ 2.0.0-SNAPSHOT 4.8.2 1.6.3 + 2.0.8-SNAPSHOT \ No newline at end of file diff --git a/java/java-jaxrs2-openapiservlet/src/main/webapp/index.html b/java/java-jaxrs2-openapiservlet/src/main/webapp/index.html new file mode 100644 index 00000000..523083cd --- /dev/null +++ b/java/java-jaxrs2-openapiservlet/src/main/webapp/index.html @@ -0,0 +1,92 @@ + + + + + + Swagger UI + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + \ No newline at end of file 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 index b5d24fef..e8cda876 100644 --- 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>(petData.findPetByStatus(status)){}).build(); } @GET diff --git a/pom.xml b/pom.xml index 0f301346..ccc6ce97 100644 --- a/pom.xml +++ b/pom.xml @@ -448,14 +448,14 @@ 1.2 2.2 - 2.0.1 + 2.0.8-SNAPSHOT 2.1.4 2.10.4 2.3.4 3.1.0 2.26 9.4.9.v20180320 - 2.9.1 + 2.9.8 1.0.1 4.8.1 From 869e7d9df2bc7b8fcdac81939bfee8afd30674c7 Mon Sep 17 00:00:00 2001 From: Rafael Lopez Date: Wed, 20 Mar 2019 08:38:16 -0500 Subject: [PATCH 02/10] java-jersey2-webxml solution --- java/java-jersey2-webxml/pom.xml | 16 +++++++++++----- .../io/swagger/sample/resource/Metadata.java | 4 +++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/java/java-jersey2-webxml/pom.xml b/java/java-jersey2-webxml/pom.xml index ccf4a0a2..61f386ff 100644 --- a/java/java-jersey2-webxml/pom.xml +++ b/java/java-jersey2-webxml/pom.xml @@ -139,11 +139,6 @@ compile ${swagger-version} - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson-version} - ch.qos.logback @@ -158,6 +153,17 @@ compile + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey2-version} + + junit junit diff --git a/java/java-jersey2-webxml/src/main/java/io/swagger/sample/resource/Metadata.java b/java/java-jersey2-webxml/src/main/java/io/swagger/sample/resource/Metadata.java index 7901ffdf..482b8a91 100644 --- a/java/java-jersey2-webxml/src/main/java/io/swagger/sample/resource/Metadata.java +++ b/java/java-jersey2-webxml/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 = "/api")) public class Metadata { } From 06af7dfdf201c7f3e66c8388232e8094e2e2ec76 Mon Sep 17 00:00:00 2001 From: Rafael Lopez Date: Wed, 20 Mar 2019 22:16:21 -0500 Subject: [PATCH 03/10] Appclasses, configfile, guice fixed --- java/java-jersey2-appclasses/pom.xml | 16 ++++++++++------ java/java-jersey2-configfile/pom.xml | 15 ++++++++++----- java/java-jersey2-guice/pom.xml | 15 ++++++++++----- .../SwaggerExampleGuiceContextListener.java | 8 +++++++- 4 files changed, 37 insertions(+), 17 deletions(-) diff --git a/java/java-jersey2-appclasses/pom.xml b/java/java-jersey2-appclasses/pom.xml index 861a26f1..8b481edf 100644 --- a/java/java-jersey2-appclasses/pom.xml +++ b/java/java-jersey2-appclasses/pom.xml @@ -142,12 +142,6 @@ compile ${swagger-version} - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson-version} - - ch.qos.logback logback-classic @@ -206,5 +200,15 @@ com.sun.xml.bind jaxb-xjc + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey2-version} + diff --git a/java/java-jersey2-configfile/pom.xml b/java/java-jersey2-configfile/pom.xml index 9eb497fd..b6cd2550 100644 --- a/java/java-jersey2-configfile/pom.xml +++ b/java/java-jersey2-configfile/pom.xml @@ -142,11 +142,6 @@ compile ${swagger-version} - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson-version} - ch.qos.logback @@ -206,5 +201,15 @@ com.sun.xml.bind jaxb-xjc + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey2-version} + diff --git a/java/java-jersey2-guice/pom.xml b/java/java-jersey2-guice/pom.xml index 3f2a7e08..795f0395 100644 --- a/java/java-jersey2-guice/pom.xml +++ b/java/java-jersey2-guice/pom.xml @@ -142,11 +142,6 @@ compile ${swagger-version} - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson-version} - ch.qos.logback @@ -226,5 +221,15 @@ guava 23.0 + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey2-version} + diff --git a/java/java-jersey2-guice/src/main/java/io/swagger/sample/SwaggerExampleGuiceContextListener.java b/java/java-jersey2-guice/src/main/java/io/swagger/sample/SwaggerExampleGuiceContextListener.java index 89c66450..bdd8032d 100644 --- a/java/java-jersey2-guice/src/main/java/io/swagger/sample/SwaggerExampleGuiceContextListener.java +++ b/java/java-jersey2-guice/src/main/java/io/swagger/sample/SwaggerExampleGuiceContextListener.java @@ -13,13 +13,15 @@ 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 jdk.nashorn.internal.runtime.linker.Bootstrap; +import io.swagger.v3.oas.models.servers.Server; import org.glassfish.jersey.servlet.ServletContainer; import java.util.HashMap; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; +import java.util.List; +import java.util.ArrayList; public class SwaggerExampleGuiceContextListener extends GuiceServletContextListener { @@ -50,6 +52,10 @@ protected void configureServlets() { .url("http://www.apache.org/licenses/LICENSE-2.0.html")); oas.info(info); + Server server = new Server().url("/api"); + List servers = new ArrayList(); + servers.add(server); + oas.servers(servers); SwaggerConfiguration oasConfig = new SwaggerConfiguration() .openAPI(oas) .prettyPrint(true) From 8b2aba5647cf4bbfb2a54035c36560308c35b55a Mon Sep 17 00:00:00 2001 From: Rafael Lopez Date: Thu, 21 Mar 2019 19:04:37 -0500 Subject: [PATCH 04/10] Inflector Dropwizard 2.0.8-SNAPSHOT en swagger-core --- java/inflector-dropwizard/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/inflector-dropwizard/pom.xml b/java/inflector-dropwizard/pom.xml index 1f7bcd7a..87f301cd 100644 --- a/java/inflector-dropwizard/pom.xml +++ b/java/inflector-dropwizard/pom.xml @@ -32,7 +32,7 @@ 2.0.0-SNAPSHOT 2.9.8 2.25.1 - 2.0.7-SNAPSHOT + 2.0.8-SNAPSHOT From 278dacde63a33e7ca6e62a75d98243e82964adb4 Mon Sep 17 00:00:00 2001 From: Rafael Lopez Date: Mon, 25 Mar 2019 11:43:57 -0500 Subject: [PATCH 05/10] java-jersey2-alternatives and java-dropwizard --- java/java-dropwizard/pom.xml | 13 +++++++++++++ .../io/swagger/sample/SwaggerSampleApplication.java | 6 ++++++ .../src/main/java/io/swagger/sample/Bootstrap.java | 6 ++++++ 3 files changed, 25 insertions(+) diff --git a/java/java-dropwizard/pom.xml b/java/java-dropwizard/pom.xml index c00b95cd..8dae660a 100644 --- a/java/java-dropwizard/pom.xml +++ b/java/java-dropwizard/pom.xml @@ -150,5 +150,18 @@ ${swagger-version} compile + + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey2-version} + + 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 index 8b5051f6..a6b892d5 100644 --- 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 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-jersey2-alternatives/src/main/java/io/swagger/sample/Bootstrap.java b/java/java-jersey2-alternatives/src/main/java/io/swagger/sample/Bootstrap.java index c1d13b05..2c25e295 100644 --- 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 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())); From 8ef9fd50681550ff034b79f3a4f44365844b027b Mon Sep 17 00:00:00 2001 From: Rafael Lopez Date: Tue, 26 Mar 2019 16:26:14 -0500 Subject: [PATCH 06/10] Java-jersey2-alternatives, java-jersey2-resourceinit, java-jersey2-webxml-configfile fixes --- java/java-jersey2-alternatives/pom.xml | 12 ++++++++++++ .../src/main/resources/openapi-configuration.json | 7 ++++++- .../src/main/webapp/WEB-INF/web.xml | 3 +-- java/java-jersey2-resourceinit/pom.xml | 10 ++++++++++ java/java-jersey2-webxml-configfile/pom.xml | 12 ++++++++++++ .../resources/openapi-customname-configuration.json | 7 ++++++- 6 files changed, 47 insertions(+), 4 deletions(-) diff --git a/java/java-jersey2-alternatives/pom.xml b/java/java-jersey2-alternatives/pom.xml index 7f73f4ce..778c7e72 100644 --- a/java/java-jersey2-alternatives/pom.xml +++ b/java/java-jersey2-alternatives/pom.xml @@ -203,5 +203,17 @@ com.sun.xml.bind jaxb-xjc + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey2-version} + + diff --git a/java/java-jersey2-alternatives/src/main/resources/openapi-configuration.json b/java/java-jersey2-alternatives/src/main/resources/openapi-configuration.json index 905e9a3d..c111486b 100644 --- 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 index 17b1cdd1..c6eca66f 100644 --- 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,12 @@ OpenApi /openapi/* - ApiOriginFilter diff --git a/java/java-jersey2-resourceinit/pom.xml b/java/java-jersey2-resourceinit/pom.xml index faefffd9..c0bf946c 100644 --- a/java/java-jersey2-resourceinit/pom.xml +++ b/java/java-jersey2-resourceinit/pom.xml @@ -206,5 +206,15 @@ com.sun.xml.bind jaxb-xjc + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey2-version} + diff --git a/java/java-jersey2-webxml-configfile/pom.xml b/java/java-jersey2-webxml-configfile/pom.xml index a0df1c9c..a8a03755 100644 --- a/java/java-jersey2-webxml-configfile/pom.xml +++ b/java/java-jersey2-webxml-configfile/pom.xml @@ -203,5 +203,17 @@ com.sun.xml.bind jaxb-xjc + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey2-version} + + diff --git a/java/java-jersey2-webxml-configfile/src/main/resources/openapi-customname-configuration.json b/java/java-jersey2-webxml-configfile/src/main/resources/openapi-customname-configuration.json index 905e9a3d..c111486b 100644 --- a/java/java-jersey2-webxml-configfile/src/main/resources/openapi-customname-configuration.json +++ b/java/java-jersey2-webxml-configfile/src/main/resources/openapi-customname-configuration.json @@ -17,6 +17,11 @@ "name": "Apache 2.0", "url": "http://www.apache.org/licenses/LICENSE-2.0.html" } - } + }, + "servers":[ + { + "url": "/api" + } + ] } } From dcf98da497ace0a01d5729f30ebbaa1923547d93 Mon Sep 17 00:00:00 2001 From: Rafael Lopez Date: Wed, 27 Mar 2019 10:35:41 -0500 Subject: [PATCH 07/10] java-jersey2-petstore fixed --- java/java-jersey2-petstore/pom.xml | 12 ++++++++++++ .../openapidefintion/OpenAPIDefinitionResource.java | 13 +------------ .../petstore/operation/ServerOperationResource.java | 9 +-------- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/java/java-jersey2-petstore/pom.xml b/java/java-jersey2-petstore/pom.xml index 40889da8..244cf4a9 100644 --- a/java/java-jersey2-petstore/pom.xml +++ b/java/java-jersey2-petstore/pom.xml @@ -206,5 +206,17 @@ com.sun.xml.bind jaxb-xjc + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-version} + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey2-version} + + diff --git a/java/java-jersey2-petstore/src/main/java/io/swagger/sample/petstore/openapidefintion/OpenAPIDefinitionResource.java b/java/java-jersey2-petstore/src/main/java/io/swagger/sample/petstore/openapidefintion/OpenAPIDefinitionResource.java index 4a5e2e83..18dd69eb 100644 --- a/java/java-jersey2-petstore/src/main/java/io/swagger/sample/petstore/openapidefintion/OpenAPIDefinitionResource.java +++ b/java/java-jersey2-petstore/src/main/java/io/swagger/sample/petstore/openapidefintion/OpenAPIDefinitionResource.java @@ -6,8 +6,6 @@ import io.swagger.v3.oas.annotations.info.Info; import io.swagger.v3.oas.annotations.info.License; import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import io.swagger.v3.oas.annotations.servers.Server; -import io.swagger.v3.oas.annotations.servers.ServerVariable; import io.swagger.v3.oas.annotations.tags.Tag; /** @@ -19,7 +17,7 @@ version = "2.0", description = "API Definition", termsOfService = "Terms of service", - license = @License(name = "Apache 2.0", url = "http://foo.bar"), + license = @License(name = "Apache 2.0", url = ""), contact = @Contact(url = "http://gigantic-server.com", name = "Fred", email = "Fred@gigagantic-server.com") ), tags = { @@ -31,15 +29,6 @@ security = { @SecurityRequirement(name = "req 1", scopes = {"a", "b"}), @SecurityRequirement(name = "req 2", scopes = {"b", "c"}) - }, - servers = { - @Server( - description = "server 1", - url = "http://foo", - variables = { - @ServerVariable(name = "var1", description = "var 1", defaultValue = "1", allowableValues = {"1", "2"}), - @ServerVariable(name = "var2", description = "var 2", defaultValue = "1", allowableValues = {"1", "2"}) - }) } ) public class OpenAPIDefinitionResource { diff --git a/java/java-jersey2-petstore/src/main/java/io/swagger/sample/petstore/operation/ServerOperationResource.java b/java/java-jersey2-petstore/src/main/java/io/swagger/sample/petstore/operation/ServerOperationResource.java index 2ac46f08..b41a6c8d 100644 --- a/java/java-jersey2-petstore/src/main/java/io/swagger/sample/petstore/operation/ServerOperationResource.java +++ b/java/java-jersey2-petstore/src/main/java/io/swagger/sample/petstore/operation/ServerOperationResource.java @@ -12,19 +12,12 @@ * Resource With a Hidden Operation */ @OpenAPIDefinition( - servers = { - @Server(description = "server 1", url = "http://foo") - } ) @Path("/operations") public class ServerOperationResource { @Path("/serversoperation") @GET - @Operation(operationId = "Pets", description = "Pets Example", - servers = { - @Server(description = "server 2", url = "http://foo2") - } - ) + @Operation(operationId = "Pets", description = "Pets Example") public Pet getPet() { return new Pet(); } From e1807b37f5044936b8c88ea7077e20b485134cc7 Mon Sep 17 00:00:00 2001 From: Rafael Lopez Date: Wed, 27 Mar 2019 11:59:23 -0500 Subject: [PATCH 08/10] java-jersey2-resourceinit, java/java-jaxrs2-openapiservlet fixed --- .../src/main/java/io/swagger/sample/resource/Metadata.java | 4 +++- .../src/main/java/io/swagger/sample/MyApplication.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) 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 index 7901ffdf..ab4cf5c2 100644 --- 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-jersey2-resourceinit/src/main/java/io/swagger/sample/MyApplication.java b/java/java-jersey2-resourceinit/src/main/java/io/swagger/sample/MyApplication.java index 7c463819..8d25d1f3 100644 --- a/java/java-jersey2-resourceinit/src/main/java/io/swagger/sample/MyApplication.java +++ b/java/java-jersey2-resourceinit/src/main/java/io/swagger/sample/MyApplication.java @@ -52,5 +52,6 @@ public MyApplication(@Context ServletConfig servletConfig) { openApiResource.setOpenApiConfiguration(oasConfig); register(openApiResource); + packages("io.swagger.sample.resource"); } } From 21c0dc6b0d4f0ae287d55068fccedd8639cdc758 Mon Sep 17 00:00:00 2001 From: Rafael Lopez Date: Mon, 8 Apr 2019 23:40:49 -0500 Subject: [PATCH 09/10] Pull Request Fixes --- java/inflector-dropwizard-guice/pom.xml | 8 +++++++- .../src/main/webapp/WEB-INF/web.xml | 15 +++++++------- .../OpenAPIDefinitionResource.java | 20 ++++++++++++++++++- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/java/inflector-dropwizard-guice/pom.xml b/java/inflector-dropwizard-guice/pom.xml index 8864ca72..3c739a03 100644 --- a/java/inflector-dropwizard-guice/pom.xml +++ b/java/inflector-dropwizard-guice/pom.xml @@ -32,7 +32,7 @@ 2.0.0-SNAPSHOT 2.9.8 2.23.1 - 2.0.7-SNAPSHOT + 2.0.8-SNAPSHOT @@ -163,6 +163,12 @@ ${jackson.version} + + io.swagger + swagger-core + ${swagger-core-version} + + 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 index c6eca66f..ecdd1489 100644 --- 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,15 +88,16 @@ OpenApi /openapi/* - - - Bootstrap - io.swagger.sample.Bootstrap - 2 - + - ApiOriginFilter + AxpiOriginFilter io.swagger.sample.util.ApiOriginFilter diff --git a/java/java-jersey2-petstore/src/main/java/io/swagger/sample/petstore/openapidefintion/OpenAPIDefinitionResource.java b/java/java-jersey2-petstore/src/main/java/io/swagger/sample/petstore/openapidefintion/OpenAPIDefinitionResource.java index 18dd69eb..25096e9d 100644 --- a/java/java-jersey2-petstore/src/main/java/io/swagger/sample/petstore/openapidefintion/OpenAPIDefinitionResource.java +++ b/java/java-jersey2-petstore/src/main/java/io/swagger/sample/petstore/openapidefintion/OpenAPIDefinitionResource.java @@ -6,6 +6,8 @@ import io.swagger.v3.oas.annotations.info.Info; import io.swagger.v3.oas.annotations.info.License; import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.servers.Server; +import io.swagger.v3.oas.annotations.servers.ServerVariable; import io.swagger.v3.oas.annotations.tags.Tag; /** @@ -17,7 +19,7 @@ version = "2.0", description = "API Definition", termsOfService = "Terms of service", - license = @License(name = "Apache 2.0", url = ""), + license = @License(name = "Apache 2.0", url = "http://foo.bar"), contact = @Contact(url = "http://gigantic-server.com", name = "Fred", email = "Fred@gigagantic-server.com") ), tags = { @@ -29,6 +31,22 @@ security = { @SecurityRequirement(name = "req 1", scopes = {"a", "b"}), @SecurityRequirement(name = "req 2", scopes = {"b", "c"}) + }, + servers = { + @Server( + description = "server 1", + url = "/", + variables = { + @ServerVariable(name = "var1", description = "var 1", defaultValue = "1", allowableValues = {"1", "2"}), + @ServerVariable(name = "var2", description = "var 2", defaultValue = "1", allowableValues = {"1", "2"}) + }), + @Server( + description = "server 2", + url = "http://foo", + variables = { + @ServerVariable(name = "var1", description = "var 1", defaultValue = "1", allowableValues = {"1", "2"}), + @ServerVariable(name = "var2", description = "var 2", defaultValue = "1", allowableValues = {"1", "2"}) + }) } ) public class OpenAPIDefinitionResource { From 8a2015dde128cf48d9d30098722908869532e149 Mon Sep 17 00:00:00 2001 From: frantuma Date: Thu, 11 Apr 2019 09:41:08 +0200 Subject: [PATCH 10/10] fix typo --- java/java-jersey2-alternatives/src/main/webapp/WEB-INF/web.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index ecdd1489..f6f9db2a 100644 --- a/java/java-jersey2-alternatives/src/main/webapp/WEB-INF/web.xml +++ b/java/java-jersey2-alternatives/src/main/webapp/WEB-INF/web.xml @@ -97,7 +97,7 @@ --> - AxpiOriginFilter + ApiOriginFilter io.swagger.sample.util.ApiOriginFilter