tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlmonte...@apache.org
Subject [10/12] tomee git commit: openejb-axis: Java Docs, use diamond operator and remove unused import
Date Wed, 05 Dec 2018 12:40:55 GMT
openejb-axis: Java Docs, use diamond operator and remove unused import


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4bc58e97
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4bc58e97
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4bc58e97

Branch: refs/heads/master
Commit: 4bc58e97c3959a478cada04c86e8187c7864186f
Parents: d27842c
Author: Hayri Cicek <hayri@kodnito.com>
Authored: Mon Dec 3 21:12:24 2018 +0100
Committer: Hayri Cicek <hayri@kodnito.com>
Committed: Mon Dec 3 21:12:24 2018 +0100

----------------------------------------------------------------------
 .../apache/openejb/server/axis/AxisService.java |   8 +-
 .../openejb/server/axis/AxisWsContainer.java    |  17 +-
 .../openejb/server/axis/EjbRpcProvider.java     |  22 +-
 .../openejb/server/axis/PojoProvider.java       |  21 ++
 .../server/axis/ReadOnlyServiceDesc.java        | 208 +++++++++++++++++++
 .../assembler/CommonsSchemaInfoBuilder.java     |  14 +-
 .../axis/assembler/CommonsSchemaLoader.java     |  11 +-
 .../HeavyweightOperationInfoBuilder.java        | 112 +++++-----
 .../assembler/HeavyweightTypeInfoBuilder.java   |  26 +--
 .../server/axis/assembler/JaxRpcFaultInfo.java  |   2 +-
 .../axis/assembler/JaxRpcOperationInfo.java     |   4 +-
 .../axis/assembler/JaxRpcServiceInfo.java       |   4 +-
 .../assembler/JaxRpcServiceInfoBuilder.java     |   2 +-
 .../server/axis/assembler/JaxRpcTypeInfo.java   |   2 +-
 .../assembler/LightweightTypeInfoBuilder.java   |   4 +-
 .../server/axis/assembler/XmlSchemaInfo.java    |   4 +-
 .../server/axis/assembler/XmlTypeInfo.java      |   4 +-
 .../server/axis/client/ArrayTypeInfo.java       |  10 +
 .../server/axis/client/AxisClientImpl.java      |   6 +
 .../axis/client/AxisServiceReference.java       |   6 +
 .../client/GenericServiceEndpointWrapper.java   |   3 +
 .../axis/client/NoOverrideCallbackFilter.java   |   8 +
 .../ServiceEndpointMethodInterceptor.java       |  10 +
 .../axis/client/ServiceMethodInterceptor.java   |  10 +
 24 files changed, 417 insertions(+), 101 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisService.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisService.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisService.java
index fbfa60c..8ba059b 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisService.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisService.java
@@ -48,8 +48,9 @@ import java.util.Map;
 import java.util.TreeMap;
 
 public class AxisService extends WsService {
-    private final Map<String, AxisWsContainer> wsContainers = new TreeMap<String, AxisWsContainer>();
+    private final Map<String, AxisWsContainer> wsContainers = new TreeMap<>();
 
+    @Override
     public String getName() {
         return "axis";
     }
@@ -95,6 +96,7 @@ public class AxisService extends WsService {
     }
 
 
+    @Override
     protected void destroyEjbWsContainer(String deploymentId) {
         AxisWsContainer container = wsContainers.remove(deploymentId);
         if (container != null) {
@@ -102,6 +104,7 @@ public class AxisService extends WsService {
         }
     }
 
+    @Override
     protected HttpListener createPojoWsContainer(ClassLoader loader, URL moduleBaseUrl, PortData port, String serviceId, Class target, Context context, String contextRoot, Map<String, Object> bdgs, ServiceConfiguration serviceInfos) throws Exception {
         ClassLoader classLoader = target.getClassLoader();
 
@@ -131,6 +134,7 @@ public class AxisService extends WsService {
         return container;
     }
 
+    @Override
     protected void destroyPojoWsContainer(String serviceId) {
         AxisWsContainer container = wsContainers.remove(serviceId);
         if (container != null) {
@@ -143,7 +147,7 @@ public class AxisService extends WsService {
         if (handlerChains == null || handlerChains.isEmpty()) return null;
         List<HandlerData> handlers = handlerChains.get(0).getHandlers();
 
-        List<HandlerInfo> handlerInfos = new ArrayList<HandlerInfo>(handlers.size());
+        List<HandlerInfo> handlerInfos = new ArrayList<>(handlers.size());
         for (HandlerData handler : handlers) {
             Class<?> handlerClass = handler.getHandlerClass();
             Map initParams = new HashMap(handler.getInitParams());

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisWsContainer.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisWsContainer.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisWsContainer.java
index d4b1d75..67ac0f9 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisWsContainer.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisWsContainer.java
@@ -50,7 +50,7 @@ import java.util.Iterator;
 import java.util.Map;
 
 public class AxisWsContainer implements HttpListener {
-    private static final Logger logger = Logger.getInstance(LogCategory.AXIS, AxisWsContainer.class);
+    private static final Logger LOGGER = Logger.getInstance(LogCategory.AXIS, AxisWsContainer.class);
     public static final String REQUEST = AxisWsContainer.class.getName() + "@Request";
     public static final String RESPONSE = AxisWsContainer.class.getName() + "@Response";
 
@@ -73,6 +73,13 @@ public class AxisWsContainer implements HttpListener {
         }
     }
 
+    /**
+     *
+     * @param request HttpRequest
+     * @param response HttpResponse
+     * @throws Exception
+     */
+    @Override
     public void onMessage(final HttpRequest request, final HttpResponse response) throws Exception {
         final SaajUniverse universe = new SaajUniverse();
         universe.set(SaajUniverse.AXIS1);
@@ -186,7 +193,7 @@ public class AxisWsContainer implements HttpListener {
                     getSOAPConstants());
                 responseMessage.writeTo(res.getOutputStream());
             } catch (final Exception e) {
-                logger.warning(Messages.getMessage("exception00"), e);
+                LOGGER.warning(Messages.getMessage("exception00"), e);
             }
         } finally {
             Thread.currentThread().setContextClassLoader(oldClassLoader);
@@ -199,13 +206,13 @@ public class AxisWsContainer implements HttpListener {
         responseMessage = context.getResponseMessage();
         res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
         Message responseMsg = responseMessage;
-        logger.warning(Messages.getMessage("exception00"), e);
+        LOGGER.warning(Messages.getMessage("exception00"), e);
         if (responseMsg == null) {
             final AxisFault fault = AxisFault.makeFault(e);
             //log the fault
             final Element runtimeException = fault.lookupFaultDetail(Constants.QNAME_FAULTDETAIL_RUNTIMEEXCEPTION);
             if (runtimeException != null) {
-                logger.debug(Messages.getMessage("axisFault00"), fault);
+                LOGGER.debug(Messages.getMessage("axisFault00"), fault);
                 //strip runtime details
                 fault.removeFaultDetail(Constants.QNAME_FAULTDETAIL_RUNTIMEEXCEPTION);
             }
@@ -221,7 +228,7 @@ public class AxisWsContainer implements HttpListener {
         Message responseMessage;
         final Element runtimeException = fault.lookupFaultDetail(Constants.QNAME_FAULTDETAIL_RUNTIMEEXCEPTION);
 
-        logger.warning(Messages.getMessage("axisFault00"), fault);
+        LOGGER.warning(Messages.getMessage("axisFault00"), fault);
         if (runtimeException != null) {
             //strip runtime details
             fault.removeFaultDetail(Constants.QNAME_FAULTDETAIL_RUNTIMEEXCEPTION);

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/EjbRpcProvider.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/EjbRpcProvider.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/EjbRpcProvider.java
index 498b5e3..c61e3bf 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/EjbRpcProvider.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/EjbRpcProvider.java
@@ -35,7 +35,6 @@ import org.apache.axis.providers.java.RPCProvider;
 import org.apache.axis.utils.JavaUtils;
 import org.apache.openejb.ApplicationException;
 import org.apache.openejb.BeanContext;
-import org.apache.openejb.InvalidateReferenceException;
 import org.apache.openejb.RpcContainer;
 import org.apache.openejb.InterfaceType;
 import org.apache.openejb.server.ServerRuntimeException;
@@ -63,7 +62,7 @@ public class EjbRpcProvider extends RPCProvider {
 
     public EjbRpcProvider(BeanContext ejbDeployment) {
         this.ejbDeployment = ejbDeployment;
-        this.handlerInfos = new ArrayList<HandlerInfo>();
+        this.handlerInfos = new ArrayList<>();
     }
 
     public EjbRpcProvider(BeanContext ejbDeployment, List<HandlerInfo> handlerInfos) {
@@ -71,6 +70,15 @@ public class EjbRpcProvider extends RPCProvider {
         this.handlerInfos = handlerInfos;
     }
 
+    /**
+     *
+     * @param msgContext msgContext
+     * @param reqEnv reqEnv
+     * @param resEnv resEnv
+     * @param obj obj
+     * @throws Exception
+     */
+    @Override
     public void processMessage(MessageContext msgContext, SOAPEnvelope reqEnv, SOAPEnvelope resEnv, Object obj) throws Exception {
 
         RPCElement body = getBody(reqEnv, msgContext);
@@ -98,6 +106,16 @@ public class EjbRpcProvider extends RPCProvider {
         }
     }
 
+    /**
+     *
+     * @param msgContext msgContext
+     * @param service service
+     * @param clsName clsName
+     * @param scopeHolder scopeHolder
+     * @return
+     * @throws Exception
+     */
+    @Override
     public Object getServiceObject(MessageContext msgContext, Handler service, String clsName, IntHolder scopeHolder) throws Exception {
         return ejbDeployment;
     }

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/PojoProvider.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/PojoProvider.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/PojoProvider.java
index 7520311..9638897 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/PojoProvider.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/PojoProvider.java
@@ -26,11 +26,32 @@ import javax.xml.rpc.holders.IntHolder;
 import java.lang.reflect.Method;
 
 public class PojoProvider extends RPCProvider {
+
+    /**
+     *
+     * @param msgContext msgContext
+     * @param service service
+     * @param clsName clsName
+     * @param scopeHolder scopeHolder
+     * @return
+     * @throws Exception
+     */
+    @Override
     public Object getServiceObject(MessageContext msgContext, Handler service, String clsName, IntHolder scopeHolder) throws Exception {
         HttpRequest request = (HttpRequest) msgContext.getProperty(AxisWsContainer.REQUEST);
         return request.getAttribute(WsConstants.POJO_INSTANCE);
     }
 
+    /**
+     *
+     * @param msgContext msgContext
+     * @param interfaceMethod interfaceMethod
+     * @param pojo pojo
+     * @param arguments arguments
+     * @return
+     * @throws Exception
+     */
+    @Override
     protected Object invokeMethod(MessageContext msgContext, Method interfaceMethod, Object pojo, Object[] arguments) throws Exception {
         Class pojoClass = pojo.getClass();
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/ReadOnlyServiceDesc.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/ReadOnlyServiceDesc.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/ReadOnlyServiceDesc.java
index 2c1b1b9..4a6bb11 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/ReadOnlyServiceDesc.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/ReadOnlyServiceDesc.java
@@ -34,152 +34,360 @@ public class ReadOnlyServiceDesc extends JavaServiceDesc {
         this.serviceDesc = serviceDesc;
     }
 
+    /**
+     *
+     * @return
+     */
+    @Override
     public Class getImplClass() {
         return serviceDesc.getImplClass();
     }
 
+    /**
+     *
+     * @param implClass implClass
+     */
+    @Override
     public void setImplClass(Class implClass) {
         serviceDesc.setImplClass(implClass);
     }
 
+    /**
+     *
+     * @return
+     */
+    @Override
     public ArrayList getStopClasses() {
         return serviceDesc.getStopClasses();
     }
 
+    /**
+     *
+     * @param stopClasses stopClasses
+     */
+    @Override
     public void setStopClasses(ArrayList stopClasses) {
     }
 
+    @Override
     public void loadServiceDescByIntrospection() {
         serviceDesc.loadServiceDescByIntrospection();
     }
 
+    /**
+     *
+     * @param implClass implClass
+     */
+    @Override
     public void loadServiceDescByIntrospection(Class implClass) {
         serviceDesc.loadServiceDescByIntrospection(implClass);
     }
 
+    /**
+     *
+     * @param cls cls
+     * @param tm tm
+     */
+    @Override
     public void loadServiceDescByIntrospection(Class cls, TypeMapping tm) {
         serviceDesc.loadServiceDescByIntrospection(cls, tm);
     }
 
+    /**
+     *
+     * @return
+     */
+    @Override
     public Style getStyle() {
         return serviceDesc.getStyle();
     }
 
+    /**
+     *
+     * @param style style
+     */
+    @Override
     public void setStyle(Style style) {
     }
 
+    /**
+     *
+     * @return
+     */
+    @Override
     public Use getUse() {
         return serviceDesc.getUse();
     }
 
+    /**
+     *
+     * @param use
+     */
+    @Override
     public void setUse(Use use) {
     }
 
+    /**
+     *
+     * @return
+     */
+    @Override
     public String getWSDLFile() {
         return serviceDesc.getWSDLFile();
     }
 
+    /**
+     *
+     * @param wsdlFileName Name of the WSDL
+     */
+    @Override
     public void setWSDLFile(String wsdlFileName) {
     }
 
+    /**
+     *
+     * @return List of Allowed Methods
+     */
+    @Override
     public List getAllowedMethods() {
         return serviceDesc.getAllowedMethods();
     }
 
+    /**
+     *
+     * @param allowedMethods
+     */
+    @Override
     public void setAllowedMethods(List allowedMethods) {
     }
 
+    /**
+     *
+     * @return TypeMapping
+     */
+    @Override
     public TypeMapping getTypeMapping() {
         return serviceDesc.getTypeMapping();
     }
 
+    /**
+     *
+     * @param tm Set TypeMapping
+     */
+    @Override
     public void setTypeMapping(TypeMapping tm) {
     }
 
+    /**
+     *
+     * @return Name
+     */
+    @Override
     public String getName() {
         return serviceDesc.getName();
     }
 
+    /**
+     *
+     * @param name Set Name
+     */
+    @Override
     public void setName(String name) {
     }
 
+    /**
+     *
+     * @return Documentation
+     */
+    @Override
     public String getDocumentation() {
         return serviceDesc.getDocumentation();
     }
 
+    /**
+     *
+     * @param documentation Set Documentation
+     */
+    @Override
     public void setDocumentation(String documentation) {
     }
 
+    /**
+     *
+     * @param operation Remove Operation
+     */
+    @Override
     public void removeOperationDesc(OperationDesc operation) {
     }
 
+    /**
+     *
+     * @param operation Add Operation
+     */
+    @Override
     public void addOperationDesc(OperationDesc operation) {
     }
 
+    /**
+     *
+     * @return List Of Operations
+     */
+    @Override
     public ArrayList getOperations() {
         return serviceDesc.getOperations();
     }
 
+    /**
+     *
+     * @param methodName Method Name
+     * @return Array Of Operation By Name
+     */
+    @Override
     public OperationDesc[] getOperationsByName(String methodName) {
         return serviceDesc.getOperationsByName(methodName);
     }
 
+    /**
+     *
+     * @param methodName Method Name
+     * @return Operation By Name
+     */
+    @Override
     public OperationDesc getOperationByName(String methodName) {
         return serviceDesc.getOperationByName(methodName);
     }
 
+    /**
+     *
+     * @param qname QName
+     * @return OperationDesc by Element QName
+     */
+    @Override
     public OperationDesc getOperationByElementQName(QName qname) {
         return serviceDesc.getOperationByElementQName(qname);
     }
 
+    /**
+     *
+     * @param qname QName
+     * @return Array Of OperationDesc by QName
+     */
+    @Override
     public OperationDesc[] getOperationsByQName(QName qname) {
         return serviceDesc.getOperationsByQName(qname);
     }
 
+    /**
+     *
+     * @param namespaces List of Namespaces
+     */
+    @Override
     public void setNamespaceMappings(List namespaces) {
     }
 
+    /**
+     *
+     * @return Default Namespace
+     */
+    @Override
     public String getDefaultNamespace() {
         return serviceDesc.getDefaultNamespace();
     }
 
+    /**
+     *
+     * @param namespace Set Namespace
+     */
+    @Override
     public void setDefaultNamespace(String namespace) {
     }
 
+    /**
+     *
+     * @param name Name of the property
+     * @param value Value of the property
+     */
+    @Override
     public void setProperty(String name, Object value) {
         serviceDesc.setProperty(name, value);
     }
 
+    /**
+     *
+     * @param name 
+     * @return
+     */
+    @Override
     public Object getProperty(String name) {
         return serviceDesc.getProperty(name);
     }
 
+    /**
+     *
+     * @return Endpoint URL
+     */
+    @Override
     public String getEndpointURL() {
         return serviceDesc.getEndpointURL();
     }
 
+    /**
+     *
+     * @param endpointURL Endpoint URL
+     */
+    @Override
     public void setEndpointURL(String endpointURL) {
     }
 
+    /**
+     *
+     * @return TypeMappingRegistry
+     */
+    @Override
     public TypeMappingRegistry getTypeMappingRegistry() {
         return serviceDesc.getTypeMappingRegistry();
     }
 
+    /**
+     *
+     * @param tmr
+     */
+    @Override
     public void setTypeMappingRegistry(TypeMappingRegistry tmr) {
     }
 
+    /**
+     *
+     * @return boolean 
+     */
+    @Override
     public boolean isInitialized() {
         return serviceDesc.isInitialized();
     }
 
+    /**
+     *
+     * @return boolean
+     */
+    @Override
     public boolean isWrapped() {
         return serviceDesc.isWrapped();
     }
 
+    /**
+     *
+     * @return List of Disallowed Methods
+     */
+    @Override
     public List getDisallowedMethods() {
         return serviceDesc.getDisallowedMethods();
     }
 
+    /**
+     *
+     * @param disallowedMethods Set List of Disallowed Methods
+     */
+    @Override
     public void setDisallowedMethods(List disallowedMethods) {
     }
 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java
index 01e5828..2fb25c1 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java
@@ -55,7 +55,7 @@ import java.util.Map;
 import java.util.jar.JarFile;
 
 public class CommonsSchemaInfoBuilder {
-    private static final Log log = LogFactory.getLog(CommonsSchemaInfoBuilder.class);
+    private static final Log LOG = LogFactory.getLog(CommonsSchemaInfoBuilder.class);
     private static final String XML_SCHEMA_NS = "http://www.w3.org/2001/XMLSchema";
     private static final String XML_NS_NS = "http://www.w3.org/2000/xmlns/";
     private static final String SOAP_ENCODING_NS = "http://schemas.xmlsoap.org/soap/encoding/";
@@ -65,8 +65,8 @@ public class CommonsSchemaInfoBuilder {
 
     private final XmlSchemaCollection xmlSchemaCollection;
 
-    private final Map<QName, XmlTypeInfo> xmlTypes = new HashMap<QName, XmlTypeInfo>();
-    private final Map<QName, XmlElementInfo> xmlElements = new HashMap<QName, XmlElementInfo>();
+    private final Map<QName, XmlTypeInfo> xmlTypes = new HashMap<>();
+    private final Map<QName, XmlElementInfo> xmlElements = new HashMap<>();
 
     public CommonsSchemaInfoBuilder(JarFile moduleFile, URI wsdlUri) throws OpenEJBException {
         if (moduleFile == null) throw new NullPointerException("moduleFile is null");
@@ -254,7 +254,7 @@ public class CommonsSchemaInfoBuilder {
                 }
             }
         } else {
-            log.warn("Unknown schema type class " + typeInfo.getClass().getName());
+            LOG.warn("Unknown schema type class " + typeInfo.getClass().getName());
         }
 
         return typeInfo;
@@ -323,7 +323,7 @@ public class CommonsSchemaInfoBuilder {
 
                                 componentType = new QName(namespace, localPart);
                             }
-                            log.debug("determined component type from element type");
+                            LOG.debug("determined component type from element type");
                             return componentType;
                         }
                     }
@@ -351,7 +351,7 @@ public class CommonsSchemaInfoBuilder {
             if (item instanceof XmlSchemaElement) {
                 XmlSchemaElement element = (XmlSchemaElement) item;
                 QName componentType = element.getSchemaTypeName();
-                log.debug("determined component type from element type");
+                LOG.debug("determined component type from element type");
                 return componentType;
             }
         }
@@ -385,7 +385,7 @@ public class CommonsSchemaInfoBuilder {
 
 
     private static List<XmlSchemaElement> getNestedElements(XmlSchemaComplexType complexType) {
-        List<XmlSchemaElement> elements = new ArrayList<XmlSchemaElement>();
+        List<XmlSchemaElement> elements = new ArrayList<>();
         XmlSchemaParticle particle = complexType.getParticle();
         if (particle instanceof XmlSchemaElement) {
             XmlSchemaElement element = (XmlSchemaElement) particle;

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java
index d9ec86b..fc6738b 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java
@@ -48,7 +48,7 @@ import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 
 public class CommonsSchemaLoader {
-    private static final Log log = LogFactory.getLog(CommonsSchemaLoader.class);
+    private static final Log LOG = LogFactory.getLog(CommonsSchemaLoader.class);
 
     private final URI wsdlUri;
     private final JarFile moduleFile;
@@ -103,7 +103,7 @@ public class CommonsSchemaLoader {
                     if (importedDef != null) {
                         addImportsFromDefinition(importedDef);
                     } else {
-                        log.warn("Missing definition in import for namespace " + namespaceURI);
+                        LOG.warn("Missing definition in import for namespace " + namespaceURI);
                     }
                 }
             }
@@ -166,7 +166,7 @@ public class CommonsSchemaLoader {
 
     class JarWSDLLocator implements WSDLLocator {
 
-        private final List<InputStream> streams = new ArrayList<InputStream>();
+        private final List<InputStream> streams = new ArrayList<>();
         private final URI wsdlURI;
         private URI latestImportURI;
 
@@ -174,6 +174,7 @@ public class CommonsSchemaLoader {
             this.wsdlURI = wsdlURI;
         }
 
+        @Override
         public InputSource getBaseInputSource() {
             ZipEntry entry = moduleFile.getEntry(wsdlURI.toString());
             if (entry == null) {
@@ -190,10 +191,12 @@ public class CommonsSchemaLoader {
             return new InputSource(wsdlInputStream);
         }
 
+        @Override
         public String getBaseURI() {
             return wsdlURI.toString();
         }
 
+        @Override
         public InputSource getImportInputSource(String parentLocation, String relativeLocation) {
             URI parentURI = URI.create(parentLocation);
             latestImportURI = parentURI.resolve(relativeLocation);
@@ -212,10 +215,12 @@ public class CommonsSchemaLoader {
             return inputSource;
         }
 
+        @Override
         public String getLatestImportURI() {
             return latestImportURI.toString();
         }
 
+        @Override
         public void close() {
             for (InputStream inputStream : streams) {
                 try {

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightOperationInfoBuilder.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightOperationInfoBuilder.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightOperationInfoBuilder.java
index 27fac57..cc5bf7a 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightOperationInfoBuilder.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightOperationInfoBuilder.java
@@ -84,26 +84,26 @@ public class HeavyweightOperationInfoBuilder {
     //
     // Used to map exception class constructor args
     //
-    private final Map<QName, String> publicTypes = new HashMap<QName, String>();
-    private final Map<String, String> anonymousTypes = new HashMap<String, String>();
+    private final Map<QName, String> publicTypes = new HashMap<>();
+    private final Map<String, String> anonymousTypes = new HashMap<>();
 
     //
     // Track in and out parameter names so we can verify that
     // everything has been mapped and mapped correctly
     //
-    private final Set<String> inParamNames = new HashSet<String>();
-    private final Set<String> outParamNames = new HashSet<String>();
+    private final Set<String> inParamNames = new HashSet<>();
+    private final Set<String> outParamNames = new HashSet<>();
 
     //
     // Track the wrapper elements - used by HeavyweightTypeInfoBuilder
     //
-    private final Set<QName> wrapperElementQNames = new HashSet<QName>();
+    private final Set<QName> wrapperElementQNames = new HashSet<>();
 
     private final String operationName;
     private final JaxRpcOperationInfo.OperationStyle operationStyle;
     private final Message inputMessage;
     private final Message outputMessage;
-    private final Collection<Fault> faults = new ArrayList<Fault>();
+    private final Collection<Fault> faults = new ArrayList<>();
 
     private JaxRpcOperationInfo operationInfo;
 
@@ -197,7 +197,7 @@ public class HeavyweightOperationInfoBuilder {
             XmlElementInfo wraperElement = schemaInfo.elements.get(wrapperName);
             XmlTypeInfo wrapperType = schemaInfo.types.get(wraperElement.xmlType);
 
-            Set<String> expectedOutParams = new HashSet<String>();
+            Set<String> expectedOutParams = new HashSet<>();
             for (XmlElementInfo expectedOutParam : wrapperType.elements.values()) {
                 expectedOutParams.add(expectedOutParam.qname.getLocalPart());
             }
@@ -254,7 +254,7 @@ public class HeavyweightOperationInfoBuilder {
             XmlElementInfo wrapperElement = schemaInfo.elements.get(wrapperName);
             XmlTypeInfo wrapperType = schemaInfo.types.get(wrapperElement.xmlType);
 
-            Set<String> expectedInParams = new HashSet<String>();
+            Set<String> expectedInParams = new HashSet<>();
             for (XmlElementInfo expectedInParam : wrapperType.elements.values()) {
                 expectedInParams.add(expectedInParam.qname.getLocalPart());
             }
@@ -413,9 +413,9 @@ public class HeavyweightOperationInfoBuilder {
         if (mode == Mode.IN) {
             // IN only prarmeters don't have holders
             paramJavaType = paramMapping.getParamType();
-        } else if (rpcHolderClasses.containsKey(paramMapping.getParamType())) {
+        } else if (RPC_HOLDER_CLASSES.containsKey(paramMapping.getParamType())) {
             // This is a standard type with a built in holder class
-            paramJavaType = rpcHolderClasses.get(paramMapping.getParamType());
+            paramJavaType = RPC_HOLDER_CLASSES.get(paramMapping.getParamType());
         } else {
             // holderClass == ${packageName}.holders.${typeName}Holder
             String packageName;
@@ -571,7 +571,7 @@ public class HeavyweightOperationInfoBuilder {
                 throw new OpenEJBException("ConstructorParameterOrder can only be set for complex types, not " + faultTypeInfo.qname);
             }
 
-            Map<String, XmlElementInfo> elements = new HashMap<String, XmlElementInfo>();
+            Map<String, XmlElementInfo> elements = new HashMap<>();
             for (XmlElementInfo element : faultTypeInfo.elements.values()) {
                 elements.put(element.qname.getLocalPart(), element);
             }
@@ -598,7 +598,7 @@ public class HeavyweightOperationInfoBuilder {
                 }
                 // if we don't have a java type yet, check the simple types
                 if (paramJavaType == null) {
-                    paramJavaType = qnameToJavaType.get(paramElementInfo.xmlType);
+                    paramJavaType = QNAME_TO_JAVA_TYPE.get(paramElementInfo.xmlType);
                 }
                 if (paramJavaType == null) {
                     throw new OpenEJBException("No class mapped for element type: " + paramElementInfo.xmlType);
@@ -661,30 +661,30 @@ public class HeavyweightOperationInfoBuilder {
     }
 
     //see jaxrpc 1.1 4.2.1
-    private static final Map<QName, String> qnameToJavaType = new HashMap<QName, String>();
+    private static final Map<QName, String> QNAME_TO_JAVA_TYPE = new HashMap<QName, String>();
 
     static {
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "string"), String.class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "integer"), BigInteger.class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "int"), int.class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "long"), long.class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "short"), short.class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "decimal"), BigDecimal.class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "float"), float.class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "double"), double.class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "boolean"), boolean.class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "byte"), byte.class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "unsignedInt"), long.class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "unsignedShort"), int.class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "unsignedByte"), short.class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "QName"), QName.class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "dateTime"), Calendar.class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "date"), Calendar.class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "time"), Calendar.class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "anyURI"), URI.class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "base64Binary"), byte[].class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "hexBinary"), byte[].class.getName());
-        qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "anySimpleType"), String.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "string"), String.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "integer"), BigInteger.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "int"), int.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "long"), long.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "short"), short.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "decimal"), BigDecimal.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "float"), float.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "double"), double.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "boolean"), boolean.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "byte"), byte.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "unsignedInt"), long.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "unsignedShort"), int.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "unsignedByte"), short.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "QName"), QName.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "dateTime"), Calendar.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "date"), Calendar.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "time"), Calendar.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "anyURI"), URI.class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "base64Binary"), byte[].class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "hexBinary"), byte[].class.getName());
+        QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "anySimpleType"), String.class.getName());
     }
 
 
@@ -700,29 +700,29 @@ public class HeavyweightOperationInfoBuilder {
      */
 
     // standard holder classes by type
-    private static final Map<String, String> rpcHolderClasses = new HashMap<String, String>();
+    private static final Map<String, String> RPC_HOLDER_CLASSES = new HashMap<String, String>();
 
     static {
-        rpcHolderClasses.put(BigDecimal.class.getName(), BigDecimalHolder.class.getName());
-        rpcHolderClasses.put(BigInteger.class.getName(), BigIntegerHolder.class.getName());
-        rpcHolderClasses.put(boolean.class.getName(), BooleanHolder.class.getName());
-        rpcHolderClasses.put(Boolean.class.getName(), BooleanWrapperHolder.class.getName());
-        rpcHolderClasses.put(byte[].class.getName(), ByteArrayHolder.class.getName());
-        rpcHolderClasses.put(byte.class.getName(), ByteHolder.class.getName());
-        rpcHolderClasses.put(Byte.class.getName(), ByteWrapperHolder.class.getName());
-        rpcHolderClasses.put(Calendar.class.getName(), CalendarHolder.class.getName());
-        rpcHolderClasses.put(double.class.getName(), DoubleHolder.class.getName());
-        rpcHolderClasses.put(Double.class.getName(), DoubleWrapperHolder.class.getName());
-        rpcHolderClasses.put(float.class.getName(), FloatHolder.class.getName());
-        rpcHolderClasses.put(Float.class.getName(), FloatWrapperHolder.class.getName());
-        rpcHolderClasses.put(int.class.getName(), IntHolder.class.getName());
-        rpcHolderClasses.put(Integer.class.getName(), IntegerWrapperHolder.class.getName());
-        rpcHolderClasses.put(long.class.getName(), LongHolder.class.getName());
-        rpcHolderClasses.put(Long.class.getName(), LongWrapperHolder.class.getName());
-        rpcHolderClasses.put(Object.class.getName(), ObjectHolder.class.getName());
-        rpcHolderClasses.put(QName.class.getName(), QNameHolder.class.getName());
-        rpcHolderClasses.put(short.class.getName(), ShortHolder.class.getName());
-        rpcHolderClasses.put(Short.class.getName(), ShortWrapperHolder.class.getName());
-        rpcHolderClasses.put(String.class.getName(), StringHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(BigDecimal.class.getName(), BigDecimalHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(BigInteger.class.getName(), BigIntegerHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(boolean.class.getName(), BooleanHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(Boolean.class.getName(), BooleanWrapperHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(byte[].class.getName(), ByteArrayHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(byte.class.getName(), ByteHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(Byte.class.getName(), ByteWrapperHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(Calendar.class.getName(), CalendarHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(double.class.getName(), DoubleHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(Double.class.getName(), DoubleWrapperHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(float.class.getName(), FloatHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(Float.class.getName(), FloatWrapperHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(int.class.getName(), IntHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(Integer.class.getName(), IntegerWrapperHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(long.class.getName(), LongHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(Long.class.getName(), LongWrapperHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(Object.class.getName(), ObjectHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(QName.class.getName(), QNameHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(short.class.getName(), ShortHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(Short.class.getName(), ShortWrapperHolder.class.getName());
+        RPC_HOLDER_CLASSES.put(String.class.getName(), StringHolder.class.getName());
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightTypeInfoBuilder.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightTypeInfoBuilder.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightTypeInfoBuilder.java
index 1b1cbbf..d85596d 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightTypeInfoBuilder.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightTypeInfoBuilder.java
@@ -46,7 +46,7 @@ public class HeavyweightTypeInfoBuilder {
     private static final String SOAP_ENCODING_NS = "http://schemas.xmlsoap.org/soap/encoding/";
     private static final String XML_SCHEMA_NS = "http://www.w3.org/2001/XMLSchema";
 
-    private static final Log log = LogFactory.getLog(HeavyweightTypeInfoBuilder.class);
+    private static final Log LOG = LogFactory.getLog(HeavyweightTypeInfoBuilder.class);
 
     private final JavaWsdlMapping mapping;
     private final ClassLoader classLoader;
@@ -65,9 +65,9 @@ public class HeavyweightTypeInfoBuilder {
     }
 
     public List<JaxRpcTypeInfo> buildTypeInfo() throws OpenEJBException {
-        List<JaxRpcTypeInfo> typeInfos = new ArrayList<JaxRpcTypeInfo>();
+        List<JaxRpcTypeInfo> typeInfos = new ArrayList<>();
 
-        Set<QName> mappedTypeQNames = new HashSet<QName>();
+        Set<QName> mappedTypeQNames = new HashSet<>();
 
         //
         // Map types with explicity Java to XML mappings
@@ -108,7 +108,7 @@ public class HeavyweightTypeInfoBuilder {
             if ("element".equals(javaXmlTypeMapping.getQNameScope())) {
                 XmlElementInfo elementInfo = schemaInfo.elements.get(qname);
                 if (elementInfo == null) {
-                    log.warn("Element [" + qname + "] not been found in schema, known elements: " + schemaInfo.elements.keySet());
+                    LOG.warn("Element [" + qname + "] not been found in schema, known elements: " + schemaInfo.elements.keySet());
                 }
                 xmlTypeQName = elementInfo.xmlType;
             } else {
@@ -119,10 +119,10 @@ public class HeavyweightTypeInfoBuilder {
             XmlTypeInfo xmlTypeInfo = schemaInfo.types.get(xmlTypeQName);
             if (xmlTypeInfo == null) {
                 // if this is a built in type then assume this is a redundant mapping
-                if (WebserviceNameSpaces.contains(xmlTypeInfo.qname.getNamespaceURI())) {
+                if (WEBSERVICE_NAMESPACES.contains(xmlTypeInfo.qname.getNamespaceURI())) {
                     continue;
                 }
-                log.warn("Schema type QName [" + qname + "] not been found in schema: " + schemaInfo.types.keySet());
+                LOG.warn("Schema type QName [" + qname + "] not been found in schema: " + schemaInfo.types.keySet());
                 continue;
             }
 
@@ -148,7 +148,7 @@ public class HeavyweightTypeInfoBuilder {
         // Map types used in operations
         //
         for (JaxRpcOperationInfo operationInfo : operations) {
-            List<JaxRpcParameterInfo> parameters = new ArrayList<JaxRpcParameterInfo>(operationInfo.parameters);
+            List<JaxRpcParameterInfo> parameters = new ArrayList<>(operationInfo.parameters);
 
             // add the return type to the parameters so it is processed below
             if (operationInfo.returnXmlType != null) {
@@ -173,7 +173,7 @@ public class HeavyweightTypeInfoBuilder {
                 // get the xml type info
                 XmlTypeInfo xmlTypeInfo = schemaInfo.types.get(xmlType);
                 if (xmlTypeInfo == null) {
-                    log.warn("Type QName [" + xmlType + "] defined by operation [" + operationInfo + "] has not been found in schema: " + schemaInfo.types.keySet());
+                    LOG.warn("Type QName [" + xmlType + "] defined by operation [" + operationInfo + "] has not been found in schema: " + schemaInfo.types.keySet());
                     continue;
                 }
                 mappedTypeQNames.add(xmlTypeInfo.qname);
@@ -190,7 +190,7 @@ public class HeavyweightTypeInfoBuilder {
                 if (xmlTypeInfo.simpleBaseType == null && !clazz.isArray()) {
                     if (!mappedTypeQNames.contains(xmlTypeInfo.qname)) {
                         // TODO: this lookup is not enough: the jaxrpc mapping file may define an anonymous mapping
-                        log.warn("Operation " + operationInfo.name + "] uses XML type [" + xmlTypeInfo + "], whose mapping is not declared by the jaxrpc mapping file.\n Continuing deployment; " + "yet, the deployment is not-portable.");
+                        LOG.warn("Operation " + operationInfo.name + "] uses XML type [" + xmlTypeInfo + "], whose mapping is not declared by the jaxrpc mapping file.\n Continuing deployment; " + "yet, the deployment is not-portable.");
                     }
                     continue;
                 }
@@ -250,15 +250,15 @@ public class HeavyweightTypeInfoBuilder {
     private void mapFields(Class javaClass, XmlTypeInfo xmlTypeInfo, JavaXmlTypeMapping javaXmlTypeMapping, JaxRpcTypeInfo typeInfo) throws OpenEJBException {
         // Skip arrays since they can't define a variable-mapping element
         if (!javaClass.isArray()) {
-            // if there is a variable-mapping, log a warning
+            // if there is a variable-mapping, LOG a warning
             if (!javaXmlTypeMapping.getVariableMapping().isEmpty()) {
-                log.warn("Ignoring variable-mapping defined for class " + javaClass + " which is an array.");
+                LOG.warn("Ignoring variable-mapping defined for class " + javaClass + " which is an array.");
             }
             return;
         }
 
         // Index Java bean properties by name
-        Map<String, Class> properties = new HashMap<String, Class>();
+        Map<String, Class> properties = new HashMap<>();
         try {
             PropertyDescriptor[] propertyDescriptors = Introspector.getBeanInfo(javaClass).getPropertyDescriptors();
             for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
@@ -350,7 +350,7 @@ public class HeavyweightTypeInfoBuilder {
     /**
      * All of the known built in XML Schemas used by webservices.  This is used to supress unknown type exceptions
      */
-    private static final Set<String> WebserviceNameSpaces = Collections.unmodifiableSet(new LinkedHashSet<String>(Arrays.asList(
+    private static final Set<String> WEBSERVICE_NAMESPACES = Collections.unmodifiableSet(new LinkedHashSet<String>(Arrays.asList(
         "http://schemas.xmlsoap.org/soap/encoding/", // SOAP 1.1
         "http://www.w3.org/2003/05/soap-encoding",   // SOAP 1.2
         "http://xml.apache.org/xml-soap",            // Apache XMLSOAP

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcFaultInfo.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcFaultInfo.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcFaultInfo.java
index 2f19650..dca67ac 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcFaultInfo.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcFaultInfo.java
@@ -26,5 +26,5 @@ public class JaxRpcFaultInfo {
     public QName xmlType;
     public String javaType;
     public boolean complex;
-    public List<JaxRpcParameterInfo> parameters = new ArrayList<JaxRpcParameterInfo>();
+    public List<JaxRpcParameterInfo> parameters = new ArrayList<>();
 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcOperationInfo.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcOperationInfo.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcOperationInfo.java
index 580748a..5b86a47 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcOperationInfo.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcOperationInfo.java
@@ -30,13 +30,13 @@ public class JaxRpcOperationInfo {
 
     public String javaMethodName;
 
-    public List<JaxRpcParameterInfo> parameters = new ArrayList<JaxRpcParameterInfo>();
+    public List<JaxRpcParameterInfo> parameters = new ArrayList<>();
 
     public QName returnQName;
     public QName returnXmlType;
     public String returnJavaType;
 
-    public Collection<JaxRpcFaultInfo> faults = new ArrayList<JaxRpcFaultInfo>();
+    public Collection<JaxRpcFaultInfo> faults = new ArrayList<>();
 
     public static enum OperationStyle {
         ONE_WAY, REQUEST_RESPONSE, SOLICIT_RESPONSE, NOTIFICATION

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfo.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfo.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfo.java
index ee6f763..58a678b 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfo.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfo.java
@@ -27,6 +27,6 @@ public class JaxRpcServiceInfo {
 
     public String serviceEndpointInterface;
     public BindingStyle defaultBindingStyle;
-    public final Collection<JaxRpcOperationInfo> operations = new ArrayList<JaxRpcOperationInfo>();
-    public final Collection<JaxRpcTypeInfo> types = new ArrayList<JaxRpcTypeInfo>();
+    public final Collection<JaxRpcOperationInfo> operations = new ArrayList<>();
+    public final Collection<JaxRpcTypeInfo> types = new ArrayList<>();
 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfoBuilder.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfoBuilder.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfoBuilder.java
index c503982..77b6cba 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfoBuilder.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfoBuilder.java
@@ -96,7 +96,7 @@ public class JaxRpcServiceInfoBuilder {
     }
 
     private Set<QName> buildOperations(Binding binding, Class serviceEndpointInterface, boolean lightweight) throws OpenEJBException {
-        Set<QName> wrappedElementQNames = new HashSet<QName>();
+        Set<QName> wrappedElementQNames = new HashSet<>();
 
 
         for (Object op : binding.getBindingOperations()) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcTypeInfo.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcTypeInfo.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcTypeInfo.java
index c64a090..52744c1 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcTypeInfo.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcTypeInfo.java
@@ -34,7 +34,7 @@ public class JaxRpcTypeInfo {
     public SerializerType serializerType;
     public QName componentType;
 
-    public final Collection<JaxRpcFieldInfo> fields = new ArrayList<JaxRpcFieldInfo>();
+    public final Collection<JaxRpcFieldInfo> fields = new ArrayList<>();
 
     public static enum SerializerType {
         ARRAY, ENUM, LIST, OTHER

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/LightweightTypeInfoBuilder.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/LightweightTypeInfoBuilder.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/LightweightTypeInfoBuilder.java
index 3238a88..059bd38 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/LightweightTypeInfoBuilder.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/LightweightTypeInfoBuilder.java
@@ -42,7 +42,7 @@ public class LightweightTypeInfoBuilder {
     }
 
     public List<JaxRpcTypeInfo> buildTypeInfo() throws OpenEJBException {
-        List<JaxRpcTypeInfo> typeInfoList = new ArrayList<JaxRpcTypeInfo>();
+        List<JaxRpcTypeInfo> typeInfoList = new ArrayList<>();
 
         for (XmlTypeInfo xmlTypeInfo : schemaInfo.types.values()) {
             // skip anonymous elements
@@ -72,7 +72,7 @@ public class LightweightTypeInfoBuilder {
 
     private void mapFields(Class javaClass, XmlTypeInfo xmlTypeInfo, JaxRpcTypeInfo typeInfo) throws OpenEJBException {
         // Map JavaBean property name to propertyType
-        Map<String, Class> propertyToClass = new HashMap<String, Class>();
+        Map<String, Class> propertyToClass = new HashMap<>();
         try {
             for (PropertyDescriptor descriptor : Introspector.getBeanInfo(javaClass).getPropertyDescriptors()) {
                 propertyToClass.put(descriptor.getName(), descriptor.getPropertyType());

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlSchemaInfo.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlSchemaInfo.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlSchemaInfo.java
index 075e84d..64fdd24 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlSchemaInfo.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlSchemaInfo.java
@@ -24,6 +24,6 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class XmlSchemaInfo extends InfoObject {
-    public final Map<QName, XmlElementInfo> elements = new LinkedHashMap<QName, XmlElementInfo>();
-    public final Map<QName, XmlTypeInfo> types = new LinkedHashMap<QName, XmlTypeInfo>();
+    public final Map<QName, XmlElementInfo> elements = new LinkedHashMap<>();
+    public final Map<QName, XmlTypeInfo> types = new LinkedHashMap<>();
 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlTypeInfo.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlTypeInfo.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlTypeInfo.java
index 8adaa82..ebafdd0 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlTypeInfo.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlTypeInfo.java
@@ -32,6 +32,6 @@ public class XmlTypeInfo extends InfoObject {
     public boolean listType;
     public QName arrayComponentType;
 
-    public final Map<String, QName> attributes = new LinkedHashMap<String, QName>();
-    public final Map<QName, XmlElementInfo> elements = new LinkedHashMap<QName, XmlElementInfo>();
+    public final Map<String, QName> attributes = new LinkedHashMap<>();
+    public final Map<QName, XmlElementInfo> elements = new LinkedHashMap<>();
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ArrayTypeInfo.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ArrayTypeInfo.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ArrayTypeInfo.java
index 7387a94..9536612 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ArrayTypeInfo.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ArrayTypeInfo.java
@@ -41,6 +41,11 @@ public class ArrayTypeInfo extends TypeInfo {
         this.componentQName = componentQName;
     }
 
+    /**
+     *
+     * @param typeMapping TypeMapping
+     */
+    @Override
     public void register(TypeMapping typeMapping) {
 //        SerializerFactory ser = BaseSerializerFactory.createFactory(getSerFactoryClass(), getClazz(), getqName());
 //        ((ArraySerializerFactory)ser).setComponentType(componentType);
@@ -58,6 +63,11 @@ public class ArrayTypeInfo extends TypeInfo {
         private QName componentType;
         private QName componentQName;
 
+        /**
+         *
+         * @return TypeInfo
+         */
+        @Override
         public TypeInfo buildTypeInfo() {
             if (null == clazz) {
                 throw new IllegalStateException("clazz is null");

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisClientImpl.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisClientImpl.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisClientImpl.java
index 53b342b..b9e65bc 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisClientImpl.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisClientImpl.java
@@ -33,6 +33,12 @@ public class AxisClientImpl extends AxisClient {
         this.portNameToSEIFactoryMap = portNameToSEIFactoryMap;
     }
 
+    /**
+     *
+     * @param context MessageContext
+     * @return HandlerChain
+     */
+    @Override
     protected HandlerChain getJAXRPChandlerChain(MessageContext context) {
         QName portQName = (QName) context.getProperty(Call.WSDL_PORT_NAME);
         if (portQName == null) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisServiceReference.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisServiceReference.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisServiceReference.java
index a1ca43f..8c7ae98 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisServiceReference.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisServiceReference.java
@@ -53,6 +53,12 @@ public class AxisServiceReference extends Reference {
         this.classLoader = classLoader;
     }
 
+    /**
+     *
+     * @return Object
+     * @throws NamingException
+     */
+    @Override
     public Object getObject() throws NamingException {
         Object serviceInstance = createServiceInterfaceProxy(serviceInterfaceClassName, seiPortNameToFactoryMap, seiClassNameToFactoryMap, classLoader);
         return serviceInstance;

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/GenericServiceEndpointWrapper.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/GenericServiceEndpointWrapper.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/GenericServiceEndpointWrapper.java
index 9f67e43..b8d71b5 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/GenericServiceEndpointWrapper.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/GenericServiceEndpointWrapper.java
@@ -31,10 +31,12 @@ public class GenericServiceEndpointWrapper implements Stub {
         this.genericServiceEndpoint = genericServiceEndpoint;
     }
 
+    @Override
     public void _setProperty(String s, Object o) {
         genericServiceEndpoint._setProperty(s, o);
     }
 
+    @Override
     public Object _getProperty(String s) {
         return genericServiceEndpoint._getProperty(s);
     }
@@ -43,6 +45,7 @@ public class GenericServiceEndpointWrapper implements Stub {
         return genericServiceEndpoint.removeProperty(s);
     }
 
+    @Override
     public Iterator _getPropertyNames() {
         return genericServiceEndpoint._getPropertyNames();
     }

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/NoOverrideCallbackFilter.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/NoOverrideCallbackFilter.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/NoOverrideCallbackFilter.java
index efed7b6..fac5b02 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/NoOverrideCallbackFilter.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/NoOverrideCallbackFilter.java
@@ -28,6 +28,12 @@ public class NoOverrideCallbackFilter implements CallbackFilter {
         this.superClass = superClass;
     }
 
+    /**
+     *
+     * @param method Method
+     * @return int
+     */
+    @Override
     public int accept(Method method) {
         // we don't intercept non-public methods like finalize
         if (!Modifier.isPublic(method.getModifiers())) {
@@ -47,6 +53,7 @@ public class NoOverrideCallbackFilter implements CallbackFilter {
         }
     }
 
+    @Override
     public boolean equals(Object other) {
         if (other == null) {
             return false;
@@ -65,6 +72,7 @@ public class NoOverrideCallbackFilter implements CallbackFilter {
         return superClass.equals(otherFilter.superClass);
     }
 
+    @Override
     public int hashCode() {
         return superClass.hashCode();
     }

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceEndpointMethodInterceptor.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceEndpointMethodInterceptor.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceEndpointMethodInterceptor.java
index 71fb885..c24985d 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceEndpointMethodInterceptor.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceEndpointMethodInterceptor.java
@@ -43,6 +43,16 @@ public class ServiceEndpointMethodInterceptor implements MethodInterceptor {
         this.credentialsName = credentialsName;
     }
 
+    /**
+     *
+     * @param o Object
+     * @param method Method
+     * @param objects Object[]
+     * @param methodProxy MethodProxy
+     * @return Object
+     * @throws Throwable
+     */
+    @Override
     public Object intercept(Object o, Method method, Object[] objects, MethodProxy methodProxy) throws Throwable {
         SaajUniverse universe = new SaajUniverse();
         universe.set(SaajUniverse.AXIS1);

http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceMethodInterceptor.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceMethodInterceptor.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceMethodInterceptor.java
index 2f58cda..b3e1e0e 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceMethodInterceptor.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceMethodInterceptor.java
@@ -30,6 +30,16 @@ public class ServiceMethodInterceptor implements MethodInterceptor {
         this.seiFactoryMap = seiFactoryMap;
     }
 
+    /**
+     *
+     * @param o Object
+     * @param method Method
+     * @param objects Object[]
+     * @param methodProxy MethodProxy
+     * @return Object
+     * @throws Throwable
+     */
+    @Override
     public Object intercept(Object o, Method method, Object[] objects, MethodProxy methodProxy) throws Throwable {
         if (objects.length == 0) {
             String methodName = method.getName();


Mime
View raw message