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 097e6bf cxf-rt-frontend-jaxrs: fix PMD rule: UnusedAssignment
097e6bf is described below
commit 097e6bf31f3341ec3fc0a08cfd1f6b65a5e97b1e
Author: Alexey Markevich <buhhu...@gmail.com>
AuthorDate: Thu Mar 18 03:45:35 2021 +0300
cxf-rt-frontend-jaxrs: fix PMD rule: UnusedAssignment
---
.../java/org/apache/cxf/jaxrs/JAXRSInvoker.java | 4 +--
.../cxf/jaxrs/impl/EntityTagHeaderProvider.java | 2 +-
.../cxf/jaxrs/impl/MediaTypeHeaderProvider.java | 7 ++--
.../org/apache/cxf/jaxrs/impl/RequestImpl.java | 4 +--
.../apache/cxf/jaxrs/impl/ResourceContextImpl.java | 2 +-
.../impl/tl/ThreadLocalInvocationHandler.java | 2 +-
.../cxf/jaxrs/interceptor/JAXRSInInterceptor.java | 4 +--
.../cxf/jaxrs/interceptor/JAXRSOutInterceptor.java | 8 ++---
.../cxf/jaxrs/model/AbstractResourceInfo.java | 2 +-
.../org/apache/cxf/jaxrs/model/URITemplate.java | 6 ++--
.../cxf/jaxrs/provider/AbstractJAXBProvider.java | 2 +-
.../jaxrs/provider/CachingMessageBodyReader.java | 2 +-
.../jaxrs/provider/CachingMessageBodyWriter.java | 2 +-
.../cxf/jaxrs/provider/DataSourceProvider.java | 2 +-
.../cxf/jaxrs/provider/FormEncodingProvider.java | 2 +-
.../cxf/jaxrs/provider/JAXBElementProvider.java | 42 +++++++++++-----------
.../cxf/jaxrs/provider/MultipartProvider.java | 4 +--
.../apache/cxf/jaxrs/provider/ProviderFactory.java | 8 ++---
.../apache/cxf/jaxrs/provider/SourceProvider.java | 2 +-
.../cxf/jaxrs/provider/XSLTJaxbProvider.java | 4 +--
.../jaxrs/security/JAASAuthenticationFilter.java | 2 +-
.../security/KerberosAuthenticationFilter.java | 3 +-
.../jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 5 ++-
.../JAXRSServerFactoryBeanDefinitionParser.java | 2 +-
.../java/org/apache/cxf/jaxrs/utils/HttpUtils.java | 4 +--
.../org/apache/cxf/jaxrs/utils/InjectionUtils.java | 12 +++----
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 10 +++---
.../org/apache/cxf/jaxrs/utils/ResourceUtils.java | 2 +-
.../jaxrs/provider/JAXBElementProviderTest.java | 10 +++---
.../cxf/jaxrs/provider/ProviderFactoryTest.java | 2 +-
.../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 3 +-
31 files changed, 79 insertions(+), 87 deletions(-)
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
index 98252ba..163ff78 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
@@ -239,7 +239,7 @@ public class JAXRSInvoker extends AbstractInvoker {
result = checkSubResultObject(result, subResourcePath);
- Class<?> subResponseType = null;
+ final Class<?> subResponseType;
if (result.getClass() == Class.class) {
ResourceContext rc = new ResourceContextImpl(inMessage,
ori);
result = rc.getResource((Class<?>)result);
@@ -325,7 +325,7 @@ public class JAXRSInvoker extends AbstractInvoker {
protected Method getMethodToInvoke(ClassResourceInfo cri,
OperationResourceInfo ori, Object resourceObject) {
Method resourceMethod = cri.getMethodDispatcher().getMethod(ori);
- Method methodToInvoke = null;
+ Method methodToInvoke;
if (Proxy.class.isInstance(resourceObject)) {
methodToInvoke =
cri.getMethodDispatcher().getProxyMethod(resourceMethod);
if (methodToInvoke == null) {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java
index 77fb71e..0deb1c3 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java
@@ -37,7 +37,7 @@ public class EntityTagHeaderProvider implements
HeaderDelegate<EntityTag> {
return new EntityTag("*");
}
- String tag = null;
+ String tag;
boolean weak = false;
int i = header.indexOf(WEAK_PREFIX);
if (i != -1) {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
index 7b5b862..a885a33 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
@@ -20,7 +20,6 @@
package org.apache.cxf.jaxrs.impl;
import java.util.Collections;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -142,9 +141,7 @@ public class MediaTypeHeaderProvider implements
HeaderDelegate<MediaType> {
Map<String, String> params = type.getParameters();
if (params != null) {
- for (Iterator<Map.Entry<String, String>> iter =
params.entrySet().iterator();
- iter.hasNext();) {
- Map.Entry<String, String> entry = iter.next();
+ for (Map.Entry<String, String> entry : params.entrySet()) {
if (ignoreParams != null &&
ignoreParams.contains(entry.getKey())) {
continue;
}
@@ -177,7 +174,7 @@ public class MediaTypeHeaderProvider implements
HeaderDelegate<MediaType> {
Message message = PhaseInterceptorChain.getCurrentMessage();
if (message != null
&& !MessageUtils.getContextualBoolean(message,
STRICT_MEDIA_TYPE_CHECK, false)) {
- MediaType mt = null;
+ final MediaType mt;
if (mType.equals(MediaType.TEXT_PLAIN_TYPE.getType())) {
mt = MediaType.TEXT_PLAIN_TYPE;
} else if
(mType.equals(MediaType.APPLICATION_XML_TYPE.getSubtype())) {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
index 7cb0db1..5921f1a 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
@@ -270,7 +270,7 @@ public class RequestImpl implements Request {
SimpleDateFormat dateFormat = HttpUtils.getHttpDateFormat();
dateFormat.setLenient(false);
- Date dateSince = null;
+ final Date dateSince;
try {
dateSince = dateFormat.parse(ifModifiedSince.get(0));
} catch (ParseException ex) {
@@ -296,7 +296,7 @@ public class RequestImpl implements Request {
SimpleDateFormat dateFormat = HttpUtils.getHttpDateFormat();
dateFormat.setLenient(false);
- Date dateSince = null;
+ final Date dateSince;
try {
dateSince = dateFormat.parse(ifNotModifiedSince.get(0));
} catch (ParseException ex) {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResourceContextImpl.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResourceContextImpl.java
index af5de2a..ca1e629 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResourceContextImpl.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResourceContextImpl.java
@@ -41,7 +41,7 @@ public class ResourceContextImpl implements ResourceContext {
@Override
public <T> T getResource(Class<T> cls) {
- ResourceProvider rp = null;
+ final ResourceProvider rp;
Object propValue = m.getContextualProperty(CONTEXT_PROVIDER_PROP);
if (propValue instanceof ResourceContextProvider) {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalInvocationHandler.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalInvocationHandler.java
index e3e1cb7..bb27b5a 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalInvocationHandler.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalInvocationHandler.java
@@ -28,7 +28,7 @@ public class ThreadLocalInvocationHandler<T> extends
AbstractThreadLocalProxy<T>
implements InvocationHandler {
public Object invoke(Object proxy, Method m, Object[] args) throws
Throwable {
- Object target = null;
+ final Object target;
if (m.getDeclaringClass() == ThreadLocalProxy.class) {
target = this;
} else {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
index 98af3f2..3c9c5d8 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
@@ -149,7 +149,7 @@ public class JAXRSInInterceptor extends
AbstractPhaseInterceptor<Message> {
message.put(Message.ACCEPT_CONTENT_TYPE, acceptTypes);
}
}
- List<MediaType> acceptContentTypes = null;
+ final List<MediaType> acceptContentTypes;
try {
acceptContentTypes = JAXRSUtils.sortMediaTypes(acceptTypes,
JAXRSUtils.MEDIA_TYPE_Q_PARAM);
} catch (IllegalArgumentException ex) {
@@ -176,7 +176,7 @@ public class JAXRSInInterceptor extends
AbstractPhaseInterceptor<Message> {
MultivaluedMap<String, String> matchedValues = new MetadataMap<>();
- OperationResourceInfo ori = null;
+ final OperationResourceInfo ori;
try {
ori = JAXRSUtils.findTargetMethod(matchedResources, message,
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
index 9edab2a..ad75c0f 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
@@ -102,7 +102,7 @@ public class JAXRSOutInterceptor extends
AbstractOutDatabindingInterceptor {
Object responseObj = objs.get(0);
- Response response = null;
+ final Response response;
if (responseObj instanceof Response) {
response = (Response)responseObj;
if (response.getStatus() == 500
@@ -151,7 +151,7 @@ public class JAXRSOutInterceptor extends
AbstractOutDatabindingInterceptor {
Method invoked = ori == null ? null : ori.getAnnotatedMethod() != null
? ori.getAnnotatedMethod() : ori.getMethodToInvoke();
- Annotation[] annotations = null;
+ Annotation[] annotations;
Annotation[] staticAnns = ori != null ? ori.getOutAnnotations() : new
Annotation[]{};
Annotation[] responseAnns = response.getEntityAnnotations();
if (responseAnns != null) {
@@ -345,7 +345,7 @@ public class JAXRSOutInterceptor extends
AbstractOutDatabindingInterceptor {
}
private void checkCachedStream(Message m, OutputStream osOriginal, boolean
enabled) throws Exception {
- XMLStreamWriter writer = null;
+ final XMLStreamWriter writer;
if (enabled) {
writer = m.getContent(XMLStreamWriter.class);
} else {
@@ -353,7 +353,7 @@ public class JAXRSOutInterceptor extends
AbstractOutDatabindingInterceptor {
}
if (writer instanceof CachingXmlEventWriter) {
CachingXmlEventWriter cache = (CachingXmlEventWriter)writer;
- if (cache.getEvents().size() != 0) {
+ if (!cache.getEvents().isEmpty()) {
XMLStreamWriter origWriter = null;
try {
origWriter = StaxUtils.createXMLStreamWriter(osOriginal);
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
index 595e0c8..edf010e 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
@@ -184,7 +184,7 @@ public abstract class AbstractResourceInfo {
);
}
- Object property = null;
+ Object property;
synchronized (bus) {
property = bus.getProperty(prop);
if (property == null && create) {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
index b0c0af2..85fdd7e 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
@@ -196,19 +196,19 @@ public final class URITemplate {
List<PathSegment> uList = JAXRSUtils.getPathSegments(uri,
false);
StringBuilder sb = new StringBuilder();
for (int i = 0; i < uList.size(); i++) {
- String segment = null;
+ final String segment;
if (pList.size() > i &&
pList.get(i).getPath().indexOf('{') == -1) {
segment = uList.get(i).getPath();
} else {
segment = HttpUtils.fromPathSegment(uList.get(i));
}
- if (segment.length() > 0) {
+ if (!segment.isEmpty()) {
sb.append(SLASH);
}
sb.append(segment);
}
uri = sb.toString();
- if (uri.length() == 0) {
+ if (uri.isEmpty()) {
uri = SLASH;
}
m = templateRegexPattern.matcher(uri);
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
index ff5353d..f2bee17 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
@@ -666,7 +666,7 @@ public abstract class AbstractJAXBProvider<T> extends
AbstractConfigurableProvid
}
protected Class<?> getActualType(Class<?> type, Type genericType,
Annotation[] anns) {
- Class<?> theType = null;
+ Class<?> theType;
if (JAXBElement.class.isAssignableFrom(type)) {
theType = InjectionUtils.getActualType(genericType);
} else {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyReader.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyReader.java
index 62751af..ecdc8f1 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyReader.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyReader.java
@@ -69,7 +69,7 @@ public class CachingMessageBodyReader<T> extends
AbstractCachingMessageProvider<
if (delegatingReaders != null) {
return getDelegatingReader(type, gType, anns, mt);
}
- MessageBodyReader<T> r = null;
+ final MessageBodyReader<T> r;
mc.put(ACTIVE_JAXRS_PROVIDER_KEY, this);
try {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyWriter.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyWriter.java
index e1b76b2..21eab42 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyWriter.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyWriter.java
@@ -72,7 +72,7 @@ public class CachingMessageBodyWriter<T> extends
AbstractCachingMessageProvider<
if (delegatingWriters != null) {
return getDelegatingWriter(type, gType, anns, mt);
}
- MessageBodyWriter<T> w = null;
+ MessageBodyWriter<T> w;
mc.put(ACTIVE_JAXRS_PROVIDER_KEY, this);
try {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java
index 9b65796..efecac4 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java
@@ -57,7 +57,7 @@ public class DataSourceProvider<T> implements
MessageBodyReader<T>, MessageBodyW
MultivaluedMap<String, String> headers,
InputStream is)
throws IOException {
- DataSource ds = null;
+ final DataSource ds;
if (cls == FileDataSource.class) {
File file = new BinaryDataProvider<File>().readFrom(File.class,
File.class, annotations, type, headers, is);
ds = new FileDataSource(file);
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java
index 785d839..0344592 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/FormEncodingProvider.java
@@ -205,7 +205,7 @@ public class FormEncodingProvider<T> extends
AbstractConfigurableProvider
private static boolean isSupported(Class<?> type, MediaType mt) {
return (MultivaluedMap.class.isAssignableFrom(type) ||
Form.class.isAssignableFrom(type))
- || (mt.getType().equalsIgnoreCase("multipart")
+ || ("multipart".equalsIgnoreCase(mt.getType())
&& mt.isCompatible(MediaType.MULTIPART_FORM_DATA_TYPE)
&& (MultivaluedMap.class.isAssignableFrom(type) ||
Form.class.isAssignableFrom(type)));
}
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
index 0341c87..6ca7e2b 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
@@ -32,7 +32,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import javax.ws.rs.Consumes;
@@ -86,16 +85,17 @@ public class JAXBElementProvider<T> extends
AbstractJAXBProvider<T> {
private static final String XML_PI_PROPERTY_RI =
"com.sun.xml.bind.xmlHeaders";
private static final String XML_PI_PROPERTY_RI_INT =
"com.sun.xml.internal.bind.xmlHeaders";
- private static final List<String> MARSHALLER_PROPERTIES =
- Arrays.asList(new String[] {Marshaller.JAXB_ENCODING,
- Marshaller.JAXB_FORMATTED_OUTPUT,
- Marshaller.JAXB_FRAGMENT,
-
Marshaller.JAXB_NO_NAMESPACE_SCHEMA_LOCATION,
- Marshaller.JAXB_SCHEMA_LOCATION,
- NS_MAPPER_PROPERTY_RI,
- NS_MAPPER_PROPERTY_RI_INT,
- XML_PI_PROPERTY_RI,
- XML_PI_PROPERTY_RI_INT});
+ private static final String[] MARSHALLER_PROPERTIES = {
+ Marshaller.JAXB_ENCODING,
+ Marshaller.JAXB_FORMATTED_OUTPUT,
+ Marshaller.JAXB_FRAGMENT,
+ Marshaller.JAXB_NO_NAMESPACE_SCHEMA_LOCATION,
+ Marshaller.JAXB_SCHEMA_LOCATION,
+ NS_MAPPER_PROPERTY_RI,
+ NS_MAPPER_PROPERTY_RI_INT,
+ XML_PI_PROPERTY_RI,
+ XML_PI_PROPERTY_RI_INT
+ };
private Map<String, Object> mProperties = Collections.emptyMap();
private Map<String, String> nsPrefixes = Collections.emptyMap();
@@ -165,7 +165,7 @@ public class JAXBElementProvider<T> extends
AbstractJAXBProvider<T> {
unmarshaller = createUnmarshaller(theType, genericType,
isCollection);
addAttachmentUnmarshaller(unmarshaller);
- Object response = null;
+ Object response;
if (JAXBElement.class.isAssignableFrom(type)
|| !isCollection && (unmarshalAsJaxbElement
|| jaxbElementClassMap != null &&
jaxbElementClassMap.containsKey(theType.getName()))) {
@@ -331,7 +331,7 @@ public class JAXBElementProvider<T> extends
AbstractJAXBProvider<T> {
Object firstObj = it.hasNext() ? it.next() : null;
- QName qname = null;
+ final QName qname;
if (firstObj instanceof JAXBElement) {
JAXBElement<?> el = (JAXBElement<?>)firstObj;
qname = el.getName();
@@ -346,20 +346,18 @@ public class JAXBElementProvider<T> extends
AbstractJAXBProvider<T> {
.entity(message).build());
}
- StringBuilder pi = new StringBuilder();
- pi.append(XML_PI_START + (enc == null ? StandardCharsets.UTF_8.name()
: enc) + "\"?>");
- os.write(pi.toString().getBytes());
- String startTag = null;
- String endTag = null;
+ os.write((XML_PI_START + (enc == null ? StandardCharsets.UTF_8.name()
: enc) + "\"?>").getBytes());
- if (qname.getNamespaceURI().length() > 0) {
+ final String startTag;
+ final String endTag;
+ if (!qname.getNamespaceURI().isEmpty()) {
String prefix = nsPrefixes.get(qname.getNamespaceURI());
if (prefix == null) {
prefix = "ns1";
}
- startTag = "<" + prefix + ":" + qname.getLocalPart() + " xmlns:" +
prefix + "=\""
+ startTag = "<" + prefix + ':' + qname.getLocalPart() + " xmlns:" +
prefix + "=\""
+ qname.getNamespaceURI() + "\">";
- endTag = "</" + prefix + ":" + qname.getLocalPart() + ">";
+ endTag = "</" + prefix + ':' + qname.getLocalPart() + ">";
} else {
startTag = "<" + qname.getLocalPart() + ">";
endTag = "</" + qname.getLocalPart() + ">";
@@ -489,7 +487,7 @@ public class JAXBElementProvider<T> extends
AbstractJAXBProvider<T> {
MessageContext mc = getContext();
if (mc != null) {
String httpBasePath = (String)mc.get("http.base.path");
- UriBuilder builder = null;
+ final UriBuilder builder;
if (httpBasePath != null) {
builder = UriBuilder.fromPath(httpBasePath);
} else {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
index 1c615c0..e129eff 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
@@ -333,7 +333,7 @@ public class MultipartProvider extends
AbstractConfigurableProvider
String mimeType,
String mainMediaType,
int id) throws IOException {
- DataHandler dh = null;
+ final DataHandler dh;
if (InputStream.class.isAssignableFrom(obj.getClass())) {
dh = createInputStreamDH((InputStream)obj, mimeType);
} else if (DataHandler.class.isAssignableFrom(obj.getClass())) {
@@ -383,7 +383,7 @@ public class MultipartProvider extends
AbstractConfigurableProvider
MediaType mt = JAXRSUtils.toMediaType(mimeType);
mc.put(ProviderFactory.ACTIVE_JAXRS_PROVIDER_KEY, this);
- MessageBodyWriter<T> r = null;
+ final MessageBodyWriter<T> r;
try {
r = mc.getProviders().getMessageBodyWriter(cls, genericType, anns,
mt);
} finally {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index 1a8de7e..6bc22cd 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -253,7 +253,7 @@ public abstract class ProviderFactory {
Message responseMessage = isRequestor ? m.getExchange().getInMessage()
:
m.getExchange().getOutMessage();
- Object ctProperty = null;
+ final Object ctProperty;
if (responseMessage != null) {
ctProperty = responseMessage.get(Message.CONTENT_TYPE);
} else {
@@ -436,7 +436,7 @@ public abstract class ProviderFactory {
if (mr != null || size > 0) {
ReaderInterceptor mbrReader = new ReaderInterceptorMBR(mr,
getResponseMessage(m));
- List<ReaderInterceptor> interceptors = null;
+ final List<ReaderInterceptor> interceptors;
if (size > 0) {
interceptors = new ArrayList<>(size + 1);
List<ProviderInfo<ReaderInterceptor>> readers =
@@ -474,7 +474,7 @@ public abstract class ProviderFactory {
})
WriterInterceptor mbwWriter = new
WriterInterceptorMBW((MessageBodyWriter)mw, m);
- List<WriterInterceptor> interceptors = null;
+ final List<WriterInterceptor> interceptors;
if (size > 0) {
interceptors = new ArrayList<>(size + 1);
List<ProviderInfo<WriterInterceptor>> writers =
@@ -1237,7 +1237,7 @@ public abstract class ProviderFactory {
}
}
}
- Object instance = null;
+ final Object instance;
try {
instance = c.newInstance(cArgs);
} catch (Throwable ex) {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
index 3177e25..76980b8 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/SourceProvider.java
@@ -187,7 +187,7 @@ public class SourceProvider<T> extends
AbstractConfigurableProvider implements
String encoding = HttpUtils.getSetEncoding(mt, headers,
StandardCharsets.UTF_8.name());
- XMLStreamReader reader = null;
+ final XMLStreamReader reader;
if (source instanceof Source) {
reader = StaxUtils.createXMLStreamReader((Source)source);
} else if (source instanceof Document) {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
index 7fa4d6d..4250963 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/XSLTJaxbProvider.java
@@ -264,7 +264,7 @@ public class XSLTJaxbProvider<T> extends
JAXBElementProvider<T> {
t.newTransformer().transform(reader, dom);
return unmarshaller.unmarshal(dom.getNode());
}
- XMLFilter filter = null;
+ XMLFilter filter;
try {
filter = factory.newXMLFilter(t);
} catch (TransformerConfigurationException ex) {
@@ -352,7 +352,7 @@ public class XSLTJaxbProvider<T> extends
JAXBElementProvider<T> {
return;
}
org.apache.cxf.common.jaxb.JAXBUtils.setMinimumEscapeHandler(ms);
- TransformerHandler th = null;
+ TransformerHandler th;
try {
th = factory.newTransformerHandler(t);
} catch (TransformerConfigurationException ex) {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
index 8dce1a5..4dd05e3 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
@@ -117,7 +117,7 @@ public class JAASAuthenticationFilter implements
ContainerRequestFilter {
HttpHeaders headers = new HttpHeadersImpl(m);
if (redirectURI != null && isRedirectPossible(headers)) {
- URI finalRedirectURI = null;
+ final URI finalRedirectURI;
if (!redirectURI.isAbsolute()) {
String endpointAddress = HttpUtils.getEndpointAddress(m);
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
index 1a3590d..1c7a164 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
@@ -110,7 +110,6 @@ public class KerberosAuthenticationFilter implements
ContainerRequestFilter {
if (!gssContext.getCredDelegState()) {
gssContext.dispose();
- gssContext = null;
}
} catch (LoginException e) {
@@ -152,7 +151,7 @@ public class KerberosAuthenticationFilter implements
ContainerRequestFilter {
// meaning that a process which runs this code has the
// user identity
- LoginContext lc = null;
+ final LoginContext lc;
if (!StringUtils.isEmpty(loginContextName) || loginConfig != null) {
lc = new LoginContext(loginContextName, null, callbackHandler,
loginConfig);
} else {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
index 857c2f4..290c223 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/servlet/CXFNonSpringJaxrsServlet.java
@@ -437,7 +437,7 @@ public class CXFNonSpringJaxrsServlet extends
CXFNonSpringServlet {
}
boolean isApplication =
Application.class.isAssignableFrom(c.getDeclaringClass());
try {
- ProviderInfo<? extends Object> provider = null;
+ final ProviderInfo<? extends Object> provider;
if (c.getParameterTypes().length == 0) {
if (isApplication) {
provider = new
ApplicationInfo((Application)c.newInstance(), getBus());
@@ -608,8 +608,7 @@ public class CXFNonSpringJaxrsServlet extends
CXFNonSpringServlet {
protected Class<?> loadClass(String cName, String classType) throws
ServletException {
try {
-
- Class<?> cls = null;
+ final Class<?> cls;
if (classLoader == null) {
cls = ClassLoaderUtils.loadClass(cName,
CXFNonSpringJaxrsServlet.class);
} else {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
index 660723f..e2e182e 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
@@ -271,7 +271,7 @@ public class JAXRSServerFactoryBeanDefinitionParser extends
AbstractBeanDefiniti
if (serviceClassAnnotation != null &&
clazz.getAnnotation(serviceClassAnnotation) == null) {
continue;
}
- Object bean = null;
+ Object bean;
try {
bean = beanFactory.createBean(clazz,
AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, true);
} catch (Exception ex) {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
index 2aa164e..aa42382 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
@@ -303,7 +303,7 @@ public final class HttpUtils {
if (value == null) {
return null;
}
- String language = null;
+ final String language;
String locale = null;
int index = value.indexOf('-');
if (index == 0 || index == value.length() - 1) {
@@ -482,7 +482,7 @@ public final class HttpUtils {
}
public static String getEndpointAddress(Message m) {
- String address = null;
+ String address;
Destination d = m.getExchange().getDestination();
if (d != null) {
if (d instanceof AbstractHTTPDestination) {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
index 7e73cae..5543093 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
@@ -322,7 +322,7 @@ public final class InjectionUtils {
} else if (genericType instanceof GenericArrayType) {
genericType =
((GenericArrayType)genericType).getGenericComponentType();
}
- Class<?> cls = null;
+ final Class<?> cls;
if (!(genericType instanceof ParameterizedType)) {
cls = (Class<?>)genericType;
} else {
@@ -446,7 +446,7 @@ public final class InjectionUtils {
throw createParamConversionException(pType, nfe);
}
if (result != null) {
- T theResult = null;
+ final T theResult;
if (pClass.isPrimitive()) {
theResult = (T)result;
} else {
@@ -666,11 +666,11 @@ public final class InjectionUtils {
new HashMap<>();
for (Map.Entry<String, List<String>> entry : values.entrySet()) {
String memberKey = entry.getKey();
- String beanKey = null;
+ final String beanKey;
int idx = memberKey.indexOf('.');
if (idx == -1) {
- beanKey = "." + memberKey;
+ beanKey = '.' + memberKey;
} else {
beanKey = memberKey.substring(0, idx);
memberKey = memberKey.substring(idx + 1);
@@ -721,7 +721,7 @@ public final class InjectionUtils {
if (setter != null && getter != null) {
final Class<?> type;
final Type genericType;
- Object paramValue = null;
+ Object paramValue;
if (setter instanceof Method) {
type =
Method.class.cast(setter).getParameterTypes()[0];
genericType =
Method.class.cast(setter).getGenericParameterTypes()[0];
@@ -1526,7 +1526,7 @@ public final class InjectionUtils {
if (targetObject == null) {
return null;
}
- Type type = null;
+ final Type type;
if (GenericEntity.class.isAssignableFrom(targetObject.getClass())) {
type = processGenericTypeIfNeeded(serviceCls, targetType,
((GenericEntity<?>)targetObject).getType());
} else if (invoked == null
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index 585711d..df48754 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -200,7 +200,7 @@ public final class JAXRSUtils {
private static String[] getUserMediaTypes(Object provider, boolean
consumes) {
String[] values = null;
if
(AbstractConfigurableProvider.class.isAssignableFrom(provider.getClass())) {
- List<String> types = null;
+ final List<String> types;
if (consumes) {
types =
((AbstractConfigurableProvider)provider).getConsumeMediaTypes();
} else {
@@ -280,7 +280,7 @@ public final class JAXRSUtils {
for (Field f : bri.getParameterFields()) {
Parameter p = ResourceUtils.getParameter(0, f.getAnnotations(),
f.getType());
- Object o = null;
+ final Object o;
if (p.getType() == ParameterType.BEAN) {
o = createBeanParamValue(message, f.getType(), ori);
@@ -1449,8 +1449,8 @@ public final class JAXRSUtils {
throws WebApplicationException, IOException {
OutputStream entityStream = message.getContent(OutputStream.class);
- if (entity.getClass().getName().equals(
-
"org.apache.cxf.jaxrs.reactivestreams.server.StreamingAsyncSubscriber$StreamingResponseImpl"))
{
+ if
("org.apache.cxf.jaxrs.reactivestreams.server.StreamingAsyncSubscriber$StreamingResponseImpl".equals(
+ entity.getClass().getName())) {
//cache the OutputStream when it's reactive response
entityStream = new CacheAndWriteOutputStream(entityStream);
}
@@ -1863,7 +1863,7 @@ public final class JAXRSUtils {
}
- List<String> values = null;
+ final List<String> values;
if (params.size() <= 1) {
values = Collections.emptyList();
} else {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
index 10119d7..fb53bd6 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ResourceUtils.java
@@ -566,7 +566,7 @@ public final class ResourceUtils {
}
public static URL getResourceURL(String loc, Bus bus) throws IOException {
- URL url = null;
+ URL url;
if (loc.startsWith(CLASSPATH_PREFIX)) {
String path = loc.substring(CLASSPATH_PREFIX.length());
url = ResourceUtils.getClasspathResourceURL(path,
ResourceUtils.class, bus);
diff --git
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
index 6a242bf..9b39062 100644
---
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
+++
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
@@ -1207,8 +1207,8 @@ public class JAXBElementProviderTest {
type, m.getGenericParameterTypes()[0],
new Annotation[0], MediaType.TEXT_XML_TYPE, new
MetadataMap<String, String>(), is);
assertNotNull(o);
- Book b1 = null;
- Book b2 = null;
+ final Book b1;
+ final Book b2;
if (type.isArray()) {
assertEquals(2, ((Book[])o).length);
b1 = ((Book[])o)[0];
@@ -1251,7 +1251,7 @@ public class JAXBElementProviderTest {
boolean isArray) throws Exception {
@SuppressWarnings("rawtypes")
JAXBElementProvider provider = new JAXBElementProvider();
- Method m = null;
+ final Method m;
if (!isArray) {
m = CollectionsResource.class.getMethod("setTags", new
Class[]{List.class});
} else {
@@ -1263,8 +1263,8 @@ public class JAXBElementProviderTest {
m.getParameterTypes()[0],
m.getGenericParameterTypes()[0],
new Annotation[0], MediaType.TEXT_XML_TYPE, new
MetadataMap<String, String>(), is);
assertNotNull(o);
- TagVO2 t1 = null;
- TagVO2 t2 = null;
+ final TagVO2 t1;
+ final TagVO2 t2;
if (!isArray) {
assertEquals(2, ((List<?>)o).size());
t1 = (TagVO2)((List<?>)o).get(0);
diff --git
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
index cb0435a..c9796ad 100644
---
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
+++
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
@@ -1489,7 +1489,7 @@ public class ProviderFactoryTest {
return null;
}
}
- public abstract static class BadParentExceptionMapper<T extends Throwable>
implements ExceptionMapper<T> {
+ public abstract static class BadParentExceptionMapper<T extends Throwable>
implements ExceptionMapper<T> { // NOPMD
}
public static class BadExceptionMapperA extends
BadParentExceptionMapper<RuntimeExceptionA> {
diff --git
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
index 9638f37..b040edf 100644
---
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
+++
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
@@ -564,7 +564,6 @@ public class JAXRSUtilsTest {
List<MediaType> methodMimeTypes = new ArrayList<>(
JAXRSUtils.parseMediaTypes("application/mytype,application/xml,application/json"));
- MediaType acceptContentType = MediaType.valueOf("application/json");
List <MediaType> candidateList =
JAXRSUtils.intersectMimeTypes(methodMimeTypes,
MediaType.valueOf("application/json"));
@@ -588,7 +587,7 @@ public class JAXRSUtilsTest {
//test accept wild card application/*
methodMimeTypes =
JAXRSUtils.parseMediaTypes("text/html,text/xml,application/xml");
- acceptContentType = MediaType.valueOf("text/*");
+ MediaType acceptContentType = MediaType.valueOf("text/*");
candidateList = JAXRSUtils.intersectMimeTypes(methodMimeTypes,
acceptContentType);
assertEquals(2, candidateList.size());
