This is an automated email from the ASF dual-hosted git repository.
sergeyb pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.1.x-fixes by this push:
new dce3eab Making sure 3.1.x SwaggerToOpenApi filter does not block
swagger.json, with thanks to Francesco
dce3eab is described below
commit dce3eab631f34c9ab9bcf0544d0218df97326f90
Author: Sergey Beryozkin <[email protected]>
AuthorDate: Wed Dec 27 14:31:57 2017 +0000
Making sure 3.1.x SwaggerToOpenApi filter does not block swagger.json, with
thanks to Francesco
---
.../cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionFilter.java | 3 ++-
.../jaxrs/description/AbstractSwaggerServiceDescriptionTest.java | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionFilter.java
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionFilter.java
index fee536d..88332ca 100644
---
a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionFilter.java
+++
b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionFilter.java
@@ -73,7 +73,8 @@ public final class SwaggerToOpenApiConversionFilter
implements ContainerRequestF
String openApiJson =
SwaggerToOpenApiConversionUtils.getOpenApiFromSwaggerJson(swaggerJson,
openApiConfig);
os.write(StringUtils.toBytesUTF8(openApiJson));
os.flush();
-
+ } else {
+ context.proceed();
}
}
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
index 958bc0a..e37200c 100644
---
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
@@ -34,8 +34,10 @@ 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.jaxrs.swagger.openapi.SwaggerToOpenApiConversionFilter;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+
import org.junit.Ignore;
import org.junit.Test;
@@ -126,6 +128,7 @@ public abstract class AbstractSwaggerServiceDescriptionTest
extends AbstractBusC
sf.setResourceProvider(BookStoreSwagger.class,
new SingletonResourceProvider(new BookStoreSwagger()));
sf.setProvider(new JacksonJsonProvider());
+ sf.setProvider(new SwaggerToOpenApiConversionFilter());
final SwaggerFeature feature = new SwaggerFeature();
feature.setRunAsFilter(runAsFilter);
sf.setFeatures(Arrays.asList(feature));
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
