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
commit df1c14e0f6d2246177c9f01762e19107e79c4393 Author: Alexey Markevich <buhhu...@gmail.com> AuthorDate: Fri Mar 12 17:59:55 2021 +0300 cxf-rt-frontend-simple: fix PMD rule: UnusedAssignment --- .../apache/cxf/endpoint/dynamic/DynamicClientFactory.java | 12 ++++++------ .../main/java/org/apache/cxf/frontend/ClientFactoryBean.java | 4 ++-- .../java/org/apache/cxf/frontend/ClientProxyFactoryBean.java | 3 +-- .../src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java | 7 +++---- .../org/apache/cxf/frontend/spring/ClientServerTest.java | 4 ++-- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java index 947e84a..2e8b416 100644 --- a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java +++ b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java @@ -392,7 +392,7 @@ public class DynamicClientFactory { LOG.log(Level.SEVERE, new Message("COULD_NOT_COMPILE_SRC", LOG, wsdlUrl).toString()); } FileUtils.removeDir(src); - URL[] urls = null; + final URL[] urls; try { urls = new URL[] {classes.toURI().toURL()}; } catch (MalformedURLException mue) { @@ -764,11 +764,11 @@ public class DynamicClientFactory { errors.append('\n'); } if (arg0.getLineNumber() > 0) { - errors.append(arg0.getLocalizedMessage() + "\n" - + " at line " + arg0.getLineNumber() - + " column " + arg0.getColumnNumber() - + " of schema " + arg0.getSystemId() - + "\n"); + errors.append(arg0.getLocalizedMessage()).append('\n') + .append(" at line ").append(arg0.getLineNumber()) + .append(" column ").append(arg0.getColumnNumber()) + .append(" of schema ").append(arg0.getSystemId()) + .append('\n'); } else { errors.append(arg0.getMessage()); errors.append('\n'); diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java index ae2dacb..4811727 100644 --- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java +++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java @@ -85,8 +85,8 @@ public class ClientFactoryBean extends AbstractWSDLBasedEndpointFactory { } else if (properties != null) { getServiceFactory().getProperties().putAll(properties); } - Client client = null; - Endpoint ep = null; + final Client client; + final Endpoint ep; try { ep = createEndpoint(); this.getServiceFactory().sendEvent(FactoryBeanListener.Event.PRE_CLIENT_CREATE, ep); diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java index d7b2977..a09a922 100644 --- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java +++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxyFactoryBean.java @@ -124,10 +124,9 @@ public class ClientProxyFactoryBean extends AbstractBasicInterceptorProvider { */ public synchronized Object create() { ClassLoaderHolder orig = null; - ClassLoader loader = null; try { if (getBus() != null) { - loader = getBus().getExtension(ClassLoader.class); + ClassLoader loader = getBus().getExtension(ClassLoader.class); if (loader != null) { orig = ClassLoaderUtils.setThreadContextClassloader(loader); } diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java index 07f867d..958b118 100644 --- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java +++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java @@ -243,10 +243,9 @@ public class WSDLGetUtils { Message message, String xsdWsdlPar) { Bus bus = message.getExchange().getBus(); - List<Element> elementList = null; try { - elementList = DOMUtils.findAllElementsByTagNameNS(doc.getDocumentElement(), + List<Element> elementList = DOMUtils.findAllElementsByTagNameNS(doc.getDocumentElement(), "http://www.w3.org/2001/XMLSchema", "import"); for (Element el : elementList) { String sl = el.getAttribute("schemaLocation"); @@ -314,7 +313,7 @@ public class WSDLGetUtils { for (Element serviceEl : serviceList) { String serviceName = serviceEl.getAttribute("name"); if (serviceName.equals(message.getExchange().getService().getName().getLocalPart())) { - elementList = DOMUtils.findAllElementsByTagNameNS(doc.getDocumentElement(), + List<Element> elementList = DOMUtils.findAllElementsByTagNameNS(doc.getDocumentElement(), "http://schemas.xmlsoap.org/wsdl/", "port"); for (Element el : elementList) { @@ -743,7 +742,7 @@ public class WSDLGetUtils { String xsd, Map<String, SchemaReference> smp, String base) throws XMLStreamException { - Document doc = null; + final Document doc; SchemaReference si = lookupSchemaReference(bus, xsd, smp, base); String uri = si.getReferencedSchema().getDocumentBaseURI(); diff --git a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java index 56c95f9..56b4851 100644 --- a/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java +++ b/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java @@ -59,12 +59,12 @@ public class ClientServerTest extends AbstractSimpleFrontendSpringTest { TestInterceptor out = new TestInterceptor(); TestInterceptor in = new TestInterceptor(); c.getRequestContext().put(Message.OUT_INTERCEPTORS, Arrays.asList(new Interceptor[] {out})); - result = greeter.sayHello(); + greeter.sayHello(); assertTrue(out.wasCalled()); out.reset(); c.getRequestContext().put(Message.IN_INTERCEPTORS, Arrays.asList(new Interceptor[] {in})); - result = greeter.sayHello(); + greeter.sayHello(); assertTrue(out.wasCalled()); assertTrue(in.wasCalled()); ctx.close();