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 4ad97d59e890524337e2b99215586ed9d475ef61 Author: Alexey Markevich <[email protected]> AuthorDate: Thu Mar 18 22:30:39 2021 +0300 cxf-rt-rs-client: fix PMD rule: UnusedAssignment --- .../src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java | 2 +- .../src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java | 2 +- rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java | 4 ++-- .../org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java | 2 +- .../jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java index 4ba3a59..1e487ab 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java @@ -382,7 +382,7 @@ public final class JAXRSClientFactory { ClientState clientState = WebClient.getClientState(client); - T proxy = null; + final T proxy; if (clientState == null) { proxy = bean.create(cls); if (inheritHeaders) { diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java index 53c13fb..477e5d3 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java @@ -152,7 +152,7 @@ public class LocalClientState implements ClientState { public ClientState newState(URI currentURI, MultivaluedMap<String, String> headers, MultivaluedMap<String, String> templatesMap, Map<String, Object> props) { - ClientState state = null; + final ClientState state; if (isSupportedScheme(currentURI)) { state = new LocalClientState(currentURI, props); } else { diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java index 0f0c36c..34c9078 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java @@ -302,7 +302,7 @@ public class WebClient extends AbstractClient { */ public static WebClient fromClient(Client client, boolean inheritHeaders) { - WebClient webClient = null; + final WebClient webClient; ClientState clientState = getClientState(client); if (clientState == null) { @@ -927,7 +927,7 @@ public class WebClient extends AbstractClient { } MultivaluedMap<String, String> headers = prepareHeaders(responseClass, body); resetResponse(); - Response r = null; + final Response r; try { r = doChainedInvocation(httpMethod, headers, body, requestClass, inGenericType, inAnns, responseClass, outGenericType, null, null); diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java index 7519818..cddf5c6 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java @@ -132,8 +132,8 @@ public class ClientRequestContextImpl extends AbstractRequestContextImpl Object actualEntity = InjectionUtils.getEntity(entity); m.setContent(List.class, actualEntity == null ? new MessageContentsList() : new MessageContentsList(actualEntity)); - Type type = null; if (entity != null) { + final Type type; if (GenericEntity.class.isAssignableFrom(entity.getClass())) { type = ((GenericEntity<?>)entity).getType(); } else { diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java index 4f93423..6543ddc 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java @@ -135,7 +135,7 @@ public class JAXRSClientFactoryBeanDefinitionParser extends AbstractFactoryBeanD } AutowireCapableBeanFactory beanFactory = ctx.getAutowireCapableBeanFactory(); for (final Class< ? > providerClass: classes.get(Provider.class)) { - Object bean = null; + Object bean; try { bean = beanFactory.createBean(providerClass, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, true); @@ -173,7 +173,7 @@ public class JAXRSClientFactoryBeanDefinitionParser extends AbstractFactoryBeanD List<Object> providers = new LinkedList<>(); AutowireCapableBeanFactory beanFactory = context.getAutowireCapableBeanFactory(); for (final Class< ? > providerClass: providerClasses) { - Object bean = null; + Object bean; try { bean = beanFactory.createBean(providerClass, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, true);
