Repository: cxf Updated Branches: refs/heads/master 8e8f01a3c -> 8ef43effe
[CXF-7384] Remove Swagger 1.x related code from the master Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8ef43eff Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8ef43eff Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8ef43eff Branch: refs/heads/master Commit: 8ef43effed51b0339693a671f16c5d9a96e15bd7 Parents: 8e8f01a Author: Dennis Kieselhorst <[email protected]> Authored: Wed Jun 7 21:30:47 2017 +0200 Committer: Dennis Kieselhorst <[email protected]> Committed: Wed Jun 7 21:30:47 2017 +0200 ---------------------------------------------------------------------- .../jax_rs/description_swagger/README.txt | 23 -- .../samples/jax_rs/description_swagger/pom.xml | 158 ------------ .../java/demo/jaxrs/swagger/server/Item.java | 49 ---- .../java/demo/jaxrs/swagger/server/Sample.java | 139 ----------- .../java/demo/jaxrs/swagger/server/Server.java | 74 ------ .../META-INF/cxf/org.apache.cxf.Logger | 1 - .../webjars/swagger-ui/2.0.24/index.html | 52 ---- .../src/main/resources/logback.xml | 16 -- .../src/main/resources/logback.xml | 4 +- .../src/main/resources/logback.xml | 4 +- distribution/src/main/release/samples/pom.xml | 1 - parent/pom.xml | 6 - rt/rs/description-swagger/pom.xml | 11 - .../cxf/jaxrs/swagger/SwaggerFeature.java | 116 --------- .../cxf/jaxrs/swagger/SwaggerFeatureTest.java | 45 ---- systests/jaxrs/pom.xml | 12 - .../AbstractSwaggerServiceDescriptionTest.java | 248 ------------------- .../jaxrs/description/BookStoreSwagger.java | 82 ------ .../SwaggerFilterServiceDescriptionTest.java | 47 ---- .../SwaggerRegularServiceDescriptionTest.java | 47 ---- 20 files changed, 4 insertions(+), 1131 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/distribution/src/main/release/samples/jax_rs/description_swagger/README.txt ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/README.txt b/distribution/src/main/release/samples/jax_rs/description_swagger/README.txt deleted file mode 100644 index 15afca8..0000000 --- a/distribution/src/main/release/samples/jax_rs/description_swagger/README.txt +++ /dev/null @@ -1,23 +0,0 @@ -JAX-RS SwaggerFeature Demo -================= - -The demo shows a basic usage of Swagger API documentation with REST based Web Services using -JAX-RS 2.0 (JSR-339). Swagger UI is available at: http://localhost:9000/ - -Building and running the demo using Maven ---------------------------------------- - -From the base directory of this sample (i.e., where this README file is -located), the Maven pom.xml file can be used to build and run the demo. - - -Using either UNIX or Windows: - - mvn install - mvn -Pserver (from one command line window) - - -To remove the target dir, run mvn clean". - - - http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml deleted file mode 100644 index a4686e6..0000000 --- a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml +++ /dev/null @@ -1,158 +0,0 @@ -<?xml version="1.0"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you 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 - - 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. ---> -<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";> - <modelVersion>4.0.0</modelVersion> - <artifactId>jax_rs_description_swagger</artifactId> - <name>JAX-RS Swagger Demo</name> - <description>JAX-RS Basic Demo</description> - <parent> - <groupId>org.apache.cxf.samples</groupId> - <artifactId>cxf-samples</artifactId> - <version>3.2.0-SNAPSHOT</version> - <relativePath>../..</relativePath> - </parent> - - <properties> - <cxf.version>${project.version}</cxf.version> - </properties> - - <profiles> - <profile> - <id>server</id> - <build> - <defaultGoal>test</defaultGoal> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <phase>test</phase> - <goals> - <goal>java</goal> - </goals> - <configuration> - <mainClass>demo.jaxrs.swagger.server.Server</mainClass> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.9</version> - <executions> - <execution> - <phase>generate-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.webjars</groupId> - <artifactId>swagger-ui</artifactId> - <version>2.0.24</version> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/classes</outputDirectory> - <excludes>**/index.html</excludes> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>com.wordnik</groupId> - <artifactId>swagger-jaxrs_2.10</artifactId> - <exclusions> - <exclusion> - <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>swagger-ui</artifactId> - <version>2.0.24</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.12.1.GA</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> - <version>2.2.2</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>2.2.2</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http</artifactId> - <version>3.2.0-SNAPSHOT</version> - </dependency> - <!-- This dependency is needed if you're using the Jetty container --> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-http-jetty</artifactId> - <version>3.2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>3.2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-rs-service-description-swagger</artifactId> - <version>3.2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> - </dependency> - </dependencies> -</project> http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Item.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Item.java b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Item.java deleted file mode 100644 index 51b3cab..0000000 --- a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Item.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * - * 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. - */ - -package demo.jaxrs.swagger.server; - -public class Item { - private String name; - private String value; - - public Item() { - } - - public Item(final String name, final String value) { - this.name = name; - this.value = value; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } -} http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java deleted file mode 100644 index c58fb0e..0000000 --- a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java +++ /dev/null @@ -1,139 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * - * 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. - */ - -package demo.jaxrs.swagger.server; - -import java.util.Collections; -import java.util.Map; -import java.util.TreeMap; - -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; - -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiImplicitParam; -import com.wordnik.swagger.annotations.ApiImplicitParams; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; - -@Path("/sample") -@Api(value = "/sample", description = "Sample JAX-RS service with Swagger documentation") -public class Sample { - private Map<String, Item> items; - - public Sample() { - items = Collections.synchronizedMap(new TreeMap<String, Item>(String.CASE_INSENSITIVE_ORDER)); - items.put("Item 1", new Item("Item 1", "Value 1")); - items.put("Item 2", new Item("Item 2", "Value 2")); - } - - - @Produces({ MediaType.APPLICATION_JSON }) - @GET - @ApiOperation( - value = "Get operation with Response and @Default value", - notes = "Get operation with Response and @Default value", - response = Item.class, - responseContainer = "List" - ) - public Response getItems( - @ApiParam(value = "Page to fetch", required = true) @QueryParam("page") @DefaultValue("1") int page) { - return Response.ok(items.values()).build(); - } - - @Produces({ MediaType.APPLICATION_JSON }) - @Path("/{name}") - @GET - @ApiOperation( - value = "Get operation with type and headers", - notes = "Get operation with type and headers", - response = Item.class - ) - public Item getItem( - @ApiParam(value = "language", required = true) @HeaderParam("Accept-Language") final String language, - @ApiParam(value = "name", required = true) @PathParam("name") String name) { - return items.get(name); - } - - @Consumes({ MediaType.APPLICATION_JSON }) - @POST - @ApiOperation( - value = "Post operation with entity in a body", - notes = "Post operation with entity in a body", - response = Item.class - ) - public Response createItem( - @Context final UriInfo uriInfo, - @ApiParam(value = "item", required = true) final Item item) { - items.put(item.getName(), item); - return Response - .created(uriInfo.getBaseUriBuilder().path(item.getName()).build()) - .entity(item).build(); - } - - @Produces({ MediaType.APPLICATION_JSON }) - @Path("/{name}") - @PUT - @ApiOperation( - value = "Put operation with form parameter", - notes = "Put operation with form parameter", - response = Item.class - ) - public Item updateItem( - @ApiParam(value = "name", required = true) @PathParam("name") String name, - @ApiParam(value = "value", required = true) @FormParam("value") String value) { - Item item = new Item(name, value); - items.put(name, item); - return item; - } - - @Path("/{name}") - @DELETE - @ApiOperation( - value = "Delete operation with implicit header", - notes = "Delete operation with implicit header" - ) - @ApiImplicitParams( - @ApiImplicitParam( - name = "Accept-Language", - value = "language", - required = true, - dataType = "String", - paramType = "header" - ) - ) - public Response delete(@ApiParam(value = "name", required = true) @PathParam("name") String name) { - items.remove(name); - return Response.ok().build(); - } -} http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java deleted file mode 100644 index b254839..0000000 --- a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java +++ /dev/null @@ -1,74 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * - * 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. - */ - -package demo.jaxrs.swagger.server; - -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; - -import org.apache.commons.lang3.StringUtils; -import org.apache.cxf.jaxrs.provider.MultipartProvider; -import org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet; -import org.apache.cxf.jaxrs.swagger.SwaggerFeature; -import org.eclipse.jetty.servlet.DefaultServlet; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; - -public class Server { - - protected Server() throws Exception { - org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server(9000); - - // Configuring all static web resource - final ServletHolder staticHolder = new ServletHolder(new DefaultServlet()); - // Register and map the dispatcher servlet - final ServletHolder servletHolder = new ServletHolder(new CXFNonSpringJaxrsServlet()); - final ServletContextHandler context = new ServletContextHandler(); - context.setContextPath("/"); - context.addServlet(staticHolder, "/static/*"); - context.addServlet(servletHolder, "/*"); - context.setResourceBase( - getClass().getResource("/META-INF/resources/webjars/swagger-ui/2.0.24").toURI().toString()); - - servletHolder.setInitParameter("redirects-list", - "/ /index.html /.*[.]js /css/.* /images/.* lib/.* .*ico"); - servletHolder.setInitParameter("redirect-servlet-name", staticHolder.getName()); - servletHolder.setInitParameter("redirect-attributes", "javax.servlet.include.request_uri"); - servletHolder.setInitParameter("jaxrs.serviceClasses", Sample.class.getName()); - servletHolder.setInitParameter("jaxrs.features", SwaggerFeature.class.getName()); - servletHolder.setInitParameter("jaxrs.providers", StringUtils.join( - new String[] { - MultipartProvider.class.getName(), - JacksonJsonProvider.class.getName() - }, ",") - ); - - server.setHandler(context); - server.start(); - server.join(); - } - - public static void main(String args[]) throws Exception { - new Server(); - System.out.println("Server ready..."); - - Thread.sleep(5 * 6000 * 1000); - System.out.println("Server exiting"); - System.exit(0); - } -} http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/cxf/org.apache.cxf.Logger ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/cxf/org.apache.cxf.Logger b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/cxf/org.apache.cxf.Logger deleted file mode 100644 index 27dd788..0000000 --- a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/cxf/org.apache.cxf.Logger +++ /dev/null @@ -1 +0,0 @@ -org.apache.cxf.common.logging.Slf4jLogger \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.html ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.html b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.html deleted file mode 100644 index 395e96e..0000000 --- a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.html +++ /dev/null @@ -1,52 +0,0 @@ -<!DOCTYPE html> -<html> -<head> - <title>Swagger UI + JAX-RS demo</title> - <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/> - <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/> - <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/> - <link href='css/screen.css' media='print' rel='stylesheet' type='text/css'/> - <script type="text/javascript" src="lib/shred.bundle.js"></script> - <script src='lib/jquery-1.8.0.min.js' type='text/javascript'></script> - <script src='lib/jquery.slideto.min.js' type='text/javascript'></script> - <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script> - <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script> - <script src='lib/handlebars-1.0.0.js' type='text/javascript'></script> - <script src='lib/underscore-min.js' type='text/javascript'></script> - <script src='lib/backbone-min.js' type='text/javascript'></script> - <script src='lib/swagger.js' type='text/javascript'></script> - <script src='swagger-ui.js' type='text/javascript'></script> - <script src='lib/highlight.7.3.pack.js' type='text/javascript'></script> - - <!-- enabling this will enable oauth2 implicit scope support --> - <script src='lib/swagger-oauth.js' type='text/javascript'></script> - - <script type="text/javascript"> - $(function () { - window.swaggerUi = new SwaggerUi({ - url: "/api-docs", - dom_id: "swagger-ui-container", - supportedSubmitMethods: ['get', 'post', 'put', 'delete'], - onComplete: function(swaggerApi, swaggerUi){ - log("Loaded SwaggerUI"); - $('pre code').each(function(i, e) { - hljs.highlightBlock(e) - }); - }, - onFailure: function(data) { - log("Unable to Load SwaggerUI"); - }, - docExpansion: "none", - sorter : "alpha" - }); - - window.swaggerUi.load(); - }); - </script> -</head> - -<body class="swagger-section"> -<div id="message-bar" class="swagger-ui-wrap"> </div> -<div id="swagger-ui-container" class="swagger-ui-wrap"></div> -</body> -</html> http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/logback.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/logback.xml b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/logback.xml deleted file mode 100644 index 0a3e031..0000000 --- a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/logback.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<configuration scan="true" scanPeriod="5 seconds"> - <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <pattern>[%level] %d{yyyy-MM-dd HH:mm:ss.SSS} %logger{36} - [%X] %msg%n</pattern> - </encoder> - </appender> - - <root level="INFO"> - <appender-ref ref="STDOUT" /> - </root> - - <logger category="com.wordnik.swagger" name="swagger"> - <level name="DEBUG"/> - </logger> -</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/resources/logback.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/resources/logback.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/resources/logback.xml index 0a3e031..59bce12 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/resources/logback.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/resources/logback.xml @@ -10,7 +10,7 @@ <appender-ref ref="STDOUT" /> </root> - <logger category="com.wordnik.swagger" name="swagger"> + <logger category="io.swagger" name="swagger"> <level name="DEBUG"/> </logger> -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/resources/logback.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/resources/logback.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/resources/logback.xml index 0a3e031..59bce12 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/resources/logback.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/resources/logback.xml @@ -10,7 +10,7 @@ <appender-ref ref="STDOUT" /> </root> - <logger category="com.wordnik.swagger" name="swagger"> + <logger category="io.swagger" name="swagger"> <level name="DEBUG"/> </logger> -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/distribution/src/main/release/samples/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 6e00390..404e980 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -56,7 +56,6 @@ <module>jax_rs/websocket_web</module> <module>jax_rs/websocket_osgi</module> <module>jax_rs/search</module> - <module>jax_rs/description_swagger</module> <module>jax_rs/description_swagger2</module> <module>jax_rs/description_swagger2_web</module> <module>jax_rs/description_swagger2_osgi</module> http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index af367b5..af0ceee 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -157,7 +157,6 @@ <cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version> <cxf.spring.ldap.version>2.3.1.RELEASE</cxf.spring.ldap.version> <cxf.spring.mock>spring-test</cxf.spring.mock> - <cxf.swagger.version>1.3.13</cxf.swagger.version> <cxf.swagger2.version>1.5.12</cxf.swagger2.version> <cxf.velocity.version>1.7</cxf.velocity.version> <cxf.woodstox.core.version>5.0.3</cxf.woodstox.core.version> @@ -1922,11 +1921,6 @@ <version>${cxf.msv.version}</version> </dependency> <dependency> - <groupId>com.wordnik</groupId> - <artifactId>swagger-jaxrs_2.10</artifactId> - <version>${cxf.swagger.version}</version> - </dependency> - <dependency> <groupId>io.swagger</groupId> <artifactId>swagger-jaxrs</artifactId> <version>${cxf.swagger2.version}</version> http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/rt/rs/description-swagger/pom.xml ---------------------------------------------------------------------- diff --git a/rt/rs/description-swagger/pom.xml b/rt/rs/description-swagger/pom.xml index 16014e6..4a4a956 100644 --- a/rt/rs/description-swagger/pom.xml +++ b/rt/rs/description-swagger/pom.xml @@ -53,17 +53,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>com.wordnik</groupId> - <artifactId>swagger-jaxrs_2.10</artifactId> - <exclusions> - <exclusion> - <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - </exclusion> - </exclusions> - <optional>true</optional> - </dependency> - <dependency> <groupId>io.swagger</groupId> <artifactId>swagger-jaxrs</artifactId> <exclusions> http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java ---------------------------------------------------------------------- diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java deleted file mode 100644 index 14d04e9..0000000 --- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java +++ /dev/null @@ -1,116 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * - * 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. - */ -package org.apache.cxf.jaxrs.swagger; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.PreMatching; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; - -import com.wordnik.swagger.jaxrs.config.BeanConfig; -import com.wordnik.swagger.jaxrs.listing.ApiDeclarationProvider; -import com.wordnik.swagger.jaxrs.listing.ApiListingResourceJSON; -import com.wordnik.swagger.jaxrs.listing.ResourceListingProvider; - -import org.apache.cxf.Bus; -import org.apache.cxf.endpoint.Server; -import org.apache.cxf.jaxrs.JAXRSServiceFactoryBean; -import org.apache.cxf.jaxrs.ext.MessageContext; -import org.apache.cxf.jaxrs.provider.ServerProviderFactory; - -public class SwaggerFeature extends AbstractSwaggerFeature { - - @Override - protected void addSwaggerResource(Server server, Bus bus) { - ApiListingResourceJSON apiListingResource = new ApiListingResourceJSON(); - if (!runAsFilter) { - List<Object> serviceBeans = new ArrayList<>(); - serviceBeans.add(apiListingResource); - ((JAXRSServiceFactoryBean)server.getEndpoint().get(JAXRSServiceFactoryBean.class.getName())). - setResourceClassesFromBeans(serviceBeans); - } - List<Object> providers = new ArrayList<>(); - if (runAsFilter) { - providers.add(new SwaggerContainerRequestFilter(apiListingResource)); - } - providers.add(new ResourceListingProvider()); - providers.add(new ApiDeclarationProvider()); - ((ServerProviderFactory)server.getEndpoint().get( - ServerProviderFactory.class.getName())).setUserProviders(providers); - - BeanConfig beanConfig = new BeanConfig(); - beanConfig.setResourcePackage(getResourcePackage()); - beanConfig.setVersion(getVersion()); - beanConfig.setBasePath(getBasePath()); - beanConfig.setTitle(getTitle()); - beanConfig.setDescription(getDescription()); - beanConfig.setContact(getContact()); - beanConfig.setLicense(getLicense()); - beanConfig.setLicenseUrl(getLicenseUrl()); - beanConfig.setTermsOfServiceUrl(getTermsOfServiceUrl()); - beanConfig.setScan(isScan()); - beanConfig.setFilterClass(getFilterClass()); - } - - @Override - protected void setBasePathByAddress(String address) { - setBasePath(address); - } - - @PreMatching - private static class SwaggerContainerRequestFilter implements ContainerRequestFilter { - private static final String APIDOCS_LISTING_PATH = "api-docs"; - private static final Pattern APIDOCS_RESOURCE_PATH = Pattern.compile(APIDOCS_LISTING_PATH + "(/.+)"); - - private ApiListingResourceJSON apiListingResource; - @Context - private MessageContext mc; - SwaggerContainerRequestFilter(ApiListingResourceJSON apiListingResource) { - this.apiListingResource = apiListingResource; - } - - @Override - public void filter(ContainerRequestContext requestContext) throws IOException { - UriInfo ui = mc.getUriInfo(); - if (ui.getPath().endsWith(APIDOCS_LISTING_PATH)) { - Response r = - apiListingResource.resourceListing(null, mc.getServletConfig(), mc.getHttpHeaders(), ui); - requestContext.abortWith(r); - } else { - final Matcher matcher = APIDOCS_RESOURCE_PATH.matcher(ui.getPath()); - - if (matcher.find()) { - Response r = - apiListingResource.apiDeclaration(matcher.group(1), - null, mc.getServletConfig(), mc.getHttpHeaders(), ui); - requestContext.abortWith(r); - } - } - } - - } -} http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/SwaggerFeatureTest.java ---------------------------------------------------------------------- diff --git a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/SwaggerFeatureTest.java b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/SwaggerFeatureTest.java deleted file mode 100644 index a1922d5..0000000 --- a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/SwaggerFeatureTest.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * - * 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. - */ - -package org.apache.cxf.jaxrs.swagger; - -import org.junit.Assert; -import org.junit.Test; - -/** - * - */ -public class SwaggerFeatureTest extends Assert { - @Test - public void testSetBasePathByAddress() { - SwaggerFeature f = new SwaggerFeature(); - - f.setBasePathByAddress("http://localhost:8080/foo";); - assertEquals("http://localhost:8080/foo";, f.getBasePath()); - unsetBasePath(f); - - f.setBasePathByAddress("/foo"); - assertEquals("/foo", f.getBasePath()); - unsetBasePath(f); - } - - private static void unsetBasePath(SwaggerFeature f) { - f.setBasePath(null); - } -} http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/systests/jaxrs/pom.xml ---------------------------------------------------------------------- diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml index 859bfea..6c61668 100644 --- a/systests/jaxrs/pom.xml +++ b/systests/jaxrs/pom.xml @@ -135,18 +135,6 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - <!-- For Swagger 1.2 tests --> - <dependency> - <groupId>com.wordnik</groupId> - <artifactId>swagger-jaxrs_2.10</artifactId> - <exclusions> - <exclusion> - <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - </exclusion> - </exclusions> - <optional>true</optional> - </dependency> <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java deleted file mode 100644 index ee33d63..0000000 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/AbstractSwaggerServiceDescriptionTest.java +++ /dev/null @@ -1,248 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * - * 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. - */ -package org.apache.cxf.systest.jaxrs.description; - -import java.io.InputStream; -import java.util.Arrays; - -import javax.json.Json; -import javax.json.JsonObject; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; - -import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; -import org.apache.cxf.jaxrs.client.WebClient; -import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider; -import org.apache.cxf.jaxrs.model.AbstractResourceInfo; -import org.apache.cxf.jaxrs.swagger.SwaggerFeature; -import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; -import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -import org.junit.Ignore; -import org.junit.Test; - -public abstract class AbstractSwaggerServiceDescriptionTest extends AbstractBusClientServerTestBase { - private static final JsonObject DELETE_METHOD_SPEC = Json.createObjectBuilder() - .add("method", "DELETE") - .add("summary", "Delete book") - .add("notes", "Delete book") - .add("type", "void") - .add("nickname", "delete") - .add("parameters", Json.createArrayBuilder() - .add(Json.createObjectBuilder() - .add("name", "id") - .add("description", "id") - .add("required", true) - .add("type", "string") - .add("paramType", "path") - .add("allowMultiple", false) - ) - ).build(); - - private static final JsonObject GET_BY_ID_METHOD_SPEC = Json.createObjectBuilder() - .add("method", "GET") - .add("summary", "Get book by Id") - .add("notes", "Get book by Id") - .add("type", "Book") - .add("nickname", "getBook") - .add("produces", Json.createArrayBuilder().add("application/json")) - .add("parameters", Json.createArrayBuilder() - .add(Json.createObjectBuilder() - .add("name", "id") - .add("description", "id") - .add("required", true) - .add("type", "integer") - .add("format", "int64") - .add("paramType", "path") - .add("allowMultiple", false) - ) - ).build(); - - private static final JsonObject GET_METHOD_SPEC = Json.createObjectBuilder() - .add("method", "GET") - .add("summary", "Get books") - .add("notes", "Get books") - .add("type", "array") - .add("items", Json.createObjectBuilder().add("$ref", "Book")) - .add("nickname", "getBooks") - .add("produces", Json.createArrayBuilder().add("application/json")) - .add("parameters", Json.createArrayBuilder() - .add(Json.createObjectBuilder() - .add("name", "page") - .add("description", "Page to fetch") - .add("defaultValue", "1") - .add("required", true) - .add("type", "integer") - .add("format", "int32") - .add("paramType", "query") - .add("allowMultiple", false) - ) - ).build(); - - private static final JsonObject BOOK_MODEL_SPEC = Json.createObjectBuilder() - .add("Book", Json.createObjectBuilder() - .add("id", "Book") - .add("discriminator", "class") - .add("properties", Json.createObjectBuilder() - .add("name", Json.createObjectBuilder().add("type", "string")) - .add("id", Json.createObjectBuilder() - .add("type", "integer") - .add("format", "int64") - ) - ) - ).build(); - - @Ignore - public abstract static class Server extends AbstractBusTestServerBase { - private final String port; - private final boolean runAsFilter; - - Server(final String port, final boolean runAsFilter) { - this.port = port; - this.runAsFilter = runAsFilter; - } - - protected void run() { - final JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean(); - sf.setResourceClasses(BookStoreSwagger.class); - sf.setResourceProvider(BookStoreSwagger.class, - new SingletonResourceProvider(new BookStoreSwagger())); - sf.setProvider(new JacksonJsonProvider()); - final SwaggerFeature feature = new SwaggerFeature(); - feature.setRunAsFilter(runAsFilter); - sf.setFeatures(Arrays.asList(feature)); - sf.setAddress("http://localhost:"; + port + "/"); - sf.create(); - } - - protected static void start(final Server s) { - try { - s.start(); - } catch (Exception ex) { - ex.printStackTrace(); - System.exit(-1); - } finally { - System.out.println("done!"); - } - } - } - - protected static void startServers(final Class< ? extends Server> serverClass) throws Exception { - AbstractResourceInfo.clearAllMaps(); - //keep out of process due to stack traces testing failures - assertTrue("server did not launch correctly", launchServer(serverClass, false)); - createStaticBus(); - } - - protected abstract String getPort(); - - @Test - public void testApiListingIsProperlyReturned() throws Exception { - final WebClient client = createWebClient("/api-docs"); - - try { - final Response r = client.get(); - assertEquals(Status.OK.getStatusCode(), r.getStatus()); - - JsonObject expected = Json.createObjectBuilder() - .add("apiVersion", "1.0.0") - .add("swaggerVersion", "1.2") - .add("apis", Json.createArrayBuilder() - .add(Json.createObjectBuilder() - .add("path", "/bookstore") - .add("description", "Sample JAX-RS service with Swagger documentation") - ) - ) - .add("info", Json.createObjectBuilder() - .add("title", "Sample REST Application") - .add("description", "The Application") - .add("contact", "[email protected]") - .add("license", "Apache 2.0 License") - .add("licenseUrl", "http://www.apache.org/licenses/LICENSE-2.0.html";) - ).build(); - JsonObject received = Json.createReader((InputStream)r.getEntity()).readObject(); - assertEquals(expected, received); - } finally { - client.close(); - } - } - - @Test - public void testApiResourcesAreProperlyReturned() throws Exception { - final WebClient client = createWebClient("/api-docs/bookstore"); - - try { - final Response r = client.get(); - assertEquals(Status.OK.getStatusCode(), r.getStatus()); - - JsonObject expected1 = Json.createObjectBuilder() - .add("apiVersion", "1.0.0") - .add("swaggerVersion", "1.2") - .add("basePath", "http://localhost:"; + getPort() + "/") - .add("resourcePath", "/bookstore") - .add("apis", Json.createArrayBuilder() - .add(Json.createObjectBuilder() - .add("path", "/bookstore/{id}") - .add("operations", Json.createArrayBuilder() - .add(GET_BY_ID_METHOD_SPEC) - .add(DELETE_METHOD_SPEC))) - .add(Json.createObjectBuilder() - .add("path", "/bookstore") - .add("operations", Json.createArrayBuilder().add(GET_METHOD_SPEC)))) - .add("models", BOOK_MODEL_SPEC).build(); - - JsonObject expected2 = Json.createObjectBuilder() - .add("apiVersion", "1.0.0") - .add("swaggerVersion", "1.2") - .add("basePath", "http://localhost:"; + getPort() + "/") - .add("resourcePath", "/bookstore") - .add("apis", Json.createArrayBuilder() - .add(Json.createObjectBuilder() - .add("path", "/bookstore/{id}") - .add("operations", Json.createArrayBuilder() - .add(DELETE_METHOD_SPEC) - .add(GET_BY_ID_METHOD_SPEC))) - .add(Json.createObjectBuilder() - .add("path", "/bookstore") - .add("operations", Json.createArrayBuilder().add(GET_METHOD_SPEC)))) - .add("models", BOOK_MODEL_SPEC).build(); - - JsonObject received = Json.createReader((InputStream)r.getEntity()).readObject(); - assertTrue(expected1.equals(received) || expected2.equals(received)); - - } finally { - client.close(); - } - } - - @Test - public void testNonRegisteredApiResourcesAreNotReturned() throws Exception { - final Response r = createWebClient("/api-docs/books").get(); - assertEquals(Status.NOT_FOUND.getStatusCode(), r.getStatus()); - } - - private WebClient createWebClient(final String url) { - return WebClient - .create("http://localhost:"; + getPort() + url, - Arrays.< Object >asList(new JacksonJsonProvider())) - .accept(MediaType.APPLICATION_JSON); - } -} http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/BookStoreSwagger.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/BookStoreSwagger.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/BookStoreSwagger.java deleted file mode 100644 index 94e4902..0000000 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/BookStoreSwagger.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * - * 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. - */ - -package org.apache.cxf.systest.jaxrs.description; - -import java.util.Arrays; - -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - -import com.wordnik.swagger.annotations.Api; -import com.wordnik.swagger.annotations.ApiOperation; -import com.wordnik.swagger.annotations.ApiParam; - -import org.apache.cxf.systest.jaxrs.Book; - -@Path("/bookstore") -@Api(value = "/bookstore", description = "Sample JAX-RS service with Swagger documentation") -public class BookStoreSwagger { - @Produces({ MediaType.APPLICATION_JSON }) - @GET - @ApiOperation( - value = "Get books", - notes = "Get books", - response = Book.class, - responseContainer = "List" - ) - public Response getBooks( - @ApiParam(value = "Page to fetch", required = true) @QueryParam("page") @DefaultValue("1") int page) { - return Response.ok( - Arrays.asList( - new Book("Book 1", 1), - new Book("Book 2", 2) - ) - ).build(); - } - - @Produces({ MediaType.APPLICATION_JSON }) - @Path("/{id}") - @GET - @ApiOperation( - value = "Get book by Id", - notes = "Get book by Id", - response = Book.class - ) - public Book getBook(@ApiParam(value = "id", required = true) @PathParam("id") Long id) { - return new Book("Book", id); - } - - @Path("/{id}") - @DELETE - @ApiOperation( - value = "Delete book", - notes = "Delete book" - ) - public Response delete(@ApiParam(value = "id", required = true) @PathParam("id") String id) { - return Response.ok().build(); - } -} http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerFilterServiceDescriptionTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerFilterServiceDescriptionTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerFilterServiceDescriptionTest.java deleted file mode 100644 index cb30097..0000000 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerFilterServiceDescriptionTest.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * - * 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. - */ -package org.apache.cxf.systest.jaxrs.description; - -import org.junit.BeforeClass; -import org.junit.Ignore; - -public class SwaggerFilterServiceDescriptionTest extends AbstractSwaggerServiceDescriptionTest { - private static final String PORT = allocatePort(SwaggerFilterServiceDescriptionTest.class); - - @Ignore - public static class SwaggerFilter extends Server { - public SwaggerFilter() { - super(PORT, true); - } - - public static void main(String[] args) { - start(new SwaggerFilter()); - } - } - - @BeforeClass - public static void startServers() throws Exception { - startServers(SwaggerFilter.class); - } - - @Override - protected String getPort() { - return PORT; - } -} http://git-wip-us.apache.org/repos/asf/cxf/blob/8ef43eff/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerRegularServiceDescriptionTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerRegularServiceDescriptionTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerRegularServiceDescriptionTest.java deleted file mode 100644 index 7b19605..0000000 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerRegularServiceDescriptionTest.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * - * 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. - */ -package org.apache.cxf.systest.jaxrs.description; - -import org.junit.BeforeClass; -import org.junit.Ignore; - -public class SwaggerRegularServiceDescriptionTest extends AbstractSwaggerServiceDescriptionTest { - private static final String PORT = allocatePort(SwaggerRegularServiceDescriptionTest.class); - - @Ignore - public static class SwaggerRegular extends Server { - public SwaggerRegular() { - super(PORT, false); - } - - public static void main(String[] args) { - start(new SwaggerRegular()); - } - } - - @BeforeClass - public static void startServers() throws Exception { - startServers(SwaggerRegular.class); - } - - @Override - protected String getPort() { - return PORT; - } -}
