Author: asoldano Date: 2015-05-27 08:59:45 -0400 (Wed, 27 May 2015) New Revision: 19759 Modified: stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/HandlerAuthInterceptor.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/MTOMOutInterceptor.java Log: [CXF-6421] Use Exchange direct accessors to data where available Modified: stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java =================================================================== --- stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java 2015-05-26 14:53:03 UTC (rev 19758) +++ stack/cxf/trunk/modules/jaspi/src/main/java/org/jboss/wsf/stack/cxf/jaspi/JaspiServerAuthenticator.java 2015-05-27 12:59:45 UTC (rev 19759) @@ -80,7 +80,7 @@ if (messageInfo.getResponseMessage() != null && !message.getExchange().isOneWay()) { - Endpoint e = message.getExchange().get(Endpoint.class); + Endpoint e = message.getExchange().getEndpoint(); response = new MessageImpl(); response.setExchange(message.getExchange()); Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2015-05-26 14:53:03 UTC (rev 19758) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2015-05-27 12:59:45 UTC (rev 19759) @@ -120,8 +120,8 @@ @Override public Object invoke(Exchange exchange, Object o) { - BindingOperationInfo bop = exchange.get(BindingOperationInfo.class); - MethodDispatcher md = (MethodDispatcher) exchange.get(Service.class).get(MethodDispatcher.class.getName()); + BindingOperationInfo bop = exchange.getBindingOperationInfo(); + MethodDispatcher md = (MethodDispatcher) exchange.getService().get(MethodDispatcher.class.getName()); List<Object> params = null; if (o instanceof List) { params = CastUtils.cast((List<?>) o); Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/HandlerAuthInterceptor.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/HandlerAuthInterceptor.java 2015-05-26 14:53:03 UTC (rev 19758) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/HandlerAuthInterceptor.java 2015-05-27 12:59:45 UTC (rev 19759) @@ -42,7 +42,6 @@ import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; import org.apache.cxf.security.SecurityContext; -import org.apache.cxf.service.Service; import org.apache.cxf.service.invoker.MethodDispatcher; import org.apache.cxf.service.model.BindingOperationInfo; import org.jboss.wsf.spi.deployment.Endpoint; @@ -146,8 +145,8 @@ if (attributeProvider != null) //ejb endpoints only can be associated with this... { SecurityContext secCtx = message.get(SecurityContext.class); - BindingOperationInfo bop = exchange.get(BindingOperationInfo.class); - MethodDispatcher md = (MethodDispatcher) exchange.get(Service.class).get(MethodDispatcher.class.getName()); + BindingOperationInfo bop = exchange.getBindingOperationInfo(); + MethodDispatcher md = (MethodDispatcher) exchange.getService().get(MethodDispatcher.class.getName()); Method method = md.getMethod(bop); EJBMethodSecurityAttribute attributes = attributeProvider.getSecurityAttributes(method); Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/MTOMOutInterceptor.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/MTOMOutInterceptor.java 2015-05-26 14:53:03 UTC (rev 19758) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3593/MTOMOutInterceptor.java 2015-05-27 12:59:45 UTC (rev 19759) @@ -41,7 +41,7 @@ public void handleMessage(Message message) { - MessageInfo mi = (MessageInfo)message.get(MessageInfo.class.getName()); + MessageInfo mi = (MessageInfo)message.get(MessageInfo.class); if ("echoStringsResponse".equals(mi.getName().getLocalPart())) { message.put("mtom-enabled", false); }