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 c44c39b rt/transports: fix PMD rule: UnusedAssignment
c44c39b is described below
commit c44c39b2faed4eef057a68e38fbe743609cb6a4c
Author: Alexey Markevich <buhhu...@gmail.com>
AuthorDate: Thu Mar 11 19:54:07 2021 +0300
rt/transports: fix PMD rule: UnusedAssignment
---
.../http/asyncclient/AsyncHTTPConduit.java | 3 +--
.../asyncclient/AsyncHttpTransportFactory.java | 3 +--
.../netty/client/NettyHttpTransportFactory.java | 6 +-----
.../http/netty/server/NettyHttpDestination.java | 2 +-
.../NettyHttpServerEngineFactoryHolder.java | 4 ++--
.../server/spring/NettySpringTypesFactory.java | 14 +++----------
.../netty/server/NettyHttpServerEngineTest.java | 9 ++++-----
.../spring/UndertowSpringTypesFactory.java | 14 +++----------
.../UndertowHTTPServerEngineFactoryTest.java | 7 +++----
.../UndertowHTTPServerEngineTest.java | 23 ++++++++--------------
.../apache/cxf/transport/udp/UDPDestination.java | 2 +-
.../jetty9/Jetty9WebSocketDestination.java | 5 ++---
12 files changed, 30 insertions(+), 62 deletions(-)
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
index fc71e8c..aa98230 100755
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
@@ -193,7 +193,6 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
if (StringUtils.isEmpty(uri.getPath())) {
//hc needs to have the path be "/"
uri = uri.resolve("/");
- addressChanged = true;
}
message.put(USE_ASYNC, Boolean.TRUE);
@@ -900,7 +899,7 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
return sslContext;
}
- SSLContext ctx = null;
+ final SSLContext ctx;
if (tlsClientParameters.getSslContext() != null) {
ctx = tlsClientParameters.getSslContext();
} else {
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHttpTransportFactory.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHttpTransportFactory.java
index 69b00b0..f963d62 100644
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHttpTransportFactory.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHttpTransportFactory.java
@@ -105,7 +105,6 @@ public class AsyncHttpTransportFactory extends
AbstractTransportFactory implemen
public Conduit getConduit(EndpointInfo endpointInfo, EndpointReferenceType
target, Bus bus)
throws IOException {
- HTTPConduit conduit = null;
// need to updated the endpointInfo
endpointInfo.setAddress(getAddress(endpointInfo));
@@ -113,7 +112,7 @@ public class AsyncHttpTransportFactory extends
AbstractTransportFactory implemen
if (fact == null) {
fact = factory;
}
- conduit = fact.createConduit(bus, endpointInfo, target);
+ HTTPConduit conduit = fact.createConduit(bus, endpointInfo, target);
// Spring configure the conduit.
String address = conduit.getAddress();
diff --git
a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpTransportFactory.java
b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpTransportFactory.java
index 30115db..cfcc799 100644
---
a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpTransportFactory.java
+++
b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpTransportFactory.java
@@ -92,8 +92,6 @@ public class NettyHttpTransportFactory extends
AbstractTransportFactory implemen
return address;
}
-
-
@Override
public Conduit getConduit(EndpointInfo endpointInfo, Bus bus) throws
IOException {
return getConduit(endpointInfo, endpointInfo.getTarget(), bus);
@@ -103,11 +101,10 @@ public class NettyHttpTransportFactory extends
AbstractTransportFactory implemen
public Conduit getConduit(EndpointInfo endpointInfo, EndpointReferenceType
target, Bus bus)
throws IOException {
- HTTPConduit conduit = null;
// need to updated the endpointInfo
endpointInfo.setAddress(getAddress(endpointInfo));
- conduit = factory.createConduit(bus, endpointInfo, target);
+ HTTPConduit conduit = factory.createConduit(bus, endpointInfo, target);
// Spring configure the conduit.
String address = conduit.getAddress();
@@ -123,5 +120,4 @@ public class NettyHttpTransportFactory extends
AbstractTransportFactory implemen
return conduit;
}
-
}
diff --git
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestination.java
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestination.java
index 02875d7..eb2420c 100644
---
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestination.java
+++
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestination.java
@@ -123,7 +123,7 @@ public class NettyHttpDestination extends
AbstractHTTPDestination {
protected void activate() {
super.activate();
LOG.log(Level.FINE, "Activating receipt of incoming messages");
- URL url = null;
+ final URL url;
try {
url = new URL(getAddress(endpointInfo));
diff --git
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
index 7895d01..9cba69d 100644
---
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
+++
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/blueprint/NettyHttpServerEngineFactoryHolder.java
@@ -135,9 +135,9 @@ public class NettyHttpServerEngineFactoryHolder {
//eng.setServer(engine.getTlsServerParameters());
if (engine.getTlsServerParameters() != null) {
- TLSServerParameters parameter = null;
try {
- parameter = new
TLSServerParametersConfig(engine.getTlsServerParameters());
+ TLSServerParameters parameter =
+ new
TLSServerParametersConfig(engine.getTlsServerParameters());
eng.setTlsServerParameters(parameter);
} catch (Exception e) {
throw new RuntimeException("Could not configure TLS
for engine on "
diff --git
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettySpringTypesFactory.java
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettySpringTypesFactory.java
index c7ce115..971bd4b 100644
---
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettySpringTypesFactory.java
+++
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/spring/NettySpringTypesFactory.java
@@ -117,35 +117,27 @@ public final class NettySpringTypesFactory {
Class<?> c,
JAXBContext context) throws
JAXBException {
List<V> list = new ArrayList<>();
- Node data = null;
Unmarshaller u = context.createUnmarshaller();
- Node node = parent.getFirstChild();
- while (node != null) {
+ for (Node node = parent.getFirstChild(); node != null; node =
node.getNextSibling()) {
if (node.getNodeType() == Node.ELEMENT_NODE &&
name.getLocalPart().equals(node.getLocalName())
&& name.getNamespaceURI().equals(node.getNamespaceURI())) {
- data = node;
- Object obj = unmarshal(u, data, c);
+ Object obj = unmarshal(u, node, c);
if (obj != null) {
list.add((V) obj);
}
}
- node = node.getNextSibling();
}
return list;
}
-
-
-
-
private static Object unmarshal(Unmarshaller u,
Node data, Class<?> c) {
if (u == null) {
return null;
}
- Object obj = null;
+ Object obj;
try {
if (c != null) {
obj = u.unmarshal(data, c);
diff --git
a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
index eedebcf..da2938a 100644
---
a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
+++
b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineTest.java
@@ -97,8 +97,7 @@ public class NettyHttpServerEngineTest {
engine.addServant(new URL(urlStr), handler1);
//assertEquals("Get the wrong maxIdleTime.", 30000,
engine.getConnector().getMaxIdleTime());
- String response = null;
- response = getResponse(urlStr);
+ String response = getResponse(urlStr);
assertEquals("The netty http handler did not take effect", response,
"string1");
try {
@@ -161,15 +160,15 @@ public class NettyHttpServerEngineTest {
NettyHttpServerEngineFactory.destroyForPort(PORT2);
}
- private String getResponse(String target) throws Exception {
+ private static String getResponse(String target) throws Exception {
URL url = new URL(target);
URLConnection connection = url.openConnection();
assertTrue(connection instanceof HttpURLConnection);
connection.connect();
- InputStream in = connection.getInputStream();
- try (ByteArrayOutputStream buffer = new ByteArrayOutputStream()) {
+ try (InputStream in = connection.getInputStream();
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream()) {
IOUtils.copy(in, buffer);
return buffer.toString();
}
diff --git
a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowSpringTypesFactory.java
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowSpringTypesFactory.java
index 5502737..a678296 100644
---
a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowSpringTypesFactory.java
+++
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/spring/UndertowSpringTypesFactory.java
@@ -116,35 +116,27 @@ public final class UndertowSpringTypesFactory {
Class<?> c,
JAXBContext context) throws
JAXBException {
List<V> list = new ArrayList<>();
- Node data = null;
Unmarshaller u = context.createUnmarshaller();
- Node node = parent.getFirstChild();
- while (node != null) {
+ for (Node node = parent.getFirstChild(); node != null; node =
node.getNextSibling()) {
if (node.getNodeType() == Node.ELEMENT_NODE &&
name.getLocalPart().equals(node.getLocalName())
&& name.getNamespaceURI().equals(node.getNamespaceURI())) {
- data = node;
- Object obj = unmarshal(u, data, c);
+ Object obj = unmarshal(u, node, c);
if (obj != null) {
list.add((V) obj);
}
}
- node = node.getNextSibling();
}
return list;
}
-
-
-
-
private static Object unmarshal(Unmarshaller u,
Node data, Class<?> c) {
if (u == null) {
return null;
}
- Object obj = null;
+ Object obj;
try {
if (c != null) {
obj = u.unmarshal(data, c);
diff --git
a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java
b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java
index 8eb56b9..e49e5eb 100644
---
a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java
+++
b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineFactoryTest.java
@@ -114,16 +114,15 @@ public class UndertowHTTPServerEngineFactoryTest {
// The Engine for port 1234 should be configured for TLS.
// This will throw an error if it is not.
- UndertowHTTPServerEngine engine = null;
- engine = factory.createUndertowHTTPServerEngine(1234, "https");
+ UndertowHTTPServerEngine engine =
factory.createUndertowHTTPServerEngine(1234, "https");
assertNotNull("Engine is not available.", engine);
assertEquals(1234, engine.getPort());
assertEquals("Not https", "https", engine.getProtocol());
try {
- engine = factory.createUndertowHTTPServerEngine(1234, "http");
- fail("The engine's protocol should be https");
+ factory.createUndertowHTTPServerEngine(1234, "http");
+ fail("The engine's protocol should be http");
} catch (Exception e) {
// expect the exception
}
diff --git
a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
index 25de7dd..fd1abdb 100644
---
a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
+++
b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngineTest.java
@@ -143,9 +143,6 @@ public class UndertowHTTPServerEngineTest {
UndertowHTTPServerEngineFactory.destroyForPort(PORT3);
}
-
-
-
@Test
public void testaddServants() throws Exception {
String urlStr = "http://localhost:"; + PORT1 + "/hello/test";
@@ -156,8 +153,7 @@ public class UndertowHTTPServerEngineTest {
engine.addServant(new URL(urlStr), new
UndertowHTTPTestHandler("string1", true));
assertEquals("Get the wrong maxIdleTime.", 30000,
engine.getMaxIdleTime());
- String response = null;
- response = getResponse(urlStr);
+ String response = getResponse(urlStr);
assertEquals("The undertow http handler did not take effect",
response, "string1");
try {
@@ -250,21 +246,18 @@ public class UndertowHTTPServerEngineTest {
UndertowHTTPServerEngineFactory.destroyForPort(PORT2);
}
-
-
-
- private String getResponse(String target) throws Exception {
+ private static String getResponse(String target) throws Exception {
URL url = new URL(target);
URLConnection connection = url.openConnection();
assertTrue(connection instanceof HttpURLConnection);
connection.connect();
- InputStream in = connection.getInputStream();
- ByteArrayOutputStream buffer = new ByteArrayOutputStream();
- IOUtils.copy(in, buffer);
- return buffer.toString();
+ try (InputStream in = connection.getInputStream();
+ ByteArrayOutputStream buffer = new ByteArrayOutputStream()) {
+ IOUtils.copy(in, buffer);
+ return buffer.toString();
+ }
}
-
-}
\ No newline at end of file
+}
diff --git
a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPDestination.java
b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPDestination.java
index 3b5d08d..4af4816 100644
---
a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPDestination.java
+++
b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPDestination.java
@@ -143,7 +143,7 @@ public class UDPDestination extends AbstractDestination {
try {
URI uri = new URI(this.getAddress().getAddress().getValue());
- InetSocketAddress isa = null;
+ final InetSocketAddress isa;
if (StringUtils.isEmpty(uri.getHost())) {
String s = uri.getSchemeSpecificPart();
if (s.startsWith("//:")) {
diff --git
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
index ba9fcf2..20e4f8c 100644
---
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
+++
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty9/Jetty9WebSocketDestination.java
@@ -177,12 +177,11 @@ public class Jetty9WebSocketDestination extends
JettyHTTPDestination implements
executeServiceTask(new Runnable() {
@Override
public void run() {
- HttpServletRequest request = null;
HttpServletResponse response = null;
try {
WebSocketServletHolder holder = new
Jetty9WebSocketHolder(session);
response = createServletResponse(holder);
- request = createServletRequest(data, offset, length,
holder, session);
+ HttpServletRequest request = createServletRequest(data,
offset, length, holder, session);
String reqid = request.getHeader(REQUEST_ID_KEY);
if (reqid != null) {
if (WebSocketUtils.isContainingCRLF(reqid)) {
@@ -306,7 +305,7 @@ public class Jetty9WebSocketDestination extends
JettyHTTPDestination implements
return session.getUpgradeRequest().getRequestURI().getPath();
}
public StringBuffer getRequestURL() {
- return new
StringBuffer(session.getUpgradeRequest().getRequestURI().toString());
+ return new
StringBuffer(session.getUpgradeRequest().getRequestURI().toString()); //NOPMD
}
public DispatcherType getDispatcherType() {
return null;
