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 fb02ed5 rt/features: fix PMD rule: UnusedAssignment fb02ed5 is described below commit fb02ed59d270bbd78fc6b931bbbaacd1dc0c42ec Author: Alexey Markevich <buhhu...@gmail.com> AuthorDate: Thu Mar 11 22:41:57 2021 +0300 rt/features: fix PMD rule: UnusedAssignment --- .../cxf/clustering/FailoverTargetSelector.java | 2 +- .../clustering/LoadDistributorTargetSelector.java | 5 ++-- .../java/org/apache/cxf/ext/logging/WireTapIn.java | 4 ++-- .../ext/logging/event/DefaultLogEventMapper.java | 4 +--- .../metrics/codahale/CodahaleMetricsProvider.java | 27 ++++++++-------------- 5 files changed, 15 insertions(+), 27 deletions(-) diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java index c2abc28..46ab74f 100644 --- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java +++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java @@ -346,7 +346,7 @@ public class FailoverTargetSelector extends AbstractConduitSelector { * @return alternative addresses */ protected List<String> updateContextAlternatives(Exchange exchange, InvocationContext invocation) { - List<String> alternateAddresses = null; + final List<String> alternateAddresses; if (!invocation.hasAlternates()) { // no previous failover attempt on this invocation // diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/LoadDistributorTargetSelector.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/LoadDistributorTargetSelector.java index b1844fc..467e3e7 100644 --- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/LoadDistributorTargetSelector.java +++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/LoadDistributorTargetSelector.java @@ -135,7 +135,7 @@ public class LoadDistributorTargetSelector extends FailoverTargetSelector { */ protected Endpoint getFailoverTarget(Exchange exchange, InvocationContext invocation) { - List<String> alternateAddresses = null; + final List<String> alternateAddresses; if (!invocation.hasAlternates()) { // no previous failover attempt on this invocation // @@ -179,7 +179,6 @@ public class LoadDistributorTargetSelector extends FailoverTargetSelector { */ private Endpoint getDistributionTarget(Exchange exchange, InvocationContext invocation) { - List<String> alternateAddresses = null; if ((addressList == null) || (addressList.isEmpty())) { try { addressList = getStrategy().getAlternateAddresses(null); @@ -188,7 +187,7 @@ public class LoadDistributorTargetSelector extends FailoverTargetSelector { + " cannot handle a null argument to getAlternateAddresses: " + ex.toString()); } } - alternateAddresses = addressList; + List<String> alternateAddresses = addressList; if ((alternateAddresses == null) || (alternateAddresses.isEmpty())) { alternateAddresses = getStrategy().getAlternateAddresses(exchange); diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/WireTapIn.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/WireTapIn.java index aefc731..9b08c7d 100644 --- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/WireTapIn.java +++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/WireTapIn.java @@ -35,8 +35,8 @@ import org.apache.cxf.phase.Phase; public class WireTapIn extends AbstractPhaseInterceptor<Message> { private static final String WIRE_TAP_STARTED = WireTapIn.class.getName() + ".Started"; - private long threshold = -1; - private int limit = AbstractLoggingInterceptor.DEFAULT_LIMIT; + private long threshold; + private int limit; /** * Instantiates a new WireTapIn diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java index 8a0dec4..43f0120 100644 --- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java +++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java @@ -235,9 +235,7 @@ public class DefaultLogEventMapper { private String getOperationName(Message message) { String operationName = null; - BindingOperationInfo boi = null; - - boi = message.getExchange().getBindingOperationInfo(); + BindingOperationInfo boi = message.getExchange().getBindingOperationInfo(); if (null != boi) { operationName = boi.getName().toString(); diff --git a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsProvider.java b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsProvider.java index 92ac76a..cb42b6a 100644 --- a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsProvider.java +++ b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsProvider.java @@ -33,7 +33,6 @@ import org.apache.cxf.management.InstrumentationManager; import org.apache.cxf.management.ManagementConstants; import org.apache.cxf.metrics.MetricsContext; import org.apache.cxf.metrics.MetricsProvider; -import org.apache.cxf.service.Service; import org.apache.cxf.service.model.BindingOperationInfo; /** @@ -51,9 +50,8 @@ public class CodahaleMetricsProvider implements MetricsProvider { * */ public CodahaleMetricsProvider(Bus b) { - this.bus = b; - registry = b.getExtension(MetricRegistry.class); bus = b; + registry = b.getExtension(MetricRegistry.class); if (registry == null) { registry = new MetricRegistry(); setupJMXReporter(b, registry); @@ -91,25 +89,18 @@ public class CodahaleMetricsProvider implements MetricsProvider { StringBuilder getBaseServiceName(Endpoint endpoint, boolean isClient, String clientId) { StringBuilder buffer = new StringBuilder(); if (endpoint.get("org.apache.cxf.management.service.counter.name") != null) { - buffer.append((String)endpoint.get("org.apache.cxf.management.service.counter.name")); + buffer.append(endpoint.get("org.apache.cxf.management.service.counter.name")); } else { - Service service = endpoint.getService(); - - String serviceName = "\"" + escapePatternChars(service.getName().toString()) + "\""; - String portName = "\"" + endpoint.getEndpointInfo().getName().getLocalPart() + "\""; - buffer.append(ManagementConstants.DEFAULT_DOMAIN_NAME).append(':'); - buffer.append(ManagementConstants.BUS_ID_PROP + "=" + bus.getId() + ","); + buffer.append(ManagementConstants.BUS_ID_PROP).append('=').append(bus.getId()).append(','); buffer.append(ManagementConstants.TYPE_PROP).append("=Metrics"); - if (isClient) { - buffer.append(".Client,"); - } else { - buffer.append(".Server,"); - } - buffer.append(ManagementConstants.SERVICE_NAME_PROP + "=" + serviceName + ","); - buffer.append(ManagementConstants.PORT_NAME_PROP + "=" + portName + ","); + buffer.append(isClient ? ".Client," : ".Server,"); + buffer.append(ManagementConstants.SERVICE_NAME_PROP) + .append("=\"").append(escapePatternChars(endpoint.getService().getName().toString())).append("\","); + buffer.append(ManagementConstants.PORT_NAME_PROP) + .append("=\"").append(endpoint.getEndpointInfo().getName().getLocalPart()).append("\","); if (clientId != null) { - buffer.append("Client=" + clientId + ","); + buffer.append("Client=").append(clientId).append(','); } } return buffer;