You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by bl...@apache.org on 2009/08/27 18:14:11 UTC
svn commit: r808486 - in /incubator/wink/trunk/wink-common/src:
main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java
test/java/org/apache/wink/common/internal/providers/ProvidersContextResolverTest.java
Author: bluk
Date: Thu Aug 27 16:14:09 2009
New Revision: 808486
URL: http://svn.apache.org/viewvc?rev=808486&view=rev
Log:
Allow null as MediaType in ContextResolver
[See WINK-153]
Modified:
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersContextResolverTest.java
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java?rev=808486&r1=808485&r2=808486&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java Thu Aug 27 16:14:09 2009
@@ -178,7 +178,8 @@
throw new NullPointerException("contextType");
}
if (mediaType == null) {
- throw new NullPointerException("mediaType");
+ // see https://issues.apache.org/jira/browse/WINK-153
+ mediaType = MediaType.WILDCARD_TYPE;
}
readersLock.lock();
try {
Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersContextResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersContextResolverTest.java?rev=808486&r1=808485&r2=808486&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersContextResolverTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/providers/ProvidersContextResolverTest.java Thu Aug 27 16:14:09 2009
@@ -257,4 +257,18 @@
null).getContext(String.class));
}
+ public void testContextResolverNullMediaType() {
+ ProvidersRegistry providers = createProvidersRegistryImpl();
+ // note: the order these are added is important to the test
+ assertTrue(providers.addProvider(new StringContextResolver4()));
+ assertTrue(providers.addProvider(new StringContextResolver3()));
+ assertTrue(providers.addProvider(new StringContextResolver2()));
+
+ // StringContextResolver2 takes priority over the others due to the
+ // media type in @Produces
+ assertSame(STRING2, providers.getContextResolver(String.class,
+ null,
+ null).getContext(String.class));
+ }
+
}