You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2021/03/08 19:14:46 UTC
[cxf] branch master updated: cxf-rt-management: fix PMD rule:
UnusedAssignment
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 a7000a6 cxf-rt-management: fix PMD rule: UnusedAssignment
a7000a6 is described below
commit a7000a6dc4d61290fe96f579a43e231393ed7670
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Mon Mar 8 22:14:08 2021 +0300
cxf-rt-management: fix PMD rule: UnusedAssignment
---
.../cxf/management/counters/CounterRepository.java | 5 +-
.../management/jmx/InstrumentationManagerImpl.java | 2 +-
.../jmx/export/runtime/ModelMBeanAssembler.java | 18 +---
.../persistence/FilesystemExchangeDataDAO.java | 100 ++++++---------------
.../cxf/management/utils/ManagementConsole.java | 8 +-
.../cxf/management/InstrumentationManagerTest.java | 14 +--
.../jmx/JMXManagedComponentManagerTest.java | 2 -
7 files changed, 42 insertions(+), 107 deletions(-)
diff --git a/rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java b/rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java
index bf84a94..09529de 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/counters/CounterRepository.java
@@ -111,8 +111,7 @@ public class CounterRepository {
}
public Counter createCounter(ObjectName on) {
- Counter counter = null;
- counter = new ResponseTimeCounter(on);
+ Counter counter = new ResponseTimeCounter(on);
InstrumentationManager im = bus.getExtension(InstrumentationManager.class);
if (null != im) {
try {
@@ -125,6 +124,4 @@ public class CounterRepository {
return counter;
}
-
-
}
diff --git a/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java b/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
index d898a4b..6c6abc1 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/jmx/InstrumentationManagerImpl.java
@@ -298,7 +298,7 @@ public class InstrumentationManagerImpl
private void registerMBeanWithServer(Object obj, ObjectName name, boolean forceRegistration)
throws JMException {
- ObjectInstance instance = null;
+ ObjectInstance instance;
try {
if (LOG.isLoggable(Level.INFO)) {
LOG.info("registering MBean " + name + ": " + obj);
diff --git a/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanAssembler.java b/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanAssembler.java
index 98771d6..eaae90f 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanAssembler.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/jmx/export/runtime/ModelMBeanAssembler.java
@@ -50,24 +50,12 @@ public class ModelMBeanAssembler {
public ManagedOperationParameter[] getManagedOperationParameters(Method method) {
ManagedOperationParameters params = method.getAnnotation(ManagedOperationParameters.class);
- ManagedOperationParameter[] result = null;
- if (params == null) {
- result = new ManagedOperationParameter[0];
- } else {
- result = params.value();
- }
- return result;
+ return params != null ? params.value() : new ManagedOperationParameter[0];
}
public ManagedNotification[] getManagedNotifications(Class<?> clazz) {
- ManagedNotifications notificationsAnn =
- clazz.getAnnotation(ManagedNotifications.class);
- ManagedNotification[] result = null;
- if (null == notificationsAnn) {
- return new ManagedNotification[0];
- }
- result = notificationsAnn.value();
- return result;
+ ManagedNotifications notificationsAnn = clazz.getAnnotation(ManagedNotifications.class);
+ return null != notificationsAnn ? notificationsAnn.value() : new ManagedNotification[0];
}
public String getAttributeName(String methodName) {
diff --git a/rt/management/src/main/java/org/apache/cxf/management/persistence/FilesystemExchangeDataDAO.java b/rt/management/src/main/java/org/apache/cxf/management/persistence/FilesystemExchangeDataDAO.java
index 620185f..cacdff6 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/persistence/FilesystemExchangeDataDAO.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/persistence/FilesystemExchangeDataDAO.java
@@ -18,8 +18,7 @@
*/
package org.apache.cxf.management.persistence;
-import java.io.OutputStream;
-import java.io.StringWriter;
+import java.io.BufferedWriter;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -41,7 +40,7 @@ public class FilesystemExchangeDataDAO implements ExchangeDataDAO {
}
public void save(ExchangeData exchange) throws Exception {
- Path file = null;
+ final Path file;
if (this.directory == null) {
file = Files.createTempFile("cxf-management-", "." + this.extension);
@@ -49,82 +48,41 @@ public class FilesystemExchangeDataDAO implements ExchangeDataDAO {
file = Files.createTempFile(Paths.get(this.directory), "cxf-management-", "." + this.extension);
}
- StringWriter stringWriter = new StringWriter();
-
- stringWriter.append("Service : ");
- stringWriter.append(exchange.getServiceName());
- stringWriter.append("\n");
-
- stringWriter.append("Operation : ");
- stringWriter.append(exchange.getOperation());
- stringWriter.append("\n");
-
- stringWriter.append("Status : ");
- stringWriter.append(exchange.getStatus());
- stringWriter.append("\n");
-
- stringWriter.append("URI : ");
- stringWriter.append(exchange.getUri());
- stringWriter.append("\n");
-
- stringWriter.append("User agent : ");
- stringWriter.append(exchange.getUserAgent());
- stringWriter.append("\n");
-
- stringWriter.append("Encoding : ");
- stringWriter.append(exchange.getEncoding());
- stringWriter.append("\n");
-
- stringWriter.append("Date in : ");
- stringWriter.append(exchange.getInDate().toString());
- stringWriter.append("\n");
-
- stringWriter.append("Date out : ");
- stringWriter.append(exchange.getOutDate().toString());
- stringWriter.append("\n");
-
- stringWriter.append("Request size : ");
- stringWriter.append(String.valueOf(exchange.getRequestSize()));
- stringWriter.append("\n");
-
- stringWriter.append("Response size : ");
- stringWriter.append(String.valueOf(exchange.getResponseSize()));
- stringWriter.append("\n");
-
- stringWriter.append("\n\n\nRequest : \n\n\n");
- stringWriter.append(exchange.getRequest());
- stringWriter.append("\n\n\n\n");
-
- stringWriter.append("\n\n\nResponse : \n\n\n");
- stringWriter.append(exchange.getResponse());
- stringWriter.append("\n\n\n\n");
-
- if ("ERROR".equals(exchange.getStatus())) {
- stringWriter.append("\n\n\nExcepttion : ");
- stringWriter.append(exchange.getExceptionType());
- stringWriter.append("\nStackTrace : ");
- stringWriter.append(exchange.getStackTrace());
- stringWriter.append("\n\n\n\n");
- }
+ try (BufferedWriter bw = Files.newBufferedWriter(file)) {
+ bw.append("Service : ").append(exchange.getServiceName()).append('\n');
+
+ bw.append("Operation : ").append(exchange.getOperation()).append('\n');
+ bw.append("Status : ").append(exchange.getStatus()).append('\n');
+ bw.append("URI : ").append(exchange.getUri()).append('\n');
+ bw.append("User agent : ").append(exchange.getUserAgent()).append('\n');
+ bw.append("Encoding : ").append(exchange.getEncoding()).append('\n');
+ bw.append("Date in : ").append(String.valueOf(exchange.getInDate())).append('\n');
+ bw.append("Date out : ").append(String.valueOf(exchange.getOutDate())).append('\n');
+ bw.append("Request size : ").append(String.valueOf(exchange.getRequestSize())).append('\n');
+ bw.append("Response size : ").append(String.valueOf(exchange.getResponseSize())).append('\n');
+
+ bw.append("\n\n\nRequest : \n\n\n").append(exchange.getRequest()).append("\n\n\n\n");
+ bw.append("\n\n\nResponse : \n\n\n").append(exchange.getResponse()).append("\n\n\n\n");
+
+ if ("ERROR".equals(exchange.getStatus())) {
+ bw.append("\n\n\nExcepttion : ").append(exchange.getExceptionType());
+ bw.append("\nStackTrace : ").append(exchange.getStackTrace());
+ bw.append("\n\n\n\n");
+ }
- stringWriter.append("\n\nProperties : \n");
+ bw.append("\n\nProperties : \n");
- if (exchange.getProperties() != null) {
- for (ExchangeDataProperty exchangeProperty : exchange.getProperties()) {
- stringWriter.append(exchangeProperty.getName());
- stringWriter.append(" : ");
- stringWriter.append(exchangeProperty.getValue());
- stringWriter.append("\n");
+ if (exchange.getProperties() != null) {
+ for (ExchangeDataProperty edp : exchange.getProperties()) {
+ bw.append(edp.getName()).append(" : ").append(edp.getValue()).append('\n');
+ }
}
}
- try (OutputStream fileOutputStream = Files.newOutputStream(file)) {
- fileOutputStream.write(stringWriter.getBuffer().toString().getBytes());
- }
-
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Exchange data saved in " + file);
}
}
+
}
diff --git a/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java b/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java
index 3739ffa..8d9fc37 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/utils/ManagementConsole.java
@@ -102,10 +102,10 @@ public final class ManagementConsole {
ObjectName getEndpointObjectName()
throws MalformedObjectNameException, NullPointerException {
- StringBuilder buffer = new StringBuilder(128);
- buffer.append(ManagementConstants.DEFAULT_DOMAIN_NAME).append(":type=Bus.Service.Endpoint,");
- buffer.append(ManagementConstants.SERVICE_NAME_PROP + "=\"" + serviceName + "\",");
- buffer.append(ManagementConstants.PORT_NAME_PROP + "=\"" + portName + "\",*");
+ StringBuilder buffer = new StringBuilder(128)
+ .append(ManagementConstants.DEFAULT_DOMAIN_NAME).append(":type=Bus.Service.Endpoint,")
+ .append(ManagementConstants.SERVICE_NAME_PROP).append("=\"").append(serviceName).append("\",")
+ .append(ManagementConstants.PORT_NAME_PROP).append("=\"").append(portName).append("\",*");
return new ObjectName(buffer.toString());
}
diff --git a/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java b/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
index c505835..39ab81a 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/InstrumentationManagerTest.java
@@ -32,7 +32,6 @@ import org.apache.cxf.management.jmx.InstrumentationManagerImpl;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -43,13 +42,8 @@ import static org.junit.Assert.assertTrue;
public class InstrumentationManagerTest {
- InstrumentationManager im;
- Bus bus;
-
- @Before
- public void setUp() throws Exception {
- }
+ Bus bus;
@After
public void tearDown() throws Exception {
@@ -63,7 +57,7 @@ public class InstrumentationManagerTest {
public void testInstrumentationNotEnabled() {
SpringBusFactory factory = new SpringBusFactory();
bus = factory.createBus();
- im = bus.getExtension(InstrumentationManager.class);
+ InstrumentationManager im = bus.getExtension(InstrumentationManager.class);
assertNotNull("Instrumentation Manager should not be null", im);
MBeanServer mbs = im.getMBeanServer();
assertNull("MBeanServer should not be available.", mbs);
@@ -73,7 +67,7 @@ public class InstrumentationManagerTest {
public void testInstrumentationEnabledSetBeforeBusSet() {
SpringBusFactory factory = new SpringBusFactory();
bus = factory.createBus("managed-spring3.xml", true);
- im = bus.getExtension(InstrumentationManager.class);
+ InstrumentationManager im = bus.getExtension(InstrumentationManager.class);
assertNotNull("Instrumentation Manager should not be null", im);
MBeanServer mbs = im.getMBeanServer();
assertNotNull("MBeanServer should be available.", mbs);
@@ -84,7 +78,7 @@ public class InstrumentationManagerTest {
public void testWorkQueueInstrumentation() throws Exception {
SpringBusFactory factory = new SpringBusFactory();
bus = factory.createBus("managed-spring.xml", true);
- im = bus.getExtension(InstrumentationManager.class);
+ InstrumentationManager im = bus.getExtension(InstrumentationManager.class);
assertNotNull("Instrumentation Manager should not be null", im);
WorkQueueManagerImpl wqm = new WorkQueueManagerImpl();
wqm.setBus(bus);
diff --git a/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java b/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
index 20a7b09..c241c3e 100644
--- a/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
+++ b/rt/management/src/test/java/org/apache/cxf/management/jmx/JMXManagedComponentManagerTest.java
@@ -45,8 +45,6 @@ public class JMXManagedComponentManagerTest {
manager = new InstrumentationManagerImpl();
manager.setEnabled(true);
manager.init();
- //Wait for MBeanServer connector to be initialized on separate thread.
- Thread.sleep(2000);
}
@After