You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2020/12/07 15:48:54 UTC
[cxf] branch 3.4.x-fixes updated (76ff1e8 -> 0097cfa)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 76ff1e8 update bouncycastle dependency
new 3436215 Update to Swagger Core 2.1.6 (#733)
new 7e929ae Fixing javadoc generation (JDK11), missing micrometer dependencies
new 0097cfa Recording .gitmergeinfo Changes
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 1 +
distribution/javadoc/pom.xml | 5 ++-
parent/pom.xml | 2 +-
.../apache/cxf/systest/jaxrs/AtomBookStore.java | 3 --
.../apache/cxf/systest/jaxrs/AtomBookStore2.java | 3 --
.../apache/cxf/systest/jaxrs/AtomBookStore3.java | 3 --
.../nonspring/JAXRSNonSpringJaxrsServletTest.java | 47 +++++++++++++++++-----
7 files changed, 44 insertions(+), 20 deletions(-)
[cxf] 01/03: Update to Swagger Core 2.1.6 (#733)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3436215413082598adb4353489fce4754854b516
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Dec 7 09:24:36 2020 -0500
Update to Swagger Core 2.1.6 (#733)
(cherry picked from commit 9c17f2fb90a9929d0dc8e4f090da78547a4e7a02)
---
parent/pom.xml | 2 +-
.../apache/cxf/systest/jaxrs/AtomBookStore.java | 3 --
.../apache/cxf/systest/jaxrs/AtomBookStore2.java | 3 --
.../apache/cxf/systest/jaxrs/AtomBookStore3.java | 3 --
.../nonspring/JAXRSNonSpringJaxrsServletTest.java | 47 +++++++++++++++++-----
5 files changed, 39 insertions(+), 19 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index c7ea338..f26ff66 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -202,7 +202,7 @@
<cxf.spring.version>5.2.11.RELEASE</cxf.spring.version>
<cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
<cxf.swagger.ui.version>3.37.0</cxf.swagger.ui.version>
- <cxf.swagger.v3.version>2.1.5</cxf.swagger.v3.version>
+ <cxf.swagger.v3.version>2.1.6</cxf.swagger.v3.version>
<cxf.swagger2.version>1.6.2</cxf.swagger2.version>
<cxf.swagger2.guava.version>27.0-jre</cxf.swagger2.guava.version>
<cxf.tika.version>1.25</cxf.tika.version>
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java
index 6fd8ce0..d462c46 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore.java
@@ -47,10 +47,7 @@ import org.apache.abdera.model.Feed;
import org.apache.cxf.customer.book.BookNotFoundDetails;
import org.apache.cxf.customer.book.BookNotFoundFault;
-import io.swagger.v3.oas.annotations.Hidden;
-
@Path("/")
-@Hidden /* Excluding from Swagger's scans (Abdera's classes break model introspection */
public class AtomBookStore {
@Context protected UriInfo uField;
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore2.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore2.java
index 2dd7554..bb3587c 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore2.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore2.java
@@ -29,10 +29,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.abdera.model.Feed;
-import io.swagger.v3.oas.annotations.Hidden;
-
@Path("/")
-@Hidden /* Excluding from Swagger's scans (Abdera's classes break model introspection */
public class AtomBookStore2 extends AtomBookStore {
@GET
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore3.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore3.java
index f40d7bc..59df36d 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore3.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookStore3.java
@@ -25,10 +25,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.UriInfo;
-import io.swagger.v3.oas.annotations.Hidden;
-
@Path("/atom")
-@Hidden /* Excluding from Swagger's scans (Abdera's classes break model introspection */
public class AtomBookStore3 extends AtomBookStore {
@Context
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nonspring/JAXRSNonSpringJaxrsServletTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nonspring/JAXRSNonSpringJaxrsServletTest.java
index 16a8560..85327a8 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nonspring/JAXRSNonSpringJaxrsServletTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nonspring/JAXRSNonSpringJaxrsServletTest.java
@@ -19,19 +19,28 @@
package org.apache.cxf.systest.jaxrs.nonspring;
+import java.io.IOException;
+
import javax.ws.rs.core.Response;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.systest.jaxrs.Book;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import io.swagger.v3.core.util.Json;
+
import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+
/**
* A test for launching the JAX-RS service using CXFNonSpringJaxrsServlet
*/
@@ -65,16 +74,36 @@ public class JAXRSNonSpringJaxrsServletTest extends AbstractBusClientServerTestB
@Test
public void testFeatureOnResourceClassUsingApplication() throws Exception {
- String address = "http://localhost:" + PORT2 + "/bookstore/;JSESSIONID=xxx";
- WebClient wc = WebClient.create(address);
- Book book = wc.get(Book.class);
- assertEquals(124L, book.getId());
- assertEquals("root", book.getName());
+ final JsonSerializer<Object> defaultNullKeySerializer = Json
+ .mapper()
+ .getSerializerProvider()
+ .getDefaultNullKeySerializer();
- // Check OpenAPI feature is working correctly
- wc = WebClient.create("http://localhost:" + PORT2 + "/openapi.json");
- Response openAPIResponse = wc.get();
- assertEquals(200, openAPIResponse.getStatus());
+ try {
+ // Swagger Core v3 does not interpret FormParam("") properly, sets property key as 'null' and fails the
+ // serialization with "Null key for a Map not allowed in JSON (use a converting NullKeySerializer?)"
+ Json.mapper().getSerializerProvider().setNullKeySerializer(new JsonSerializer<Object>() {
+ @Override
+ public void serialize(Object value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+ gen.writeFieldName("");
+ }
+ });
+
+ String address = "http://localhost:" + PORT2 + "/bookstore/;JSESSIONID=xxx";
+ WebClient wc = WebClient.create(address);
+ Book book = wc.get(Book.class);
+ assertEquals(124L, book.getId());
+ assertEquals("root", book.getName());
+
+ // Check OpenAPI feature is working correctly
+ wc = WebClient.create("http://localhost:" + PORT2 + "/openapi.json");
+ Response openAPIResponse = wc.get();
+ assertEquals(200, openAPIResponse.getStatus());
+ } finally {
+ if (defaultNullKeySerializer != null) {
+ Json.mapper().getSerializerProvider().setNullKeySerializer(defaultNullKeySerializer);
+ }
+ }
}
}
\ No newline at end of file
[cxf] 03/03: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0097cfad6adf24ac404d575a153a66ccfd06c689
Author: reta <dr...@gmail.com>
AuthorDate: Mon Dec 7 10:46:44 2020 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 44ed9b4..8b613f5 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -9,6 +9,7 @@ B c58d2cd38003a90608aa04e40756c042cbaf7e03
B f5f08c838e1d52f17bcc8422fac38831a63e6e30
M 4162189dabdb22aec54dc3c5ae93cf42b0575d3d
M 8c4f04855a5d8623daff2aa8a8856367879c624b
+M 9c17f2fb90a9929d0dc8e4f090da78547a4e7a02
M 9df9b22a4032b19ea953600ebdfa84e8c15d2370
M c0ef051466d775c84ddb20a9a12025d4258fb18b
M fb7821164ec6d7fb98dc3f8caea67465db230a14
[cxf] 02/03: Fixing javadoc generation (JDK11),
missing micrometer dependencies
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 7e929aec8f2c2028d15b46f5da5df99cf3e91245
Author: reta <dr...@gmail.com>
AuthorDate: Mon Dec 7 10:46:06 2020 -0500
Fixing javadoc generation (JDK11), missing micrometer dependencies
(cherry picked from commit bb72206d0ed811a2c32012012fdc01ec973567a3)
---
distribution/javadoc/pom.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 263546e..533d6f6 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -567,7 +567,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-jexl3</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>io.micrometer</groupId>
+ <artifactId>micrometer-core</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>