You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2008/11/18 18:30:17 UTC
svn commit: r718661 - in /cxf/branches/2.1.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/
rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/
Author: sergeyb
Date: Tue Nov 18 09:30:17 2008
New Revision: 718661
URL: http://svn.apache.org/viewvc?rev=718661&view=rev
Log:
Merged revisions 711635 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r711635 | sergeyb | 2008-11-05 17:39:37 +0000 (Wed, 05 Nov 2008) | 1 line
JAX-RS : minor fix to enable @Resource proxies plus adding HttpServletResponse proxy
........
Added:
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java
- copied unchanged from r711635, cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 18 09:30:17 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708417,708550,708554,709353-709354,709425,710076,710150,710154,71138
8,711410,711490,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713804,713899,714167-714168,714245,717937-717961,718620
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708417,708550,708554,709353-709354,709425,710076,710150,710154,71138
8,711410,711490,711635,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713804,713899,714167-714168,714245,717937-717961,718620
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java?rev=718661&r1=718660&r2=718661&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java Tue Nov 18 09:30:17 2008
@@ -41,6 +41,7 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Request;
@@ -55,6 +56,7 @@
import org.apache.cxf.jaxrs.impl.tl.ThreadLocalContextResolver;
import org.apache.cxf.jaxrs.impl.tl.ThreadLocalHttpHeaders;
import org.apache.cxf.jaxrs.impl.tl.ThreadLocalHttpServletRequest;
+import org.apache.cxf.jaxrs.impl.tl.ThreadLocalHttpServletResponse;
import org.apache.cxf.jaxrs.impl.tl.ThreadLocalMessageBodyWorkers;
import org.apache.cxf.jaxrs.impl.tl.ThreadLocalProxy;
import org.apache.cxf.jaxrs.impl.tl.ThreadLocalRequest;
@@ -296,6 +298,8 @@
proxy = new ThreadLocalHttpServletRequest();
} else if (ServletContext.class.isAssignableFrom(type)) {
proxy = new ThreadLocalServletContext();
+ } else if (HttpServletResponse.class.isAssignableFrom(type)) {
+ proxy = new ThreadLocalHttpServletResponse();
}
return proxy;
}
@@ -314,6 +318,11 @@
ThreadLocalProxy proxy = cri.getContextFieldProxy(f);
InjectionUtils.injectFieldValue(f, instance, proxy);
}
+
+ for (Field f : cri.getResourceFields()) {
+ ThreadLocalProxy proxy = cri.getResourceFieldProxy(f);
+ InjectionUtils.injectFieldValue(f, instance, proxy);
+ }
}
@SuppressWarnings("unchecked")
Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java?rev=718661&r1=718660&r2=718661&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java Tue Nov 18 09:30:17 2008
@@ -697,6 +697,10 @@
m.put(Message.PROTOCOL_HEADERS, new HashMap<String, List<String>>());
ServletContext servletContextMock = EasyMock.createNiceMock(ServletContext.class);
m.put(AbstractHTTPDestination.HTTP_CONTEXT, servletContextMock);
+ HttpServletRequest httpRequest = EasyMock.createNiceMock(HttpServletRequest.class);
+ m.put(AbstractHTTPDestination.HTTP_REQUEST, httpRequest);
+ HttpServletResponse httpResponse = EasyMock.createNiceMock(HttpServletResponse.class);
+ m.put(AbstractHTTPDestination.HTTP_RESPONSE, httpResponse);
InjectionUtils.injectContextProxies(cri, cri.getResourceProvider().getInstance());
InjectionUtils.injectContextFields(c, cri, m);
@@ -715,7 +719,38 @@
assertSame(servletContextMock,
((ThreadLocalProxy)c.getThreadLocalServletContext()).get());
+
+ assertSame(servletContextMock,
+ ((ThreadLocalProxy)c.getServletContext()).get());
+ assertSame(httpRequest,
+ ((ThreadLocalProxy)c.getServletRequest()).get());
+ assertSame(httpResponse,
+ ((ThreadLocalProxy)c.getServletResponse()).get());
+ }
+
+ @Test
+ public void testSingletonHttpResourceFields() throws Exception {
+
+ ClassResourceInfo cri = new ClassResourceInfo(Customer.class, true);
+ Customer c = new Customer();
+ cri.setResourceProvider(new SingletonResourceProvider(c));
+
+ Message m = new MessageImpl();
+ ServletContext servletContextMock = EasyMock.createNiceMock(ServletContext.class);
+ m.put(AbstractHTTPDestination.HTTP_CONTEXT, servletContextMock);
+ HttpServletRequest httpRequest = EasyMock.createNiceMock(HttpServletRequest.class);
+ m.put(AbstractHTTPDestination.HTTP_REQUEST, httpRequest);
+ HttpServletResponse httpResponse = EasyMock.createNiceMock(HttpServletResponse.class);
+ m.put(AbstractHTTPDestination.HTTP_RESPONSE, httpResponse);
+ InjectionUtils.injectContextProxies(cri, cri.getResourceProvider().getInstance());
+ InjectionUtils.injectResourceFields(c, cri, m);
+ assertSame(servletContextMock,
+ ((ThreadLocalProxy)c.getServletContextResource()).get());
+ assertSame(httpRequest,
+ ((ThreadLocalProxy)c.getServletRequestResource()).get());
+ assertSame(httpResponse,
+ ((ThreadLocalProxy)c.getServletResponseResource()).get());
}
@Test