Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 201A911F73 for ; Tue, 26 Aug 2014 12:40:48 +0000 (UTC) Received: (qmail 59421 invoked by uid 500); 26 Aug 2014 12:40:48 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 59369 invoked by uid 500); 26 Aug 2014 12:40:47 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 59356 invoked by uid 99); 26 Aug 2014 12:40:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Aug 2014 12:40:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 81EEAA04D99; Tue, 26 Aug 2014 12:40:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <0b12c3b7d7894ac99af6e7782d75cab5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: [CXF-5970] Adding a test confirming the order of the providers with the same properties is preserved Date: Tue, 26 Aug 2014 12:40:47 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master fad393891 -> be6b95a69 [CXF-5970] Adding a test confirming the order of the providers with the same properties is preserved Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/be6b95a6 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/be6b95a6 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/be6b95a6 Branch: refs/heads/master Commit: be6b95a692c6670e5ad13da9d9d85ddd8dfb411b Parents: fad3938 Author: Sergey Beryozkin Authored: Tue Aug 26 13:40:16 2014 +0100 Committer: Sergey Beryozkin Committed: Tue Aug 26 13:40:16 2014 +0100 ---------------------------------------------------------------------- .../cxf/jaxrs/provider/ProviderFactoryTest.java | 50 +++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/be6b95a6/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java ---------------------------------------------------------------------- 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 150a07d..b95c2a8 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 @@ -86,6 +86,19 @@ public class ProviderFactoryTest extends Assert { } @Test + public void testOrderOfProvidersWithSameProperties() { + ProviderFactory pf = ServerProviderFactory.getInstance(); + WildcardReader reader1 = new WildcardReader(); + pf.registerUserProvider(reader1); + WildcardReader2 reader2 = new WildcardReader2(); + pf.registerUserProvider(reader2); + List>> readers = pf.getMessageReaders(); + assertEquals(2, readers.size()); + assertSame(reader1, readers.get(0).getProvider()); + assertSame(reader2, readers.get(1).getProvider()); + } + + @Test public void testCustomJaxbProvider() { ProviderFactory pf = ServerProviderFactory.getInstance(); JAXBElementProvider provider = new JAXBElementProvider(); @@ -709,7 +722,42 @@ public class ProviderFactoryTest extends Assert { } } - + + @Produces("*/*") + @Consumes("*/*") + private static class WildcardReader implements MessageBodyReader { + + public boolean isReadable(Class type, Type genericType, Annotation[] annotations, + MediaType mediaType) { + return true; + } + + public Object readFrom(Class arg0, Type arg1, Annotation[] arg2, MediaType arg3, + MultivaluedMap arg4, InputStream arg5) + throws IOException, WebApplicationException { + // TODO Auto-generated method stub + return null; + } + + } + @Produces("*/*") + @Consumes("*/*") + private static class WildcardReader2 implements MessageBodyReader { + + public boolean isReadable(Class type, Type genericType, Annotation[] annotations, + MediaType mediaType) { + return true; + } + + public Object readFrom(Class arg0, Type arg1, Annotation[] arg2, MediaType arg3, + MultivaluedMap arg4, InputStream arg5) + throws IOException, WebApplicationException { + // TODO Auto-generated method stub + return null; + } + + } + private static class RuntimeExceptionMapper1 extends AbstractTestExceptionMapper {