Author: asoldano
Date: 2014-05-20 05:45:36 -0400 (Tue, 20 May 2014)
New Revision: 18679
Modified:
common/trunk/src/main/java/org/jboss/ws/common/DOMUtils.java
common/trunk/src/main/java/org/jboss/ws/common/DOMWriter.java
common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java
common/trunk/src/main/java/org/jboss/ws/common/JavaUtils.java
common/trunk/src/main/java/org/jboss/ws/common/ObjectNameFactory.java
common/trunk/src/main/java/org/jboss/ws/common/ResourceLoaderAdapter.java
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java
common/trunk/src/main/java/org/jboss/ws/common/injection/finders/ResourceFieldFinder.java
common/trunk/src/main/java/org/jboss/ws/common/injection/finders/ResourceMethodFinder.java
common/trunk/src/main/java/org/jboss/ws/common/invocation/AbstractInvocationHandler.java
common/trunk/src/main/java/org/jboss/ws/common/invocation/RecordingServerHandler.java
common/trunk/src/main/java/org/jboss/ws/common/management/DefaultEndpointRegistry.java
common/trunk/src/main/java/org/jboss/ws/common/management/ManagedEndpointRegistry.java
common/trunk/src/main/java/org/jboss/ws/common/reflection/AbstractAnnotatedClassProcessor.java
common/trunk/src/main/java/org/jboss/ws/common/security/DefaultSecurityAdapterFactory.java
common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java
common/trunk/src/main/java/org/jboss/ws/common/utils/DelegateClassLoader.java
common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResolver.java
common/trunk/src/main/java/org/jboss/ws/common/utils/JarUrlConnection.java
common/trunk/src/main/java/org/jboss/ws/common/utils/ResourceURL.java
common/trunk/src/main/java/org/jboss/ws/common/utils/XMLPredefinedEntityReferenceResolver.java
Log:
Misc minor improvements / fixes / warning removal
Modified: common/trunk/src/main/java/org/jboss/ws/common/DOMUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/DOMUtils.java 2014-05-20 07:18:18 UTC
(rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/DOMUtils.java 2014-05-20 09:45:36 UTC
(rev 18679)
@@ -71,8 +71,8 @@
private static final String ENABLE_DOCTYPE_DECL =
"org.jboss.ws.enable_doctype_decl";
private static final String DISALLOW_DOCTYPE_DECL_FEATURE =
"http://apache.org/xml/features/disallow-doctype-decl";
- private static String documentBuilderFactoryName;
- private static DocumentBuilderFactory documentBuilderFactory;
+ private static final String documentBuilderFactoryName;
+ private static final DocumentBuilderFactory documentBuilderFactory;
private static final boolean alwaysResolveFactoryName =
Boolean.getBoolean(Constants.ALWAYS_RESOLVE_DOCUMENT_BUILDER_FACTORY);
private static final boolean disableDeferedNodeExpansion =
Boolean.getBoolean(DISABLE_DEFERRED_NODE_EXPANSION);
Modified: common/trunk/src/main/java/org/jboss/ws/common/DOMWriter.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/DOMWriter.java 2014-05-20 07:18:18 UTC
(rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/DOMWriter.java 2014-05-20 09:45:36 UTC
(rev 18679)
@@ -64,7 +64,6 @@
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
Modified: common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java 2014-05-20 07:18:18 UTC
(rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java 2014-05-20 09:45:36 UTC
(rev 18679)
@@ -21,13 +21,11 @@
*/
package org.jboss.ws.common;
-import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Reader;
Modified: common/trunk/src/main/java/org/jboss/ws/common/JavaUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/JavaUtils.java 2014-05-20 07:18:18 UTC
(rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/JavaUtils.java 2014-05-20 09:45:36 UTC
(rev 18679)
@@ -43,9 +43,9 @@
*/
public class JavaUtils
{
- private static HashMap<String, Class<?>> primitiveNames = new
HashMap<String, Class<?>>();
- private static HashMap<String, String> primitiveNameDescriptors = new
HashMap<String, String>();
- private static HashSet<String> reservedKeywords = new
HashSet<String>(64,0.8f);
+ private static final HashMap<String, Class<?>> primitiveNames = new
HashMap<String, Class<?>>();
+ private static final HashMap<String, String> primitiveNameDescriptors = new
HashMap<String, String>();
+ private static final HashSet<String> reservedKeywords = new
HashSet<String>(64,0.8f);
static
{
Modified: common/trunk/src/main/java/org/jboss/ws/common/ObjectNameFactory.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/ObjectNameFactory.java 2014-05-20
07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/ObjectNameFactory.java 2014-05-20
09:45:36 UTC (rev 18679)
@@ -58,7 +58,7 @@
}
}
- public static ObjectName create(String domain, Hashtable table)
+ public static ObjectName create(String domain, Hashtable<String, String> table)
{
try
{
Modified: common/trunk/src/main/java/org/jboss/ws/common/ResourceLoaderAdapter.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/ResourceLoaderAdapter.java 2014-05-20
07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/ResourceLoaderAdapter.java 2014-05-20
09:45:36 UTC (rev 18679)
@@ -48,8 +48,10 @@
*/
public class ResourceLoaderAdapter implements UnifiedVirtualFile
{
- private URL resourceURL;
- private ClassLoader loader;
+ private static final long serialVersionUID = -8567810932195204615L;
+
+ private final URL resourceURL;
+ private final ClassLoader loader;
private static final String jarFileSeparator = "/";
public ResourceLoaderAdapter()
@@ -59,6 +61,7 @@
public ResourceLoaderAdapter(ClassLoader loader)
{
+ this.resourceURL = null;
this.loader = loader;
}
Modified: common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java 2014-05-20
07:18:18 UTC (rev 18678)
+++
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java 2014-05-20
09:45:36 UTC (rev 18679)
@@ -62,7 +62,7 @@
*/
public class ConfigHelper implements ClientConfigurer
{
- private static Map<String, String> bindingIDs = new HashMap<String,
String>(8);
+ private static final Map<String, String> bindingIDs = new HashMap<String,
String>(8);
static {
bindingIDs.put(SOAPBinding.SOAP11HTTP_BINDING, "##SOAP11_HTTP");
bindingIDs.put(SOAPBinding.SOAP12HTTP_BINDING, "##SOAP12_HTTP");
Modified:
common/trunk/src/main/java/org/jboss/ws/common/injection/finders/ResourceFieldFinder.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/common/injection/finders/ResourceFieldFinder.java 2014-05-20
07:18:18 UTC (rev 18678)
+++
common/trunk/src/main/java/org/jboss/ws/common/injection/finders/ResourceFieldFinder.java 2014-05-20
09:45:36 UTC (rev 18679)
@@ -22,10 +22,8 @@
package org.jboss.ws.common.injection.finders;
import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import javax.annotation.Resource;
-import javax.xml.ws.WebServiceContext;
import org.jboss.ws.common.reflection.AnnotatedFieldFinder;
Modified:
common/trunk/src/main/java/org/jboss/ws/common/injection/finders/ResourceMethodFinder.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/common/injection/finders/ResourceMethodFinder.java 2014-05-20
07:18:18 UTC (rev 18678)
+++
common/trunk/src/main/java/org/jboss/ws/common/injection/finders/ResourceMethodFinder.java 2014-05-20
09:45:36 UTC (rev 18679)
@@ -24,7 +24,6 @@
import java.lang.reflect.Method;
import javax.annotation.Resource;
-import javax.xml.ws.WebServiceContext;
import org.jboss.ws.common.reflection.AnnotatedMethodFinder;
Modified:
common/trunk/src/main/java/org/jboss/ws/common/invocation/AbstractInvocationHandler.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/common/invocation/AbstractInvocationHandler.java 2014-05-20
07:18:18 UTC (rev 18678)
+++
common/trunk/src/main/java/org/jboss/ws/common/invocation/AbstractInvocationHandler.java 2014-05-20
09:45:36 UTC (rev 18679)
@@ -26,7 +26,6 @@
import javax.naming.Context;
import javax.naming.NamingException;
-import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationHandler;
@@ -39,9 +38,6 @@
*/
public abstract class AbstractInvocationHandler extends InvocationHandler
{
-
- protected final Logger log = Logger.getLogger(this.getClass()); //TODO! remove after
having refactored the AbstractInvocationHandlerEJB3 in ASIL
-
/**
* Constructor.
*/
Modified:
common/trunk/src/main/java/org/jboss/ws/common/invocation/RecordingServerHandler.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/common/invocation/RecordingServerHandler.java 2014-05-20
07:18:18 UTC (rev 18678)
+++
common/trunk/src/main/java/org/jboss/ws/common/invocation/RecordingServerHandler.java 2014-05-20
09:45:36 UTC (rev 18679)
@@ -55,10 +55,10 @@
* @author alessio.soldano(a)jboss.com
* @since 8-Dec-2007
*/
-public class RecordingServerHandler extends GenericSOAPHandler
+public class RecordingServerHandler extends GenericSOAPHandler<SOAPMessageContext>
{
@SuppressWarnings("unchecked")
- protected boolean handleInbound(MessageContext ctx)
+ protected boolean handleInbound(SOAPMessageContext ctx)
{
Endpoint endpoint = EndpointAssociation.getEndpoint();
if (endpoint != null && isRecording(endpoint))
@@ -89,10 +89,9 @@
}
if (processEnvelope) //skip message processing if not required since it's
very time-consuming
{
- SOAPMessageContext soapCtx = (SOAPMessageContext)ctx;
try
{
- SOAPEnvelope soapEnv = soapCtx.getMessage().getSOAPPart().getEnvelope();
+ SOAPEnvelope soapEnv = ctx.getMessage().getSOAPPart().getEnvelope();
if (soapEnv != null)
{
record.setEnvelope(DOMWriter.printNode(soapEnv, true));
@@ -109,7 +108,7 @@
}
@SuppressWarnings("unchecked")
- protected boolean handleOutbound(MessageContext ctx)
+ protected boolean handleOutbound(SOAPMessageContext ctx)
{
Endpoint endpoint = EndpointAssociation.getEndpoint();
if (endpoint != null && isRecording(endpoint))
@@ -127,10 +126,9 @@
}
if (processEnvelope) //skip message processing if not required since it's
very time-consuming
{
- SOAPMessageContext soapCtx = (SOAPMessageContext)ctx;
try
{
- SOAPEnvelope soapEnv = soapCtx.getMessage().getSOAPPart().getEnvelope();
+ SOAPEnvelope soapEnv = ctx.getMessage().getSOAPPart().getEnvelope();
if (soapEnv != null)
{
record.setEnvelope(DOMWriter.printNode(soapEnv, true));
@@ -146,7 +144,7 @@
return true;
}
- public boolean handleFault(MessageContext ctx)
+ public boolean handleFault(SOAPMessageContext ctx)
{
return handleOutbound(ctx);
}
Modified:
common/trunk/src/main/java/org/jboss/ws/common/management/DefaultEndpointRegistry.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/common/management/DefaultEndpointRegistry.java 2014-05-20
07:18:18 UTC (rev 18678)
+++
common/trunk/src/main/java/org/jboss/ws/common/management/DefaultEndpointRegistry.java 2014-05-20
09:45:36 UTC (rev 18679)
@@ -44,7 +44,7 @@
*/
public class DefaultEndpointRegistry implements EndpointRegistry
{
- private Map<ObjectName, Endpoint> endpoints = new
ConcurrentHashMap<ObjectName, Endpoint>();
+ private final Map<ObjectName, Endpoint> endpoints = new
ConcurrentHashMap<ObjectName, Endpoint>();
public Endpoint getEndpoint(ObjectName epName)
{
Modified:
common/trunk/src/main/java/org/jboss/ws/common/management/ManagedEndpointRegistry.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/common/management/ManagedEndpointRegistry.java 2014-05-20
07:18:18 UTC (rev 18678)
+++
common/trunk/src/main/java/org/jboss/ws/common/management/ManagedEndpointRegistry.java 2014-05-20
09:45:36 UTC (rev 18679)
@@ -37,7 +37,7 @@
public class ManagedEndpointRegistry extends DefaultEndpointRegistry implements
ManagedEndpointRegistryMBean
{
// The MBeanServer
- private MBeanServer mbeanServer;
+ private volatile MBeanServer mbeanServer;
public MBeanServer getMbeanServer()
{
Modified:
common/trunk/src/main/java/org/jboss/ws/common/reflection/AbstractAnnotatedClassProcessor.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/common/reflection/AbstractAnnotatedClassProcessor.java 2014-05-20
07:18:18 UTC (rev 18678)
+++
common/trunk/src/main/java/org/jboss/ws/common/reflection/AbstractAnnotatedClassProcessor.java 2014-05-20
09:45:36 UTC (rev 18679)
@@ -32,8 +32,7 @@
* @author ropalka(a)redhat.com
*/
public abstract class AbstractAnnotatedClassProcessor<AO extends AccessibleObject, A
extends Annotation>
-extends AbstractClassProcessor<AO>
-implements AnnotationAware<A>
+ extends AbstractClassProcessor<AO> implements AnnotationAware<A>
{
/**
* Annotation class.
Modified:
common/trunk/src/main/java/org/jboss/ws/common/security/DefaultSecurityAdapterFactory.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/common/security/DefaultSecurityAdapterFactory.java 2014-05-20
07:18:18 UTC (rev 18678)
+++
common/trunk/src/main/java/org/jboss/ws/common/security/DefaultSecurityAdapterFactory.java 2014-05-20
09:45:36 UTC (rev 18679)
@@ -23,8 +23,6 @@
import java.security.Principal;
-import javax.security.auth.Subject;
-
import org.jboss.wsf.spi.invocation.SecurityAdaptor;
import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory;
@@ -36,7 +34,7 @@
public final class DefaultSecurityAdapterFactory extends SecurityAdaptorFactory
{
- private static SecurityAdaptor SECURITY_ADAPTOR = new DefaultSecurityAdaptor();
+ private static final SecurityAdaptor SECURITY_ADAPTOR = new DefaultSecurityAdaptor();
/**
* Constructor.
@@ -59,8 +57,8 @@
private static class DefaultSecurityAdaptor implements SecurityAdaptor
{
- private static ThreadLocal<Principal> principal = new
ThreadLocal<Principal>();
- private static ThreadLocal<Object> credential = new
ThreadLocal<Object>();
+ private static final ThreadLocal<Principal> principal = new
ThreadLocal<Principal>();
+ private static final ThreadLocal<Object> credential = new
ThreadLocal<Object>();
public Object getCredential()
{
@@ -72,11 +70,6 @@
return DefaultSecurityAdaptor.principal.get();
}
- public void pushSubjectContext(Subject subject, Principal principal, Object
credential)
- {
- // does nothing
- }
-
public void setCredential(Object credential)
{
DefaultSecurityAdaptor.credential.set(credential);
Modified:
common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java 2014-05-20
07:18:18 UTC (rev 18678)
+++
common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java 2014-05-20
09:45:36 UTC (rev 18679)
@@ -63,11 +63,11 @@
public abstract class AbstractWSDLFilePublisher
{
// The deployment info for the web service archive
- protected ArchiveDeployment dep;
+ protected final ArchiveDeployment dep;
// The expected wsdl location in the deployment
- protected String expLocation;
+ protected final String expLocation;
// The server config
- protected ServerConfig serverConfig;
+ protected final ServerConfig serverConfig;
private static DocumentBuilder builder;
@@ -75,11 +75,8 @@
{
this.dep = dep;
- serverConfig = dep.getAttachment(ServerConfig.class);
- if (serverConfig == null)
- {
- serverConfig = getServerConfig();
- }
+ ServerConfig sc = dep.getAttachment(ServerConfig.class);
+ serverConfig = sc != null ? sc : getServerConfig();
if (isJseDeployment(dep) || isWarArchive(dep))
{
Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/DelegateClassLoader.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/common/utils/DelegateClassLoader.java 2014-05-20
07:18:18 UTC (rev 18678)
+++
common/trunk/src/main/java/org/jboss/ws/common/utils/DelegateClassLoader.java 2014-05-20
09:45:36 UTC (rev 18679)
@@ -37,9 +37,9 @@
*/
public class DelegateClassLoader extends SecureClassLoader
{
- private ClassLoader delegate;
+ private final ClassLoader delegate;
- private ClassLoader parent;
+ private final ClassLoader parent;
public DelegateClassLoader(final ClassLoader delegate, final ClassLoader parent)
{
Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResolver.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResolver.java 2014-05-20
07:18:18 UTC (rev 18678)
+++
common/trunk/src/main/java/org/jboss/ws/common/utils/JBossWSEntityResolver.java 2014-05-20
09:45:36 UTC (rev 18679)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2014, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -54,9 +54,9 @@
* A synchronized weak hash map that keeps entities' properties for each
classloader.
* Weak keys are used to remove entries when classloaders are garbage collected;
values are filenames -> properties.
*/
- private static Map<ClassLoader, Map<String, Properties>> propertiesMap =
Collections.synchronizedMap(new WeakHashMap<ClassLoader, Map<String,
Properties>>());
+ private static final Map<ClassLoader, Map<String, Properties>>
propertiesMap = Collections.synchronizedMap(new WeakHashMap<ClassLoader, Map<String,
Properties>>());
- private ClassLoader additionalClassLoader;
+ private final ClassLoader additionalClassLoader;
public JBossWSEntityResolver()
{
Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/JarUrlConnection.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/utils/JarUrlConnection.java 2014-05-20
07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/utils/JarUrlConnection.java 2014-05-20
09:45:36 UTC (rev 18679)
@@ -47,10 +47,10 @@
// ----------------------------------------------------------------------
/** Base resource. */
- private URL baseResource;
+ private final URL baseResource;
/** Additional nested segments. */
- private String[] segments;
+ private final String[] segments;
/** Terminal input-stream. */
private InputStream in;
Modified: common/trunk/src/main/java/org/jboss/ws/common/utils/ResourceURL.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/utils/ResourceURL.java 2014-05-20
07:18:18 UTC (rev 18678)
+++ common/trunk/src/main/java/org/jboss/ws/common/utils/ResourceURL.java 2014-05-20
09:45:36 UTC (rev 18679)
@@ -37,7 +37,7 @@
*/
public class ResourceURL
{
- private URL targetURL;
+ private final URL targetURL;
public ResourceURL(URL targetURL)
{
Modified:
common/trunk/src/main/java/org/jboss/ws/common/utils/XMLPredefinedEntityReferenceResolver.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/common/utils/XMLPredefinedEntityReferenceResolver.java 2014-05-20
07:18:18 UTC (rev 18678)
+++
common/trunk/src/main/java/org/jboss/ws/common/utils/XMLPredefinedEntityReferenceResolver.java 2014-05-20
09:45:36 UTC (rev 18679)
@@ -32,7 +32,7 @@
*/
public class XMLPredefinedEntityReferenceResolver
{
- private static HashMap<String, Character> entities = new HashMap<String,
Character>(8);
+ private static final HashMap<String, Character> entities = new
HashMap<String, Character>(8);
static
{