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 2021/04/28 00:15:21 UTC
[cxf] branch 3.4.x-fixes updated (a37f192 -> dd43884)
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 a37f192 Recording .gitmergeinfo Changes
new 8d06ec6 CXF-8516: Fixing jaxrs.spec.provider.jaxbcontext readWriteProviderTest (#779)
new dd43884 Recording .gitmergeinfo Changes
The 2 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 +
.../org/apache/cxf/jaxrs/provider/ProviderFactory.java | 8 +++++++-
.../apache/cxf/jaxrs/provider/CustomJaxbProvider.java | 11 ++++++-----
.../apache/cxf/jaxrs/provider/ProviderFactoryTest.java | 18 ++++++++++++++++++
.../apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 2 ++
...XFJaxbProvider.java => CXFJaxbElementProvider.java} | 9 +++++----
.../jaxrs/provider/JAXBContextResolverTest.java | 2 ++
7 files changed, 41 insertions(+), 10 deletions(-)
copy systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/CXFJaxbProvider.java => rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/CustomJaxbProvider.java (83%)
copy systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/{CXFJaxbProvider.java => CXFJaxbElementProvider.java} (84%)
[cxf] 02/02: 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 dd438848118f8815e10213acd0530f070a0b12df
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Apr 27 18:21:52 2021 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index d4468ac..7ce93d4 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -78,6 +78,7 @@ M 0f30442f3acb82e9936d4b486e07f5c341c142d2
M 12a70c867e88379c520c64882ca2b261b9e9559d
M 15185954d24578b3a848afe5bf258d9774ff03b6
M 1820f1a94b08ba840c3868ac3e1f3b7751540a08
+M 1955e0d57557bd682d0e7fe6bd68d3fb973c4af0
M 1c7c39771adb05f1fa8678e20b97f1c735f2601c
M 299d6a844b99a69555355b2f9baca3e6ec13a918
M 2c7b64383d81db5e7bd14abc90fbbbf0597044af
[cxf] 01/02: CXF-8516: Fixing jaxrs.spec.provider.jaxbcontext
readWriteProviderTest (#779)
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 8d06ec6873737ebf5d1d08d494dce0ecbec65d74
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Apr 27 15:57:07 2021 -0400
CXF-8516: Fixing jaxrs.spec.provider.jaxbcontext readWriteProviderTest (#779)
* CXF-8516: Fixing jaxrs.spec.provider.jaxbcontext readWriteProviderTest
* Changed the message body writers logic to take into account unrelated types
(cherry picked from commit 1955e0d57557bd682d0e7fe6bd68d3fb973c4af0)
---
.../apache/cxf/jaxrs/provider/ProviderFactory.java | 8 ++-
.../cxf/jaxrs/provider/CustomJaxbProvider.java | 70 ++++++++++++++++++++++
.../cxf/jaxrs/provider/ProviderFactoryTest.java | 18 ++++++
.../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 2 +
.../jaxrs/provider/CXFJaxbElementProvider.java | 70 ++++++++++++++++++++++
.../jaxrs/provider/JAXBContextResolverTest.java | 2 +
6 files changed, 169 insertions(+), 1 deletion(-)
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index b6a8f7e..96e1683 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -903,6 +903,7 @@ public abstract class ProviderFactory {
if (result != 0) {
return result;
}
+
result = compareCustomStatus(p1, p2);
if (result != 0) {
return result;
@@ -1131,8 +1132,13 @@ public abstract class ProviderFactory {
if (realClass1.isAssignableFrom(realClass2)) {
// subclass should go first
return 1;
+ } else if (realClass2.isAssignableFrom(realClass1)) {
+ // superclass should go last
+ return -1;
}
- return -1;
+
+ // there is no relation between the types returned by the providers
+ return 0;
}
private static Type[] getGenericInterfaces(Class<?> cls, Class<?> expectedClass) {
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/CustomJaxbProvider.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/CustomJaxbProvider.java
new file mode 100644
index 0000000..e8b343d
--- /dev/null
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/CustomJaxbProvider.java
@@ -0,0 +1,70 @@
+/**
+ * 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.provider;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+import javax.xml.bind.JAXBElement;
+
+@Provider
+public class CustomJaxbProvider implements MessageBodyReader<JAXBElement<String>>,
+ MessageBodyWriter<JAXBElement<String>> {
+
+ @Override
+ public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+ return JAXBElement.class.isAssignableFrom(type);
+ }
+
+ @Override
+ public long getSize(JAXBElement<String> t, Class<?> type, Type genericType, Annotation[] annotations,
+ MediaType mediaType) {
+ return t.getValue().toString().length() + 2;
+ }
+
+ @Override
+ public void writeTo(JAXBElement<String> t, Class<?> type, Type genericType, Annotation[] annotations,
+ MediaType mediaType, MultivaluedMap<String, Object> httpHeaders,
+ OutputStream entityStream) throws IOException, WebApplicationException {
+ entityStream.write("WriteInCXFJaxbProvider".getBytes());
+ }
+
+ @Override
+ public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+ return isWriteable(type, genericType, annotations, mediaType);
+ }
+
+ @Override
+ public JAXBElement<String> readFrom(Class<JAXBElement<String>> type, Type genericType,
+ Annotation[] annotations, MediaType mediaType,
+ MultivaluedMap<String, String> httpHeaders, InputStream entityStream)
+ throws IOException, WebApplicationException {
+ return null;
+ }
+
+}
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
index cb0435a..5d7eff7 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
@@ -56,6 +56,7 @@ import javax.ws.rs.ext.ReaderInterceptor;
import javax.ws.rs.ext.WriterInterceptor;
import javax.ws.rs.ext.WriterInterceptorContext;
import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.validation.Schema;
@@ -82,12 +83,14 @@ import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
public class ProviderFactoryTest {
@@ -425,6 +428,21 @@ public class ProviderFactoryTest {
MediaType.TEXT_XML_TYPE, new MessageImpl());
assertSame(customJaxbWriter, provider);
}
+
+ @Test
+ public void testCustomProviderAndJaxbProvider() {
+ ProviderFactory pf = ServerProviderFactory.getInstance();
+ CustomJaxbProvider provider = new CustomJaxbProvider();
+ pf.registerUserProvider(provider);
+
+ MessageBodyReader<JAXBElement> customJaxbReader = pf.createMessageBodyReader(JAXBElement.class,
+ String.class, null, MediaType.TEXT_XML_TYPE, new MessageImpl());
+ assertThat(customJaxbReader, instanceOf(JAXBElementTypedProvider.class));
+
+ MessageBodyWriter<JAXBElement> customJaxbWriter = pf.createMessageBodyWriter(JAXBElement.class,
+ String.class, null, MediaType.TEXT_XML_TYPE, new MessageImpl());
+ assertThat(customJaxbWriter, instanceOf(JAXBElementTypedProvider.class));
+ }
@Test
public void testDataSourceReader() {
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index c8341c9..3cbf337 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -35,6 +35,7 @@ import javax.annotation.Priority;
import javax.ws.rs.Consumes;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.ProcessingException;
+import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
@@ -493,6 +494,7 @@ public class JAXRSAsyncClientTest extends AbstractBusClientServerTestBase {
};
}
+ @Produces("application/xml")
private static class FaultyBookWriter implements MessageBodyWriter<Book> {
@Override
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/CXFJaxbElementProvider.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/CXFJaxbElementProvider.java
new file mode 100644
index 0000000..3f2520d
--- /dev/null
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/CXFJaxbElementProvider.java
@@ -0,0 +1,70 @@
+/**
+ * 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.provider;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+import javax.xml.bind.JAXBElement;
+
+@Provider
+public class CXFJaxbElementProvider implements MessageBodyReader<JAXBElement<String>>,
+ MessageBodyWriter<JAXBElement<String>> {
+
+ @Override
+ public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+ return JAXBElement.class.isAssignableFrom(type);
+ }
+
+ @Override
+ public long getSize(JAXBElement<String> t, Class<?> type, Type genericType, Annotation[] annotations,
+ MediaType mediaType) {
+ return t.getValue().toString().length() + 2;
+ }
+
+ @Override
+ public void writeTo(JAXBElement<String> t, Class<?> type, Type genericType, Annotation[] annotations,
+ MediaType mediaType, MultivaluedMap<String, Object> httpHeaders,
+ OutputStream entityStream) throws IOException, WebApplicationException {
+ entityStream.write("WriteInCXFJaxbProvider".getBytes());
+ }
+
+ @Override
+ public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
+ return isWriteable(type, genericType, annotations, mediaType);
+ }
+
+ @Override
+ public JAXBElement<String> readFrom(Class<JAXBElement<String>> type, Type genericType,
+ Annotation[] annotations, MediaType mediaType,
+ MultivaluedMap<String, String> httpHeaders, InputStream entityStream)
+ throws IOException, WebApplicationException {
+ return null;
+ }
+
+}
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/JAXBContextResolverTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/JAXBContextResolverTest.java
index ca66636..4f87cf5 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/JAXBContextResolverTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/provider/JAXBContextResolverTest.java
@@ -47,7 +47,9 @@ public class JAXBContextResolverTest extends AbstractClientServerTestBase {
protected void run() {
final JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(CXFResource.class);
+ sf.setProvider(new CXFJaxbElementProvider());
sf.setProvider(new CXFJaxbContextResolver());
+ sf.setProvider(new CXFJaxbProvider());
sf.setAddress("http://localhost:" + PORT + "/");
sf.create();
}