Author: richard.opalka(a)jboss.com Date: 2011-05-04 03:03:29 -0400 (Wed, 04 May 2011) New Revision: 14237 Modified: common/trunk/src/main/java/org/jboss/wsf/common/injection/ThreadLocalAwareWebServiceContext.java Log: refactoring - removing code duplicities Modified: common/trunk/src/main/java/org/jboss/wsf/common/injection/ThreadLocalAwareWebServiceContext.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/injection/ThreadLocalAwareWebServiceContext.java 2011-05-04 06:55:01 UTC (rev 14236) +++ common/trunk/src/main/java/org/jboss/wsf/common/injection/ThreadLocalAwareWebServiceContext.java 2011-05-04 07:03:29 UTC (rev 14237) @@ -56,63 +56,39 @@ public EndpointReference getEndpointReference(final Element... referenceParameters) { - final WebServiceContext delegee = this.contexts.get(); - - if (delegee == null) - { - throw new IllegalStateException(); - } - - return delegee.getEndpointReference(referenceParameters); + return getWebServiceContext().getEndpointReference(referenceParameters); } - public <T extends EndpointReference> T getEndpointReference(final Class<T> clazz, - final Element... referenceParameters) + public <T extends EndpointReference> T getEndpointReference(final Class<T> clazz, final Element... referenceParameters) { - final WebServiceContext delegee = this.contexts.get(); - - if (delegee == null) - { - throw new IllegalStateException(); - } - - return delegee.getEndpointReference(clazz, referenceParameters); + return getWebServiceContext().getEndpointReference(clazz, referenceParameters); } public MessageContext getMessageContext() { - final WebServiceContext delegee = this.contexts.get(); - - if (delegee == null) - { - throw new IllegalStateException(); - } - - return delegee.getMessageContext(); + return getWebServiceContext().getMessageContext(); } public Principal getUserPrincipal() { - final WebServiceContext delegee = this.contexts.get(); - - if (delegee == null) - { - throw new IllegalStateException(); - } - - return delegee.getUserPrincipal(); + return getWebServiceContext().getUserPrincipal(); } public boolean isUserInRole(String role) { - final WebServiceContext delegee = this.contexts.get(); + return getWebServiceContext().isUserInRole(role); + } + + private WebServiceContext getWebServiceContext() + { + final WebServiceContext delegate = contexts.get(); - if (delegee == null) - { - throw new IllegalStateException(); - } - - return delegee.isUserInRole(role); + if (delegate == null) + { + throw new IllegalStateException(); + } + + return delegate; } }