This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push: new 69bde23 ws-rm, ws-transfer, integration: fix PMD rule: UnusedAssignment 69bde23 is described below commit 69bde238c2118718272bf6fc672e565d16d7a6d4 Author: Alexey Markevich <buhhu...@gmail.com> AuthorDate: Fri Mar 26 13:30:10 2021 +0300 ws-rm, ws-transfer, integration: fix PMD rule: UnusedAssignment --- .../jca/core/classloader/PlugInClassLoader.java | 2 +- .../cxf/jca/core/resourceadapter/ResourceBean.java | 4 +- .../java/org/apache/cxf/jca/cxf/JCABusFactory.java | 3 +- .../apache/cxf/jca/cxf/ManagedConnectionImpl.java | 4 +- .../jca/cxf/handlers/CXFInvocationHandlerBase.java | 2 +- .../cxf/handlers/InvokingInvocationHandler.java | 6 +- .../handlers/ObjectMethodInvocationHandler.java | 2 +- .../apache/cxf/jca/inbound/DispatchMDBInvoker.java | 2 +- .../apache/cxf/jca/inbound/MDBActivationWork.java | 6 +- .../org/apache/cxf/jca/jarloader/JarLoader.java | 2 +- .../cxf/jca/outbound/ManagedConnectionImpl.java | 2 +- .../org/apache/cxf/jca/servant/EJBEndpoint.java | 2 +- .../org/apache/cxf/jca/servant/EJBInvoker.java | 4 +- .../AbstractOpenTracingClientProvider.java | 4 +- .../opentracing/AbstractOpenTracingProvider.java | 4 +- .../tracing/opentracing/OpenTracingContext.java | 2 +- .../src/main/java/org/apache/cxf/ws/rm/Proxy.java | 9 ++- .../apache/cxf/ws/rm/RMCaptureOutInterceptor.java | 8 +-- .../java/org/apache/cxf/ws/rm/RMContextUtils.java | 2 +- .../main/java/org/apache/cxf/ws/rm/RMEndpoint.java | 77 ++++++---------------- .../main/java/org/apache/cxf/ws/rm/RMManager.java | 4 +- .../main/java/org/apache/cxf/ws/rm/RMUtils.java | 20 +++--- .../java/org/apache/cxf/ws/rm/SourceSequence.java | 2 +- .../apache/cxf/ws/rm/soap/RMSoapInInterceptor.java | 4 +- .../apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java | 6 +- .../cxf/ws/rm/soap/RetransmissionQueueImpl.java | 13 ++-- .../apache/cxf/ws/rm/soap/SoapFaultFactory.java | 2 +- .../org/apache/cxf/ws/rm/ManagedRMManagerTest.java | 4 +- .../org/apache/cxf/ws/rm/SourceSequenceTest.java | 14 ++-- .../ws/rm/persistence/jdbc/RMTxStoreTestBase.java | 40 +++++------ .../rm/persistence/jdbc/RMTxStoreUpgradeTest.java | 3 +- .../ws/rm/soap/RetransmissionQueueImplTest.java | 2 +- .../transfer/dialect/fragment/FragmentDialect.java | 25 ++----- .../ws/transfer/manager/MemoryResourceManager.java | 8 +-- .../transfer/integration/IntegrationBaseTest.java | 28 +------- .../transfer/integration/ResourceFactoryTest.java | 4 +- .../cxf/ws/transfer/integration/ResourceTest.java | 13 ++-- 37 files changed, 116 insertions(+), 223 deletions(-) diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java index 67c2e1f..c9ec494 100644 --- a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java +++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java @@ -43,7 +43,7 @@ public class PlugInClassLoader extends SecureClassLoader { private static final String JARS_PROPS_FILE = "jars.properties"; private static final String FILTERS_PROPS_FILE = "filters.properties"; private static final String NEFILTERS_PROPS_FILE = "negativefilters.properties"; - private String[] jarUrls = new String[0]; + private final String[] jarUrls; private final ProtectionDomain protectionDomain; private final ClassLoader ploader; diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java index 15fc36a..b180023 100644 --- a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java +++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java @@ -101,9 +101,8 @@ public class ResourceBean implements Serializable { } public void validateURLString(String spec, String msg) throws ResourceAdapterInternalException { - URL url = null; try { - url = createURL(spec, msg); + URL url = createURL(spec, msg); url.openStream(); LOG.fine("Validated url=" + url); } catch (IOException ioe) { @@ -111,5 +110,4 @@ public class ResourceBean implements Serializable { } } - } diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java index fa8be7a..6f0ccaf 100644 --- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java +++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java @@ -180,12 +180,11 @@ public class JCABusFactory { } protected Properties loadProperties(URL propsUrl) throws ResourceException { - Properties props = null; + Properties props = new Properties(); LOG.info("loadProperties, url=" + propsUrl); try (InputStream istream = propsUrl.openStream()) { - props = new Properties(); props.load(istream); } catch (IOException e) { throw new ResourceAdapterInternalException( diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java index d8acc2f..d89a788 100644 --- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java +++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java @@ -99,7 +99,7 @@ public class ManagedConnectionImpl public Object getConnection(Subject subject, ConnectionRequestInfo crInfo) throws ResourceException { - Object connection = null; + final Object connection; if (getCXFService() == null) { initializeCXFConnection(crInfo, subject); @@ -122,7 +122,7 @@ public class ManagedConnectionImpl Class<?> serviceInterface = requestInfo.getInterface(); ClassLoader orig = Thread.currentThread().getContextClassLoader(); try { - ClientProxyFactoryBean factoryBean = null; + final ClientProxyFactoryBean factoryBean; if (isJaxWsServiceInterface(serviceInterface)) { factoryBean = new JaxWsProxyFactoryBean(); } else { diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java index 36368ca..3cbe96e 100644 --- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java +++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java @@ -67,7 +67,7 @@ abstract class CXFInvocationHandlerBase implements CXFInvocationHandler { protected Throwable getExceptionToThrow(InvocationTargetException ex, Method targetMethod) throws Throwable { Throwable targetException = ex.getTargetException(); - Throwable ret = null; + Throwable ret; if (isOkToThrow(targetMethod, targetException)) { ret = targetException; diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandler.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandler.java index ccd0cf7..f906cd2 100644 --- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandler.java +++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandler.java @@ -61,15 +61,11 @@ public class InvokingInvocationHandler extends CXFInvocationHandlerBase { } private Object invokeTargetMethod(Object proxy, Method method, Object[] args) throws Throwable { - - Object ret = null; - try { - ret = method.invoke(getData().getTarget(), args); + return method.invoke(getData().getTarget(), args); } catch (InvocationTargetException ite) { throw ite.getTargetException(); } - return ret; } } diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandler.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandler.java index 512b194..986307a 100644 --- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandler.java +++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandler.java @@ -44,7 +44,7 @@ public class ObjectMethodInvocationHandler extends CXFInvocationHandlerBase { } public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - Object ret = null; + final Object ret; LOG.fine(this + " on " + method); diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java index 5169a29..4fb1c08 100644 --- a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java +++ b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java @@ -50,7 +50,7 @@ public class DispatchMDBInvoker extends MDBInvoker { @Override public Object getServiceObject(Exchange context) { - MessageEndpoint ep = null; + final MessageEndpoint ep; MessageEndpoint epFromMessage = null; if (context != null) { diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java index 650550f..cfc5cbc 100644 --- a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java +++ b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java @@ -163,7 +163,7 @@ public class MDBActivationWork implements Work { private Server createServer(Bus bus, Class<?> serviceClass, MDBInvoker invoker) { // create server bean factory - ServerFactoryBean factory = null; + final ServerFactoryBean factory; if (serviceClass != null && EndpointUtils.hasWebServiceAnnotation(serviceClass)) { factory = new JaxWsServerFactoryBean(); } else { @@ -205,7 +205,7 @@ public class MDBActivationWork implements Work { // Don't start the server yet factory.setStart(false); - Server retval = null; + final Server retval; if (factory instanceof JaxWsServerFactoryBean) { retval = createServerFromJaxwsEndpoint((JaxWsServerFactoryBean)factory); } else { @@ -242,7 +242,7 @@ public class MDBActivationWork implements Work { } private MDBInvoker createInvoker() { - MDBInvoker answer = null; + final MDBInvoker answer; if (spec instanceof DispatchMDBActivationSpec) { answer = new DispatchMDBInvoker(endpointFactory, ((DispatchMDBActivationSpec)spec).getTargetBeanJndiName()); diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java b/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java index 73e5d6f..2a94324 100644 --- a/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java +++ b/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java @@ -130,7 +130,7 @@ public final class JarLoader { private static void readArchive(String name) throws MalformedURLException, IOException { List<String> nameComponents = tokenizePathComponents(name); - Map<String, Object> map = null; + final Map<String, Object> map; if (nameComponents.size() == 1) { map = readZipStream((new URL(getRootArchiveName(name))).openStream()); diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java index 6402b26..15d63cb 100644 --- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java +++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java @@ -253,7 +253,7 @@ public class ManagedConnectionImpl implements ManagedConnection { private synchronized Object createClientProxy(final CXFConnectionSpec spec) { if (clientProxy == null) { validateConnectionSpec(spec); - ClientProxyFactoryBean factory = null; + final ClientProxyFactoryBean factory; if (EndpointUtils.hasWebServiceAnnotation(spec.getServiceClass())) { factory = new JaxWsProxyFactoryBean(); diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java b/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java index 533293d..a247c91 100644 --- a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java +++ b/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java @@ -122,7 +122,7 @@ public class EJBEndpoint { } public String getDefaultEJBServantBaseURL() throws Exception { - String hostName = ""; + String hostName; try { InetAddress addr = InetAddress.getLocalHost(); hostName = addr.getCanonicalHostName(); diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBInvoker.java b/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBInvoker.java index 2039ec1..0ee215d 100644 --- a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBInvoker.java +++ b/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBInvoker.java @@ -50,13 +50,11 @@ public class EJBInvoker extends AbstractInvoker { @Override public Object getServiceObject(Exchange context) { - Object ejbObject = null; try { - ejbObject = createMethod.invoke(home, EMPTY_OBJECT); + return createMethod.invoke(home, EMPTY_OBJECT); } catch (Exception e) { throw new RuntimeException("Error in creating EJB Object"); } - return ejbObject; } } diff --git a/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/AbstractOpenTracingClientProvider.java b/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/AbstractOpenTracingClientProvider.java index 39f217b..746ccec 100644 --- a/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/AbstractOpenTracingClientProvider.java +++ b/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/AbstractOpenTracingClientProvider.java @@ -50,8 +50,8 @@ public abstract class AbstractOpenTracingClientProvider extends AbstractTracingP final Span parent = tracer.activeSpan(); - Span activeSpan = null; - Scope scope = null; + final Span activeSpan; + final Scope scope; if (parent == null) { activeSpan = tracer.buildSpan(buildSpanDescription(uri.toString(), method)).start(); scope = tracer.scopeManager().activate(activeSpan); diff --git a/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/AbstractOpenTracingProvider.java b/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/AbstractOpenTracingProvider.java index fd237fb..b91f0f4 100644 --- a/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/AbstractOpenTracingProvider.java +++ b/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/AbstractOpenTracingProvider.java @@ -57,8 +57,8 @@ public abstract class AbstractOpenTracingProvider extends AbstractTracingProvide .collect(Collectors.toMap(Map.Entry::getKey, this::getFirstValueOrEmpty)) )); - Span activeSpan = null; - Scope scope = null; + final Span activeSpan; + final Scope scope; if (parent == null) { activeSpan = tracer.buildSpan(buildSpanDescription(uri.getPath(), method)).start(); scope = tracer.scopeManager().activate(activeSpan); diff --git a/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/OpenTracingContext.java b/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/OpenTracingContext.java index e184dd4..4755aa7 100644 --- a/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/OpenTracingContext.java +++ b/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/OpenTracingContext.java @@ -109,7 +109,7 @@ public class OpenTracingContext implements TracerContext { } private Scope newOrChildSpan(final String description, final Span parent) { - Span span = null; + final Span span; if (parent == null) { span = tracer.buildSpan(description).start(); diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java index e67034a..44f1994 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Proxy.java @@ -144,7 +144,7 @@ public class Proxy { CreateSequenceType create = new CreateSequenceType(); String address = sp.getAcksTo(); - EndpointReferenceType acksTo = null; + final EndpointReferenceType acksTo; if (null != address) { acksTo = RMUtils.createReference(address); } else { @@ -321,7 +321,7 @@ public class Proxy { Endpoint endpoint = reliableEndpoint.getEndpoint(protocol); BindingInfo bi = reliableEndpoint.getBindingInfo(protocol); Conduit c = reliableEndpoint.getConduit(); - Client client = null; + final Client client; if (params.length > 0 && params[0] instanceof DestinationSequence) { EndpointReferenceType acksTo = ((DestinationSequence)params[0]).getAcksTo(); String acksAddress = acksTo.getAddress().getValue(); @@ -375,10 +375,9 @@ public class Proxy { ConduitSelector cs = new DeferredConduitSelector(conduit) { @Override public synchronized Conduit selectConduit(Message message) { - Conduit conduit = null; + final Conduit conduit; EndpointInfo endpointInfo = getEndpoint().getEndpointInfo(); - EndpointReferenceType original = - endpointInfo.getTarget(); + EndpointReferenceType original = endpointInfo.getTarget(); try { if (null != address) { endpointInfo.setAddress(address); diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java index 87b07a2..9fb4013 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureOutInterceptor.java @@ -157,7 +157,7 @@ public class RMCaptureOutInterceptor extends AbstractRMInterceptor<Message> { // get the current sequence, requesting the creation of a new one if necessary synchronized (source) { - SourceSequence seq = null; + final SourceSequence seq; if (isLastMessage) { seq = (SourceSequence)invocationContext.get(SourceSequence.class.getName()); } else { @@ -208,9 +208,7 @@ public class RMCaptureOutInterceptor extends AbstractRMInterceptor<Message> { // We need to ensure that we have an output stream which won't start writing the // message until connection is setup if (!(os instanceof WriteOnCloseOutputStream)) { - WriteOnCloseOutputStream cached = new WriteOnCloseOutputStream(os); - msg.setContent(OutputStream.class, cached); - os = cached; + msg.setContent(OutputStream.class, new WriteOnCloseOutputStream(os)); } getManager().initializeInterceptorChain(msg); //doneCaptureMessage(msg); @@ -307,7 +305,7 @@ public class RMCaptureOutInterceptor extends AbstractRMInterceptor<Message> { } if (cw.getThrowable() != null) { Throwable t = cw.getThrowable(); - RuntimeException exception = null; + final RuntimeException exception; if (t instanceof RuntimeException) { exception = (RuntimeException)t; } else { diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java index eaf5661..5a0dda7 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java @@ -73,7 +73,7 @@ public final class RMContextUtils { if (outbound) { return (RMProperties)message.get(getRMPropertiesKey(true)); } - Message m = null; + Message m; if (MessageUtils.isOutbound(message)) { // the in properties are only available on the in message m = message.getExchange().getInMessage(); diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java index ee50720..65a2397 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java @@ -49,7 +49,6 @@ import org.apache.cxf.binding.soap.model.SoapBindingInfo; import org.apache.cxf.binding.soap.model.SoapOperationInfo; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.common.util.PackageUtils; -import org.apache.cxf.databinding.DataBinding; import org.apache.cxf.endpoint.Endpoint; import org.apache.cxf.jaxb.JAXBDataBinding; import org.apache.cxf.management.InstrumentationManager; @@ -102,27 +101,21 @@ public class RMEndpoint { private EndpointReferenceType replyTo; private Source source; private Destination destination; - private Map<ProtocolVariation, WrappedService> services; - private Map<ProtocolVariation, Endpoint> endpoints; + private final Map<ProtocolVariation, WrappedService> services = new HashMap<>(); + private final Map<ProtocolVariation, Endpoint> endpoints = new HashMap<>(); private Object tokenStore; private Proxy proxy; private Servant servant; private long lastApplicationMessage; private long lastControlMessage; - private AtomicInteger applicationMessageCount; - private AtomicInteger controlMessageCount; + private final AtomicInteger applicationMessageCount = new AtomicInteger(); + private final AtomicInteger controlMessageCount = new AtomicInteger(); private InstrumentationManager instrumentationManager; private RMConfiguration configuration; private ManagedRMEndpoint managedEndpoint; private RequiredModelMBean modelMBean; - private AtomicInteger acknowledgementSequence; + private final AtomicInteger acknowledgementSequence = new AtomicInteger(); - /** - * Constructor. - * - * @param m - * @param ae - */ public RMEndpoint(RMManager m, Endpoint ae) { manager = m; applicationEndpoint = ae; @@ -130,11 +123,6 @@ public class RMEndpoint { destination = new Destination(this); proxy = new Proxy(this); servant = new Servant(this); - services = new HashMap<>(); - endpoints = new HashMap<>(); - applicationMessageCount = new AtomicInteger(); - controlMessageCount = new AtomicInteger(); - acknowledgementSequence = new AtomicInteger(); tokenStore = ae.getEndpointInfo().getProperty(SecurityConstants.TOKEN_STORE_CACHE_INSTANCE); } @@ -381,16 +369,14 @@ public class RMEndpoint { WrappedService service = new WrappedService(applicationEndpoint.getService(), serviceQName, si); - DataBinding dataBinding = null; Class<?> create = protocol.getCodec().getCreateSequenceType(); try { JAXBContext ctx = JAXBContext.newInstance(PackageUtils.getPackageName(create), create.getClassLoader()); - dataBinding = new JAXBDataBinding(ctx); + service.setDataBinding(new JAXBDataBinding(ctx)); } catch (JAXBException e) { throw new ServiceConstructionException(e); } - service.setDataBinding(dataBinding); service.setInvoker(servant); services.put(protocol, service); } @@ -517,16 +503,12 @@ public class RMEndpoint { } void buildCreateSequenceOperationInfo(InterfaceInfo ii, ProtocolVariation protocol) { - - OperationInfo operationInfo = null; - MessagePartInfo partInfo = null; - MessageInfo messageInfo = null; RMConstants consts = protocol.getConstants(); - operationInfo = ii.addOperation(consts.getCreateSequenceOperationName()); - messageInfo = operationInfo.createMessage(consts.getCreateSequenceOperationName(), + OperationInfo operationInfo = ii.addOperation(consts.getCreateSequenceOperationName()); + MessageInfo messageInfo = operationInfo.createMessage(consts.getCreateSequenceOperationName(), MessageInfo.Type.INPUT); operationInfo.setInput(messageInfo.getName().getLocalPart(), messageInfo); - partInfo = messageInfo.addMessagePart(CREATE_PART_NAME); + MessagePartInfo partInfo = messageInfo.addMessagePart(CREATE_PART_NAME); partInfo.setElementQName(consts.getCreateSequenceOperationName()); partInfo.setElement(true); partInfo.setTypeClass(protocol.getCodec().getCreateSequenceType()); @@ -560,18 +542,13 @@ public class RMEndpoint { } void buildTerminateSequenceOperationInfo(InterfaceInfo ii, ProtocolVariation protocol) { - - OperationInfo operationInfo = null; - MessagePartInfo partInfo = null; - MessageInfo messageInfo = null; - RMConstants consts = protocol.getConstants(); - operationInfo = ii.addOperation(consts.getTerminateSequenceOperationName()); + OperationInfo operationInfo = ii.addOperation(consts.getTerminateSequenceOperationName()); - messageInfo = operationInfo.createMessage(consts.getTerminateSequenceOperationName(), + MessageInfo messageInfo = operationInfo.createMessage(consts.getTerminateSequenceOperationName(), MessageInfo.Type.INPUT); operationInfo.setInput(messageInfo.getName().getLocalPart(), messageInfo); - partInfo = messageInfo.addMessagePart(TERMINATE_PART_NAME); + MessagePartInfo partInfo = messageInfo.addMessagePart(TERMINATE_PART_NAME); partInfo.setElementQName(consts.getTerminateSequenceOperationName()); partInfo.setElement(true); partInfo.setTypeClass(protocol.getCodec().getTerminateSequenceType()); @@ -600,25 +577,17 @@ public class RMEndpoint { } void buildSequenceAckOperationInfo(InterfaceInfo ii, ProtocolVariation protocol) { - - OperationInfo operationInfo = null; - MessageInfo messageInfo = null; - RMConstants consts = protocol.getConstants(); - operationInfo = ii.addOperation(consts.getSequenceAckOperationName()); - messageInfo = operationInfo.createMessage(consts.getSequenceAckOperationName(), + OperationInfo operationInfo = ii.addOperation(consts.getSequenceAckOperationName()); + MessageInfo messageInfo = operationInfo.createMessage(consts.getSequenceAckOperationName(), MessageInfo.Type.INPUT); operationInfo.setInput(messageInfo.getName().getLocalPart(), messageInfo); } void buildCloseSequenceOperationInfo(InterfaceInfo ii, ProtocolVariation protocol) { - - OperationInfo operationInfo = null; - MessageInfo messageInfo = null; - RMConstants consts = protocol.getConstants(); - operationInfo = ii.addOperation(consts.getCloseSequenceOperationName()); - messageInfo = operationInfo.createMessage(consts.getCloseSequenceOperationName(), + OperationInfo operationInfo = ii.addOperation(consts.getCloseSequenceOperationName()); + MessageInfo messageInfo = operationInfo.createMessage(consts.getCloseSequenceOperationName(), MessageInfo.Type.INPUT); operationInfo.setInput(messageInfo.getName().getLocalPart(), messageInfo); if (RM11Constants.NAMESPACE_URI.equals(protocol.getWSRMNamespace())) { @@ -639,13 +608,9 @@ public class RMEndpoint { } void buildAckRequestedOperationInfo(InterfaceInfo ii, ProtocolVariation protocol) { - - OperationInfo operationInfo = null; - MessageInfo messageInfo = null; - RMConstants consts = protocol.getConstants(); - operationInfo = ii.addOperation(consts.getAckRequestedOperationName()); - messageInfo = operationInfo.createMessage(consts.getAckRequestedOperationName(), + OperationInfo operationInfo = ii.addOperation(consts.getAckRequestedOperationName()); + MessageInfo messageInfo = operationInfo.createMessage(consts.getAckRequestedOperationName(), MessageInfo.Type.INPUT); operationInfo.setInput(messageInfo.getName().getLocalPart(), messageInfo); } @@ -662,11 +627,10 @@ public class RMEndpoint { String bindingId = sbi.getBindingId(); SoapBindingInfo bi = new SoapBindingInfo(si, bindingId, sv); bi.setName(bindingQName); - BindingOperationInfo boi = null; RMConstants consts = protocol.getConstants(); - boi = bi.buildOperation(consts.getCreateSequenceOperationName(), + BindingOperationInfo boi = bi.buildOperation(consts.getCreateSequenceOperationName(), consts.getCreateSequenceOperationName().getLocalPart(), null); addAction(boi, consts.getCreateSequenceAction(), consts.getCreateSequenceResponseAction()); bi.addOperation(boi); @@ -744,9 +708,8 @@ public class RMEndpoint { if (null == endpointInfo) { return null; } - Object ua = null; List<ExtensibilityElement> exts = endpointInfo.getExtensors(ExtensibilityElement.class); - ua = getUsingAddressing(exts); + Object ua = getUsingAddressing(exts); if (null != ua) { return ua; } diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java index c396627..e4d0dd1 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMManager.java @@ -437,9 +437,9 @@ public class RMManager { RMConfiguration config = getEffectiveConfiguration(message); if (null == seq || seq.isExpired()) { // TODO: better error handling - EndpointReferenceType to = null; + final EndpointReferenceType to; boolean isServer = RMContextUtils.isServerSide(message); - EndpointReferenceType acksTo = null; + EndpointReferenceType acksTo; RelatesToType relatesTo = null; if (isServer) { AddressingProperties inMaps = RMContextUtils.retrieveMAPs(message, false, false); diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java index acbdc0b..bd09073 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMUtils.java @@ -32,19 +32,15 @@ import org.apache.cxf.ws.addressing.AddressingConstants; public final class RMUtils { - private static final org.apache.cxf.ws.rm.v200702.ObjectFactory WSRM_FACTORY; - private static final org.apache.cxf.ws.rm.v200502.ObjectFactory WSRM200502_FACTORY; - private static final org.apache.cxf.ws.rm.v200502wsa15.ObjectFactory WSRM200502_WSA200508_FACTORY; - private static final AddressingConstants WSA_CONSTANTS; + private static final org.apache.cxf.ws.rm.v200702.ObjectFactory WSRM_FACTORY = + new org.apache.cxf.ws.rm.v200702.ObjectFactory(); + private static final org.apache.cxf.ws.rm.v200502.ObjectFactory WSRM200502_FACTORY = + new org.apache.cxf.ws.rm.v200502.ObjectFactory(); + private static final org.apache.cxf.ws.rm.v200502wsa15.ObjectFactory WSRM200502_WSA200508_FACTORY = + new org.apache.cxf.ws.rm.v200502wsa15.ObjectFactory(); + private static final AddressingConstants WSA_CONSTANTS = new AddressingConstants(); private static final Pattern GENERATED_BUS_ID_PATTERN = Pattern.compile(Bus.DEFAULT_BUS_ID + "\\d+$"); - static { - WSRM_FACTORY = new org.apache.cxf.ws.rm.v200702.ObjectFactory(); - WSRM200502_FACTORY = new org.apache.cxf.ws.rm.v200502.ObjectFactory(); - WSRM200502_WSA200508_FACTORY = new org.apache.cxf.ws.rm.v200502wsa15.ObjectFactory(); - WSA_CONSTANTS = new AddressingConstants(); - } - private RMUtils() { } @@ -118,7 +114,7 @@ public final class RMUtils { } public static String getEndpointIdentifier(Endpoint endpoint, Bus bus) { - String busId = null; + String busId; if (bus == null) { busId = Bus.DEFAULT_BUS_ID; } else { diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SourceSequence.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SourceSequence.java index 813fde2..3889b6d 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SourceSequence.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/SourceSequence.java @@ -244,7 +244,7 @@ public class SourceSequence extends AbstractSequence { public long nextMessageNumber(Identifier inSeqId, long inMsgNumber, boolean last) { assert !lastMessage; - long result = 0; + final long result; synchronized (this) { currentMessageNumber++; if (last) { diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptor.java index 8ced4c4..1dcdca5 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptor.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapInInterceptor.java @@ -174,7 +174,7 @@ public class RMSoapInInterceptor extends AbstractSoapInterceptor { } if (rmUri != null && rmUri.equals(ns)) { if (codec == null) { - String wsauri = null; + final String wsauri; AddressingProperties maps = ContextUtils.retrieveMAPs(message, false, false, false); if (maps == null) { RMConfiguration config = getManager(message).getEffectiveConfiguration(message); @@ -248,7 +248,7 @@ public class RMSoapInInterceptor extends AbstractSoapInterceptor { RMManager manager = getManager(message); assert manager != null; - RMEndpoint rme = null; + final RMEndpoint rme; try { rme = manager.getReliableEndpoint(message); } catch (RMException e) { diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java index c117263..e139594 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java @@ -286,7 +286,7 @@ public class RedeliveryQueueImpl implements RedeliveryQueue { Identifier sid = st.getIdentifier(); String key = sid.getValue(); - RedeliverCandidate candidate = null; + RedeliverCandidate candidate; synchronized (this) { List<RedeliverCandidate> sequenceCandidates = getSequenceCandidates(key); @@ -487,10 +487,8 @@ public class RedeliveryQueueImpl implements RedeliveryQueue { message.removeContent(Node.class); } - - InputStream is = null; CachedOutputStream cos = (CachedOutputStream)message.get(RMMessageConstants.SAVED_CONTENT); - is = cos.getInputStream(); + InputStream is = cos.getInputStream(); message.setContent(InputStream.class, is); message = message.getExchange().getEndpoint().getBinding().createMessage(message); restartingPhase = Phase.POST_STREAM; diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java index e73ef73..1c4fbcc 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java @@ -109,10 +109,8 @@ public class RetransmissionQueueImpl implements RetransmissionQueue { private static final Logger LOG = LogUtils.getL7dLogger(RetransmissionQueueImpl.class); - private Map<String, List<ResendCandidate>> candidates = - new HashMap<>(); - private Map<String, List<ResendCandidate>> suspendedCandidates = - new HashMap<>(); + private final Map<String, List<ResendCandidate>> candidates = new HashMap<>(); + private final Map<String, List<ResendCandidate>> suspendedCandidates = new HashMap<>(); private Resender resender; private RMManager manager; @@ -339,7 +337,7 @@ public class RetransmissionQueueImpl implements RetransmissionQueue { Identifier sid = st.getIdentifier(); String key = sid.getValue(); - ResendCandidate candidate = null; + final ResendCandidate candidate; synchronized (this) { List<ResendCandidate> sequenceCandidates = getSequenceCandidates(key); @@ -712,7 +710,7 @@ public class RetransmissionQueueImpl implements RetransmissionQueue { XMLStreamReader filteredReader = new PartialXMLStreamReader(xmlReader, version.getBody()); Node nd = message.getContent(Node.class); W3CDOMStreamWriter writer = message.get(W3CDOMStreamWriter.class); - Document doc = null; + final Document doc; if (writer != null) { StaxUtils.copy(filteredReader, writer); doc = writer.getDocument(); @@ -865,7 +863,6 @@ public class RetransmissionQueueImpl implements RetransmissionQueue { SequenceType seq = rmps.getSequence(); LOG.log(Level.INFO, "Retransmitted message " + seq.getMessageNumber() + " in sequence " + seq.getIdentifier().getValue()); - rmps = new RMProperties(); } } catch (Exception ex) { @@ -894,7 +891,7 @@ public class RetransmissionQueueImpl implements RetransmissionQueue { DeferredConduitSelector cs = new DeferredConduitSelector() { @Override public synchronized Conduit selectConduit(Message message) { - Conduit conduit = null; + final Conduit conduit; EndpointInfo endpointInfo = endpoint.getEndpointInfo(); EndpointReferenceType original = endpointInfo.getTarget(); try { diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/SoapFaultFactory.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/SoapFaultFactory.java index f0adb0a..2bb4424 100644 --- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/SoapFaultFactory.java +++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/SoapFaultFactory.java @@ -57,7 +57,7 @@ public class SoapFaultFactory implements BindingFaultFactory { } public Fault createFault(SequenceFault sf, Message msg) { - Fault f = null; + final Fault f; if (version == Soap11.getInstance()) { f = createSoap11Fault(sf); // so we can encode the SequenceFault as header diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java index a9aa5df..9238408 100755 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/ManagedRMManagerTest.java @@ -216,7 +216,7 @@ public class ManagedRMManagerTest { managedEndpoint.removeSourceSequence("seq3"); try { - cd = managedEndpoint.getSourceSequence("seq3"); + managedEndpoint.getSourceSequence("seq3"); fail("sequnce not removed"); } catch (Exception e) { // ok @@ -239,7 +239,7 @@ public class ManagedRMManagerTest { managedEndpoint.removeSourceSequence("seq1"); try { - cd = managedEndpoint.getSourceSequence("seq1"); + managedEndpoint.getSourceSequence("seq1"); fail("sequnce not removed"); } catch (Exception e) { // ok diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java index 6cfddf5..be574ad 100644 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java @@ -97,9 +97,7 @@ public class SourceSequenceTest { Identifier otherId = factory.createIdentifier(); otherId.setValue("otherSeq"); - SourceSequence seq = null; - - seq = new SourceSequence(id, ProtocolVariation.RM10WSA200408); + SourceSequence seq = new SourceSequence(id, ProtocolVariation.RM10WSA200408); assertEquals(id, seq.getIdentifier()); assertFalse(seq.isLastMessage()); assertFalse(seq.isExpired()); @@ -176,8 +174,7 @@ public class SourceSequenceTest { setUpSource(); seq.setSource(source); - SequenceAcknowledgement ack = seq.getAcknowledgement(); - ack = factory.createSequenceAcknowledgement(); + SequenceAcknowledgement ack = factory.createSequenceAcknowledgement(); SequenceAcknowledgement.AcknowledgementRange r = factory.createSequenceAcknowledgementAcknowledgementRange(); r.setLower(Long.valueOf(1)); @@ -233,7 +230,6 @@ public class SourceSequenceTest { @Test public void testNextMessageNumber() throws RMException { - SourceSequence seq = null; setUpSource(); rq.purgeAcknowledged(EasyMock.isA(SourceSequence.class)); EasyMock.expectLastCall().anyTimes(); @@ -241,7 +237,7 @@ public class SourceSequenceTest { // default termination policy - seq = new SourceSequence(id, ProtocolVariation.RM10WSA200408); + SourceSequence seq = new SourceSequence(id, ProtocolVariation.RM10WSA200408); seq.setSource(source); assertFalse(nextMessages(seq, 10)); control.verify(); @@ -301,8 +297,6 @@ public class SourceSequenceTest { @Test public void testCheckOfferingSequenceClosed() { - SourceSequence seq = null; - setUpSource(); RMEndpoint rme = control.createMock(RMEndpoint.class); @@ -317,7 +311,7 @@ public class SourceSequenceTest { control.replay(); - seq = new SourceSequence(id, null, did, ProtocolVariation.RM10WSA200408); + SourceSequence seq = new SourceSequence(id, null, did, ProtocolVariation.RM10WSA200408); seq.setSource(source); seq.nextMessageNumber(did, 1, false); assertTrue(seq.isLastMessage()); diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java index 9f8684d..c2b7a52 100644 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreTestBase.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.io.InputStream; import java.sql.Connection; import java.sql.SQLException; -import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.List; @@ -67,9 +67,9 @@ public abstract class RMTxStoreTestBase { private static final String NON_ANON_ACKS_TO = "http://localhost:9999/decoupled_endpoint"; - private static final Long ZERO = Long.valueOf(0); - private static final Long ONE = Long.valueOf(1); - private static final Long TEN = Long.valueOf(10); + private static final long ZERO = 0L; + private static final long ONE = 1L; + private static final long TEN = 10L; private static SequenceAcknowledgement ack1; private static SequenceAcknowledgement ack2; @@ -289,11 +289,8 @@ public abstract class RMTxStoreTestBase { } control.verify(); - Collection<Long> messageNrs = new ArrayList<>(); - messageNrs.add(ZERO); - messageNrs.add(TEN); - messageNrs.add(ONE); - messageNrs.add(TEN); + Collection<Long> messageNrs = Arrays.asList( + ZERO, TEN, ONE, TEN); store.removeMessages(sid1, messageNrs, true); store.removeMessages(sid1, messageNrs, false); @@ -540,7 +537,7 @@ public abstract class RMTxStoreTestBase { Collection<RMMessage> out = store.getMessages(sid1, true); assertEquals(0, out.size()); Collection<RMMessage> in = store.getMessages(sid1, false); - assertEquals(0, out.size()); + assertEquals(0, in.size()); try { setupMessage(sid1, ONE, null, true); @@ -565,9 +562,8 @@ public abstract class RMTxStoreTestBase { assertEquals(2, in.size()); checkRecoveredMessages(in); } finally { - Collection<Long> msgNrs = new ArrayList<>(); - msgNrs.add(ONE); - msgNrs.add(TEN); + Collection<Long> msgNrs = Arrays.asList( + ONE, TEN); store.removeMessages(sid1, msgNrs, true); store.removeMessages(sid1, msgNrs, false); @@ -633,8 +629,8 @@ public abstract class RMTxStoreTestBase { if (null != sid1) { store.removeSourceSequence(sid1); } - Collection<Long> msgNrs = new ArrayList<>(); - msgNrs.add(ONE); + Collection<Long> msgNrs = Arrays.asList( + ONE); store.removeMessages(sid1, msgNrs, true); } } @@ -697,8 +693,8 @@ public abstract class RMTxStoreTestBase { if (null != sid1) { store.removeDestinationSequence(sid1); } - Collection<Long> msgNrs = new ArrayList<>(); - msgNrs.add(ONE); + Collection<Long> msgNrs = Arrays.asList( + ONE); store.removeMessages(sid1, msgNrs, false); } } @@ -897,19 +893,19 @@ public abstract class RMTxStoreTestBase { assertEquals(1, recovered.getAcknowledgment().getAcknowledgementRange().size()); SequenceAcknowledgement.AcknowledgementRange r = recovered.getAcknowledgment().getAcknowledgementRange().get(0); - assertEquals(ONE, r.getLower()); - assertEquals(ONE, r.getUpper()); + assertEquals(ONE, r.getLower().longValue()); + assertEquals(ONE, r.getUpper().longValue()); assertEquals(ProtocolVariation.RM10WSA200408, recovered.getProtocol()); } else { assertEquals(10, recovered.getLastMessageNumber()); assertEquals(2, recovered.getAcknowledgment().getAcknowledgementRange().size()); SequenceAcknowledgement.AcknowledgementRange r = recovered.getAcknowledgment().getAcknowledgementRange().get(0); - assertEquals(ONE, r.getLower()); - assertEquals(ONE, r.getUpper()); + assertEquals(ONE, r.getLower().longValue()); + assertEquals(ONE, r.getUpper().longValue()); r = recovered.getAcknowledgment().getAcknowledgementRange().get(1); assertEquals(Long.valueOf(3), r.getLower()); - assertEquals(TEN, r.getUpper()); + assertEquals(TEN, r.getUpper().longValue()); assertEquals(ProtocolVariation.RM11WSA200508, recovered.getProtocol()); } } diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java index f8c22c0..8335fd6 100644 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStoreUpgradeTest.java @@ -161,8 +161,7 @@ public class RMTxStoreUpgradeTest { return; } // creating the old tables - Statement stmt = null; - stmt = getConnection().createStatement(); + Statement stmt = getConnection().createStatement(); try { stmt.executeUpdate(CREATE_OLD_SRC_SEQ_TABLE_STMT); } catch (SQLException ex) { diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java index bd75e5f..22d240c 100644 --- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java +++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImplTest.java @@ -153,7 +153,7 @@ public class RetransmissionQueueImplTest { RetransmissionQueueImpl.ResendCandidate candidate = queue.createResendCandidate(message); assertEquals(3, candidate.getMaxRetries()); - Date next = null; + Date next; for (int i = 1; i < 3; i++) { next = candidate.getNext(); candidate.attempted(); diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java index 94a9d52..7129e9d 100644 --- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java +++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/FragmentDialect.java @@ -63,30 +63,17 @@ public class FragmentDialect implements Dialect { @Resource WebServiceContext context; - private final Map<String, FragmentDialectLanguage> languages; + private final Map<String, FragmentDialectLanguage> languages = new HashMap<>(); - private Pattern badXPathPattern; + private final Pattern badXPathPattern = + Pattern.compile("//@?" + FragmentDialectLanguageQName.getQNamePatternString() + '$'); - private Pattern goodXPathPattern; + private final Pattern goodXPathPattern = + Pattern.compile("/@?" + FragmentDialectLanguageQName.getQNamePatternString() + '$'); public FragmentDialect() { - languages = new HashMap<>(); languages.put(FragmentDialectConstants.QNAME_LANGUAGE_IRI, new FragmentDialectLanguageQName()); languages.put(FragmentDialectConstants.XPATH10_LANGUAGE_IRI, new FragmentDialectLanguageXPath10()); - if (badXPathPattern == null) { - StringBuilder sb = new StringBuilder(); - sb.append("//@?"); - sb.append(FragmentDialectLanguageQName.getQNamePatternString()); - sb.append('$'); - badXPathPattern = Pattern.compile(sb.toString()); - } - if (goodXPathPattern == null) { - StringBuilder sb = new StringBuilder(); - sb.append("/@?"); - sb.append(FragmentDialectLanguageQName.getQNamePatternString()); - sb.append('$'); - goodXPathPattern = Pattern.compile(sb.toString()); - } } @Override @@ -491,7 +478,7 @@ public class FragmentDialect implements Dialect { * @return Parent of removed Node. */ private Node removeNode(Node resourceFragment) { - Node parent = null; + Node parent; if (resourceFragment.getNodeType() == Node.ATTRIBUTE_NODE) { parent = ((Attr)resourceFragment).getOwnerElement(); } else { diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/manager/MemoryResourceManager.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/manager/MemoryResourceManager.java index 09c95ec..4106b14 100644 --- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/manager/MemoryResourceManager.java +++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/manager/MemoryResourceManager.java @@ -56,15 +56,11 @@ public class MemoryResourceManager implements ResourceManager { private static final Logger LOG = LogUtils.getL7dLogger(MemoryResourceManager.class); - protected Map<String, String> storage; + protected final Map<String, String> storage = new HashMap<>(); @Resource private WebServiceContext context; - public MemoryResourceManager() { - storage = new HashMap<>(); - } - @Override public Representation get(ReferenceParametersType ref) { String uuid = getUUID(ref); @@ -75,7 +71,7 @@ public class MemoryResourceManager implements ResourceManager { if (resource.isEmpty()) { return new Representation(); } - Document doc = null; + final Document doc; try { doc = StaxUtils.read(new StringReader(storage.get(uuid))); } catch (XMLStreamException e) { diff --git a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/IntegrationBaseTest.java b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/IntegrationBaseTest.java index 7b2cc21..6d60954 100644 --- a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/IntegrationBaseTest.java +++ b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/IntegrationBaseTest.java @@ -23,9 +23,6 @@ import java.io.StringReader; import java.util.HashMap; import java.util.Map; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.XMLStreamException; import javax.xml.ws.BindingProvider; @@ -54,9 +51,7 @@ import org.apache.cxf.ws.transfer.resourcefactory.resolver.SimpleResourceResolve import org.apache.cxf.ws.transfer.shared.TransferConstants; import org.junit.After; -import org.junit.AfterClass; import org.junit.Before; -import org.junit.BeforeClass; public class IntegrationBaseTest { @@ -71,28 +66,8 @@ public class IntegrationBaseTest { public static final String RESOURCE_LOCAL_ADDRESS = "local://ResourceLocal"; - protected static DocumentBuilderFactory documentBuilderFactory; - - protected static DocumentBuilder documentBuilder; - - protected static Document document; - protected Bus bus; - @BeforeClass - public static void beforeClass() throws ParserConfigurationException { - documentBuilderFactory = DocumentBuilderFactory.newInstance(); - documentBuilder = documentBuilderFactory.newDocumentBuilder(); - document = documentBuilder.newDocument(); - } - - @AfterClass - public static void afterClass() { - documentBuilderFactory = null; - documentBuilder = null; - document = null; - } - @Before public void before() { bus = BusFactory.getDefaultBus(); @@ -162,8 +137,7 @@ public class IntegrationBaseTest { } protected Representation getRepresentation(String content) throws XMLStreamException { - Document doc = null; - doc = StaxUtils.read(new StringReader(content)); + Document doc = StaxUtils.read(new StringReader(content)); Representation representation = new Representation(); representation.setAny(doc.getDocumentElement()); return representation; diff --git a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/ResourceFactoryTest.java b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/ResourceFactoryTest.java index e180d83..0101089 100644 --- a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/ResourceFactoryTest.java +++ b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/ResourceFactoryTest.java @@ -19,6 +19,7 @@ package org.apache.cxf.ws.transfer.integration; +import org.w3c.dom.Document; import org.w3c.dom.Element; import org.apache.cxf.endpoint.Server; @@ -52,7 +53,8 @@ public class ResourceFactoryTest extends IntegrationBaseTest { return refParam; } - private Element createXMLRepresentation() { + private static Element createXMLRepresentation() { + Document document = DOMUtils.getEmptyDocument(); Element root = document.createElement("root"); Element child1 = document.createElement("child1"); Element child2 = document.createElement("child2"); diff --git a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/ResourceTest.java b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/ResourceTest.java index d89feec..7e5bdf8 100644 --- a/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/ResourceTest.java +++ b/rt/ws/transfer/src/test/java/org/apache/cxf/ws/transfer/integration/ResourceTest.java @@ -24,6 +24,7 @@ import javax.xml.ws.BindingProvider; import org.w3c.dom.Element; import org.apache.cxf.endpoint.Server; +import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; import org.apache.cxf.ws.addressing.AddressingProperties; import org.apache.cxf.ws.addressing.ContextUtils; @@ -74,7 +75,8 @@ public class ResourceTest extends IntegrationBaseTest { @Test public void getRequestTest() { - Element representationEl = document.createElementNS(REPRESENTATION_NAMESPACE, REPRESENTATION_NAME); + Element representationEl = + DOMUtils.getEmptyDocument().createElementNS(REPRESENTATION_NAMESPACE, REPRESENTATION_NAME); representationEl.setTextContent(REPRESENTATION_VALUE); Representation representation = new Representation(); representation.setAny(representationEl); @@ -85,7 +87,7 @@ public class ResourceTest extends IntegrationBaseTest { EasyMock.replay(manager); ReferenceParametersType refParams = new ReferenceParametersType(); - Element uuid = document.createElementNS( + Element uuid = DOMUtils.getEmptyDocument().createElementNS( MemoryResourceManager.REF_NAMESPACE, MemoryResourceManager.REF_LOCAL_NAME); uuid.setTextContent(UUID_VALUE); refParams.getAny().add(uuid); @@ -117,12 +119,13 @@ public class ResourceTest extends IntegrationBaseTest { EasyMock.replay(manager); ReferenceParametersType refParams = new ReferenceParametersType(); - Element uuid = document.createElementNS( + Element uuid = DOMUtils.getEmptyDocument().createElementNS( MemoryResourceManager.REF_NAMESPACE, MemoryResourceManager.REF_LOCAL_NAME); uuid.setTextContent(UUID_VALUE); refParams.getAny().add(uuid); - Element representationEl = document.createElementNS(REPRESENTATION_NAMESPACE, REPRESENTATION_NAME); + Element representationEl = + DOMUtils.getEmptyDocument().createElementNS(REPRESENTATION_NAMESPACE, REPRESENTATION_NAME); representationEl.setTextContent(REPRESENTATION_VALUE); Representation representation = new Representation(); representation.setAny(representationEl); @@ -155,7 +158,7 @@ public class ResourceTest extends IntegrationBaseTest { EasyMock.replay(manager); ReferenceParametersType refParams = new ReferenceParametersType(); - Element uuid = document.createElementNS( + Element uuid = DOMUtils.getEmptyDocument().createElementNS( MemoryResourceManager.REF_NAMESPACE, MemoryResourceManager.REF_LOCAL_NAME); uuid.setTextContent(UUID_VALUE); refParams.getAny().add(uuid);