This is an automated email from the ASF dual-hosted git repository.
sergeyb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 58ead76 [CXF-7525] More renaming
58ead76 is described below
commit 58ead76f43a8b5a54e477d1271b103d0541aa989
Author: Sergey Beryozkin <sberyoz...@gmail.com>
AuthorDate: Fri Dec 8 10:50:53 2017 +0000
[CXF-7525] More renaming
---
...ggerOpenApiFilter.java => SwaggerToOpenApiConversionFilter.java} | 4 ++--
...waggerOpenApiUtils.java => SwaggerToOpenApiConversionUtils.java} | 6 +++---
...enApiUtilsTest.java => SwaggerToOpenApiConversionUtilsTest.java} | 4 ++--
.../systest/jaxrs/description/SwaggerToOpenApiConversionTest.java | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerOpenApiFilter.java
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionFilter.java
similarity index 90%
rename from
rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerOpenApiFilter.java
rename to
rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionFilter.java
index 474d41b..3dfa947 100644
---
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerOpenApiFilter.java
+++
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionFilter.java
@@ -30,7 +30,7 @@ import javax.ws.rs.ext.Provider;
@Provider
@PreMatching
-public final class SwaggerOpenApiFilter implements ContainerRequestFilter,
ContainerResponseFilter {
+public final class SwaggerToOpenApiConversionFilter implements
ContainerRequestFilter, ContainerResponseFilter {
private static final String SWAGGER_PATH = "swagger.json";
private static final String OPEN_API_PATH = "openapi.json";
@@ -51,7 +51,7 @@ public final class SwaggerOpenApiFilter implements
ContainerRequestFilter, Conta
public void filter(ContainerRequestContext reqCtx,
ContainerResponseContext respCtx) throws IOException {
if (Boolean.TRUE == reqCtx.getProperty(OPEN_API_PROPERTY)) {
String swaggerJson = (String)respCtx.getEntity();
- String openApiJson =
SwaggerOpenApiUtils.getOpenApiFromSwaggerJson(swaggerJson, openApiConfig);
+ String openApiJson =
SwaggerToOpenApiConversionUtils.getOpenApiFromSwaggerJson(swaggerJson,
openApiConfig);
respCtx.setEntity(openApiJson);
}
}
diff --git
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerOpenApiUtils.java
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtils.java
similarity index 99%
rename from
rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerOpenApiUtils.java
rename to
rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtils.java
index 32ef6d3..bf5a262 100644
---
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerOpenApiUtils.java
+++
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtils.java
@@ -40,13 +40,13 @@ import
org.apache.cxf.jaxrs.json.basic.JsonMapObjectReaderWriter;
import org.apache.cxf.jaxrs.utils.ExceptionUtils;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
-public final class SwaggerOpenApiUtils {
- private static final Logger LOG =
LogUtils.getL7dLogger(SwaggerOpenApiUtils.class);
+public final class SwaggerToOpenApiConversionUtils {
+ private static final Logger LOG =
LogUtils.getL7dLogger(SwaggerToOpenApiConversionUtils.class);
private static final List<String> SIMPLE_TYPE_RELATED_PROPS =
Arrays.asList("format", "minimum", "maximum", "default");
- private SwaggerOpenApiUtils() {
+ private SwaggerToOpenApiConversionUtils() {
}
diff --git
a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerOpenApiUtilsTest.java
b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java
similarity index 99%
rename from
rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerOpenApiUtilsTest.java
rename to
rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java
index a23c2a3..5648770 100644
---
a/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerOpenApiUtilsTest.java
+++
b/rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java
@@ -27,12 +27,12 @@ import
org.apache.cxf.jaxrs.json.basic.JsonMapObjectReaderWriter;
import org.junit.Assert;
import org.junit.Test;
-public class SwaggerOpenApiUtilsTest extends Assert {
+public class SwaggerToOpenApiConversionUtilsTest extends Assert {
@Test
public void testConvertFromSwaggerToOpenApi() {
- String s =
SwaggerOpenApiUtils.getOpenApiFromSwaggerLoc("/swagger2petShop.json");
+ String s =
SwaggerToOpenApiConversionUtils.getOpenApiFromSwaggerLoc("/swagger2petShop.json");
JsonMapObjectReaderWriter readerWriter = new
JsonMapObjectReaderWriter();
JsonMapObject sw3 = readerWriter.fromJsonToJsonObject(s);
assertEquals("3.0.0", sw3.getStringProperty("openapi"));
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerToOpenApiConversionTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerToOpenApiConversionTest.java
index 795974e..af18a66 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerToOpenApiConversionTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerToOpenApiConversionTest.java
@@ -32,7 +32,7 @@ import
org.apache.cxf.jaxrs.json.basic.JsonMapObjectReaderWriter;
import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.jaxrs.swagger.Swagger2Feature;
-import org.apache.cxf.jaxrs.swagger.openapi.SwaggerOpenApiFilter;
+import org.apache.cxf.jaxrs.swagger.openapi.SwaggerToOpenApiConversionFilter;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
@@ -58,7 +58,7 @@ public class SwaggerToOpenApiConversionTest extends
AbstractBusClientServerTestB
sf.setResourceClasses(BookStoreSwagger2.class);
sf.setResourceProvider(BookStoreSwagger2.class,
new SingletonResourceProvider(new BookStoreSwagger2()));
- sf.setProvider(new SwaggerOpenApiFilter());
+ sf.setProvider(new SwaggerToOpenApiConversionFilter());
final Swagger2Feature feature = createSwagger2Feature();
sf.setFeatures(Arrays.asList(feature));
sf.setAddress("http://localhost:"; + PORT + "/");
--
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <commits@cxf.apache.org>'].
