Author: richard.opalka(a)jboss.com Date: 2010-10-26 08:46:45 -0400 (Tue, 26 Oct 2010) New Revision: 13188 Modified: common/trunk/src/main/java/org/jboss/wsf/common/serviceref/AbstractServiceObjectFactoryJAXWS.java common/trunk/src/main/java/org/jboss/wsf/common/serviceref/AbstractServiceRefBinderJAXWS.java common/trunk/src/main/java/org/jboss/wsf/common/serviceref/AbstractServiceReferenceableJAXWS.java common/trunk/src/main/java/org/jboss/wsf/common/serviceref/ServiceRefSerializer.java Log: refactoring Modified: common/trunk/src/main/java/org/jboss/wsf/common/serviceref/AbstractServiceObjectFactoryJAXWS.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/serviceref/AbstractServiceObjectFactoryJAXWS.java 2010-10-25 17:29:29 UTC (rev 13187) +++ common/trunk/src/main/java/org/jboss/wsf/common/serviceref/AbstractServiceObjectFactoryJAXWS.java 2010-10-26 12:46:45 UTC (rev 13188) @@ -84,8 +84,8 @@ final byte[] binaryData = (byte[]) ref.get(ServiceRefSerializer.SERVICE_REF_META_DATA).getContent(); final UnifiedServiceRefMetaData serviceRef = ServiceRefSerializer.unmarshall(binaryData); // class names - final String serviceImplClass = this.getServiceClassName(ref, serviceRef); - final String targetClassName = this.getTargetClassName(ref, serviceRef, serviceImplClass); + final String serviceImplClass = this.getServiceClassName(serviceRef); + final String targetClassName = this.getTargetClassName(serviceRef); // class instances final Class<?> serviceClass = this.getClass(serviceImplClass); final Class<?> targetClass = this.getClass(targetClassName); @@ -156,24 +156,17 @@ return null; } - private String getServiceClassName(final Reference ref, final UnifiedServiceRefMetaData serviceRefMD) + private String getServiceClassName(final UnifiedServiceRefMetaData serviceRefMD) { - String serviceClassName = serviceRefMD.getServiceImplClass(); - if (serviceClassName == null) - serviceClassName = (String) ref.get(ServiceRefSerializer.SERVICE_IMPL_CLASS).getContent(); - - return serviceClassName; + return serviceRefMD.getServiceImplClass(); } - private String getTargetClassName(final Reference ref, final UnifiedServiceRefMetaData serviceRefMD, - final String serviceImplClass) + private String getTargetClassName(final UnifiedServiceRefMetaData serviceRefMD) { String targetClassName = serviceRefMD.getServiceRefType(); - if (targetClassName == null) - targetClassName = (String) ref.get(ServiceRefSerializer.TARGET_CLASS_NAME).getContent(); if (Service.class.getName().equals(targetClassName)) - targetClassName = serviceImplClass; + targetClassName = serviceRefMD.getServiceImplClass(); return targetClassName; } Modified: common/trunk/src/main/java/org/jboss/wsf/common/serviceref/AbstractServiceRefBinderJAXWS.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/serviceref/AbstractServiceRefBinderJAXWS.java 2010-10-25 17:29:29 UTC (rev 13187) +++ common/trunk/src/main/java/org/jboss/wsf/common/serviceref/AbstractServiceRefBinderJAXWS.java 2010-10-26 12:46:45 UTC (rev 13188) @@ -65,7 +65,11 @@ this.processWsdlOverride(serviceRef, serviceRefAnnotation, loader, serviceImplClassName); - return this.createJAXWSReferenceable(serviceImplClassName, targetClassName, serviceRef); + // TODO: refactor these two lines of code higher + serviceRef.setServiceImplClass(serviceImplClassName); + serviceRef.setServiceInterface(targetClassName); + + return this.createJAXWSReferenceable(serviceRef); } /** @@ -76,8 +80,7 @@ * @param serviceRef service reference UMDM * @return stack specific JAXWS JNDI referenceable */ - protected abstract Referenceable createJAXWSReferenceable(final String serviceImplClass, - final String targetClassName, final UnifiedServiceRefMetaData serviceRefMD); + protected abstract Referenceable createJAXWSReferenceable(final UnifiedServiceRefMetaData serviceRefMD); private void processAddressingAnnotation(final UnifiedServiceRefMetaData serviceRefMD) { Modified: common/trunk/src/main/java/org/jboss/wsf/common/serviceref/AbstractServiceReferenceableJAXWS.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/serviceref/AbstractServiceReferenceableJAXWS.java 2010-10-25 17:29:29 UTC (rev 13187) +++ common/trunk/src/main/java/org/jboss/wsf/common/serviceref/AbstractServiceReferenceableJAXWS.java 2010-10-26 12:46:45 UTC (rev 13188) @@ -25,7 +25,6 @@ import javax.naming.NamingException; import javax.naming.Reference; import javax.naming.Referenceable; -import javax.naming.StringRefAddr; import javax.naming.spi.ObjectFactory; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; @@ -42,30 +41,21 @@ */ public abstract class AbstractServiceReferenceableJAXWS<T extends ObjectFactory> implements Referenceable { - private final String serviceImplClass; - - private final String targetClassName; - private final UnifiedServiceRefMetaData serviceRef; - public AbstractServiceReferenceableJAXWS(final String serviceImplClass, final String targetClassName, - final UnifiedServiceRefMetaData serviceRef) + public AbstractServiceReferenceableJAXWS(final UnifiedServiceRefMetaData serviceRef) { - this.serviceImplClass = serviceImplClass; - this.targetClassName = targetClassName; this.serviceRef = serviceRef; } public final Reference getReference() throws NamingException { - final Reference myRef = new Reference(getClass().getName(), this.getObjectFactory().getName(), null); + final Reference reference = new Reference(getClass().getName(), this.getObjectFactory().getName(), null); + final byte[] data = ServiceRefSerializer.marshall(this.serviceRef); - myRef.add(new StringRefAddr(ServiceRefSerializer.SERVICE_IMPL_CLASS, this.serviceImplClass)); - myRef.add(new StringRefAddr(ServiceRefSerializer.TARGET_CLASS_NAME, this.targetClassName)); - myRef.add(new BinaryRefAddr(ServiceRefSerializer.SERVICE_REF_META_DATA, ServiceRefSerializer - .marshall(this.serviceRef))); + reference.add(new BinaryRefAddr(ServiceRefSerializer.SERVICE_REF_META_DATA, data)); - return myRef; + return reference; } /** @@ -74,16 +64,4 @@ * @return JNDI object factory */ protected abstract Class<T> getObjectFactory(); - - public final String toString() - { - final StringBuilder sb = new StringBuilder(); - - sb.append("\n").append(getClass().getName()); - sb.append("\n serviceImplClass=" + serviceImplClass); - sb.append("\n targetClassName=" + targetClassName); - sb.append("\n serviceRef=" + this.serviceRef); - - return sb.toString(); - } } Modified: common/trunk/src/main/java/org/jboss/wsf/common/serviceref/ServiceRefSerializer.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/serviceref/ServiceRefSerializer.java 2010-10-25 17:29:29 UTC (rev 13187) +++ common/trunk/src/main/java/org/jboss/wsf/common/serviceref/ServiceRefSerializer.java 2010-10-26 12:46:45 UTC (rev 13188) @@ -40,10 +40,6 @@ { public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA"; - public static final String SERVICE_IMPL_CLASS = "SERVICE_CLASS_NAME"; - - public static final String TARGET_CLASS_NAME = "TARGET_CLASS_NAME"; - private ServiceRefSerializer() { // forbidden constructor