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/02/27 16:20:13 UTC
[cxf] branch master updated: cxf-core: 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 46366e2 cxf-core: fix PMD rule: UnusedAssignment
46366e2 is described below
commit 46366e20613d4b17628d0309c5caa8e3af715391
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Sat Feb 27 19:19:29 2021 +0300
cxf-core: fix PMD rule: UnusedAssignment
---
.../org/apache/cxf/attachment/AttachmentSerializer.java | 2 +-
.../org/apache/cxf/attachment/ContentDisposition.java | 2 +-
.../org/apache/cxf/bus/blueprint/ConfigurerImpl.java | 10 ++++------
.../java/org/apache/cxf/bus/extension/Extension.java | 6 ++----
.../apache/cxf/bus/extension/ExtensionManagerImpl.java | 2 +-
.../apache/cxf/catalog/CatalogXmlSchemaURIResolver.java | 2 +-
.../main/java/org/apache/cxf/common/i18n/Message.java | 2 +-
.../main/java/org/apache/cxf/common/jaxb/JAXBUtils.java | 2 +-
.../java/org/apache/cxf/common/logging/LogUtils.java | 4 +---
.../apache/cxf/common/logging/RegexLoggingFilter.java | 6 +++---
.../java/org/apache/cxf/common/util/Base64Utility.java | 4 ++--
.../main/java/org/apache/cxf/common/util/Compiler.java | 5 ++---
.../java/org/apache/cxf/common/util/ProxyHelper.java | 2 +-
.../cxf/common/util/ReflectionInvokationHandler.java | 3 +--
.../apache/cxf/common/util/SpringClassUnwrapper.java | 3 +--
.../java/org/apache/cxf/common/util/URIParserUtil.java | 2 +-
.../configuration/jsse/MultiKeyPasswordKeyManager.java | 2 +-
.../cxf/configuration/jsse/TLSParameterJaxBUtils.java | 13 ++++++-------
.../main/java/org/apache/cxf/endpoint/EndpointImpl.java | 3 +--
.../cxf/feature/transform/XSLTOutInterceptor.java | 3 +--
.../main/java/org/apache/cxf/helpers/ServiceUtils.java | 2 +-
.../AbstractFaultChainInitiatorObserver.java | 2 +-
.../apache/cxf/interceptor/AnnotationInterceptors.java | 7 ++-----
.../main/java/org/apache/cxf/staxutils/StaxUtils.java | 2 --
.../org/apache/cxf/staxutils/W3CDOMStreamReader.java | 1 -
.../apache/cxf/transport/ChainInitiationObserver.java | 2 +-
.../apache/cxf/workqueue/AutomaticWorkQueueImpl.java | 10 +++++-----
.../apache/cxf/attachment/AttachmentSerializerTest.java | 6 +++---
.../cxf/bus/spring/BusApplicationContextTest.java | 17 +++++++----------
.../java/org/apache/cxf/resource/URIResolverTest.java | 6 ++----
.../java/org/apache/cxf/staxutils/StaxUtilsTest.java | 3 +--
.../apache/cxf/workqueue/AutomaticWorkQueueTest.java | 5 ++---
.../cxf/ws/security/tokenstore/EHCacheTokenStore.java | 1 -
33 files changed, 58 insertions(+), 84 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
index 5afbe77..9704e33 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
@@ -258,7 +258,7 @@ public class AttachmentSerializer {
writer.write("\r\n--");
writer.write(bodyBoundary);
- Map<String, List<String>> headers = null;
+ final Map<String, List<String>> headers;
Iterator<String> it = a.getHeaderNames();
if (it.hasNext()) {
headers = new LinkedHashMap<>();
diff --git a/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java b/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java
index af2ad51..94abed6 100644
--- a/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java
+++ b/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java
@@ -56,7 +56,7 @@ public class ContentDisposition {
String extendedFilename = null;
Matcher m = CD_HEADER_PARAMS_PATTERN.matcher(tempValue);
while (m.find()) {
- String paramName = null;
+ final String paramName;
String paramValue = "";
String groupValue = m.group().trim();
diff --git a/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java b/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
index d9636ca..37f82fe 100644
--- a/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
@@ -114,14 +114,12 @@ public class ConfigurerImpl implements Configurer {
}
if (container instanceof ExtendedBlueprintContainer) {
- ComponentMetadata cm = null;
try {
- cm = container.getComponentMetadata(bn);
+ final ComponentMetadata cm = container.getComponentMetadata(bn);
+ if (cm instanceof BeanMetadata) {
+ ((ExtendedBlueprintContainer)container).injectBeanInstance((BeanMetadata)cm, beanInstance);
+ }
} catch (NoSuchComponentException nsce) {
- cm = null;
- }
- if (cm instanceof BeanMetadata) {
- ((ExtendedBlueprintContainer)container).injectBeanInstance((BeanMetadata)cm, beanInstance);
}
}
}
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/Extension.java b/core/src/main/java/org/apache/cxf/bus/extension/Extension.java
index 878bca1..6081dd6 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/Extension.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/Extension.java
@@ -177,10 +177,8 @@ public class Extension {
} catch (Throwable nex) {
notFound = true;
if (!optional) {
- if (origEx != null) {
- ex = origEx;
- }
- throw new ExtensionException(new Message("PROBLEM_LOADING_EXTENSION_CLASS", LOG, name), ex);
+ throw new ExtensionException(new Message("PROBLEM_LOADING_EXTENSION_CLASS", LOG, name),
+ origEx != null ? origEx : ex);
}
}
}
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
index 53d1187..d4ce0be 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
@@ -184,7 +184,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
}
final void loadAndRegister(Extension e) {
- Class<?> cls = null;
+ Class<?> cls;
if (null != e.getInterfaceName() && !"".equals(e.getInterfaceName())) {
cls = e.loadInterface(loader);
} else {
diff --git a/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java b/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java
index 69f4f7a..15a3ce2 100644
--- a/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java
+++ b/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java
@@ -52,7 +52,7 @@ public class CatalogXmlSchemaURIResolver implements URIResolver {
}
public InputSource resolveEntity(String targetNamespace, String schemaLocation, String baseUri) {
- String resolvedSchemaLocation = null;
+ final String resolvedSchemaLocation;
OASISCatalogManager catalogResolver = OASISCatalogManager.getCatalogManager(bus);
try {
resolvedSchemaLocation = new OASISCatalogManagerHelper().resolve(catalogResolver,
diff --git a/core/src/main/java/org/apache/cxf/common/i18n/Message.java b/core/src/main/java/org/apache/cxf/common/i18n/Message.java
index 51dd9ce..d1a65c8 100644
--- a/core/src/main/java/org/apache/cxf/common/i18n/Message.java
+++ b/core/src/main/java/org/apache/cxf/common/i18n/Message.java
@@ -58,7 +58,7 @@ public class Message implements Serializable {
}
public String toString() {
- String fmt = null;
+ final String fmt;
try {
if (null == bundle) {
return code;
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index 920b096..f018e2a 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -700,7 +700,7 @@ public final class JAXBUtils {
public static SchemaCompiler createSchemaCompiler() throws JAXBException {
try {
Class<?> cls;
- Object sc = null;
+ Object sc;
try {
cls = Class.forName("com.sun.tools.xjc.api.XJC");
sc = cls.getMethod("createSchemaCompiler").invoke(null);
diff --git a/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java b/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
index 6198b86..599113b 100644
--- a/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
@@ -229,7 +229,6 @@ public final class LogUtils {
}
String bundleName = name;
try {
- Logger logger = null;
ResourceBundle b = null;
if (bundleName == null) {
//grab the bundle prior to the call to Logger.getLogger(...) so the
@@ -278,6 +277,7 @@ public final class LogUtils {
}
}
+ Logger logger;
try {
logger = Logger.getLogger(loggerName, bundleName); //NOPMD
} catch (IllegalArgumentException iae) {
@@ -285,8 +285,6 @@ public final class LogUtils {
logger = Logger.getLogger(loggerName); //NOPMD
} catch (MissingResourceException rex) {
logger = Logger.getLogger(loggerName); //NOPMD
- } finally {
- b = null;
}
return logger;
} finally {
diff --git a/core/src/main/java/org/apache/cxf/common/logging/RegexLoggingFilter.java b/core/src/main/java/org/apache/cxf/common/logging/RegexLoggingFilter.java
index 8f225ca..83178b9 100644
--- a/core/src/main/java/org/apache/cxf/common/logging/RegexLoggingFilter.java
+++ b/core/src/main/java/org/apache/cxf/common/logging/RegexLoggingFilter.java
@@ -28,9 +28,9 @@ public class RegexLoggingFilter {
public static final String DEFAULT_REPLACEMENT = "*****";
private static class ReplaceRegEx {
- private Pattern pattern;
- private int group = 1;
- private String replacement;
+ private final Pattern pattern;
+ private final int group;
+ private final String replacement;
ReplaceRegEx(String pattern, int group, String replacement) {
this.pattern = Pattern.compile(pattern);
diff --git a/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java b/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java
index ed1a1cc..043eba7 100644
--- a/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java
+++ b/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java
@@ -309,7 +309,7 @@ public final class Base64Utility {
out[windex++] = base64Table[(i << 4) & 0x3f];
if (!urlSafe) {
out[windex++] = PAD;
- out[windex++] = PAD;
+ out[windex] = PAD;
}
} else if (rest == 2) {
int i = ((id[rindex] & 0xff) << 8) + (id[rindex + 1] & 0xff);
@@ -317,7 +317,7 @@ public final class Base64Utility {
out[windex++] = base64Table[(i >> 4) & 0x3f];
out[windex++] = base64Table[(i << 2) & 0x3f];
if (!urlSafe) {
- out[windex++] = PAD;
+ out[windex] = PAD;
}
}
return out;
diff --git a/core/src/main/java/org/apache/cxf/common/util/Compiler.java b/core/src/main/java/org/apache/cxf/common/util/Compiler.java
index 7ddb7d0..9d0c819 100644
--- a/core/src/main/java/org/apache/cxf/common/util/Compiler.java
+++ b/core/src/main/java/org/apache/cxf/common/util/Compiler.java
@@ -272,10 +272,9 @@ public class Compiler {
}
public boolean internalCompile(String[] args, int sourceFileIndex) {
- Process p = null;
- String[] cmdArray = null;
File tmpFile = null;
try {
+ final String[] cmdArray;
if (isLongCommandLines(args) && sourceFileIndex >= 0) {
tmpFile = FileUtils.createTempFile("cxf-compiler", null);
try (PrintWriter out = new PrintWriter(new FileWriter(tmpFile))) {
@@ -316,7 +315,7 @@ public class Compiler {
}
}
- p = Runtime.getRuntime().exec(cmdArray);
+ final Process p = Runtime.getRuntime().exec(cmdArray);
if (p.getErrorStream() != null) {
StreamPrinter errorStreamPrinter = new StreamPrinter(p.getErrorStream(), "", System.out);
diff --git a/core/src/main/java/org/apache/cxf/common/util/ProxyHelper.java b/core/src/main/java/org/apache/cxf/common/util/ProxyHelper.java
index 0affeab..ddb5941 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ProxyHelper.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ProxyHelper.java
@@ -34,7 +34,7 @@ import org.apache.cxf.common.logging.LogUtils;
public class ProxyHelper {
static final ProxyHelper HELPER;
static {
- ProxyHelper theHelper = null;
+ ProxyHelper theHelper;
try {
theHelper = new CglibProxyHelper();
} catch (Throwable ex) {
diff --git a/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java b/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
index a7524b6..57c0eb5 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
@@ -48,7 +48,7 @@ public class ReflectionInvokationHandler implements InvocationHandler {
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
WrapReturn wr = method.getAnnotation(WrapReturn.class);
final Class<?> targetClass = target.getClass();
- Class<?>[] parameterTypes = getParameterTypes(method, args);
+ final Class<?>[] parameterTypes = getParameterTypes(method, args);
try {
Method m;
try {
@@ -83,7 +83,6 @@ public class ReflectionInvokationHandler implements InvocationHandler {
}
m = targetClass.getMethod(method.getName(), newParams);
args = newArgs;
- parameterTypes = newParams;
}
ReflectionUtil.setAccessible(m);
return wrapReturn(wr, m.invoke(target, args));
diff --git a/core/src/main/java/org/apache/cxf/common/util/SpringClassUnwrapper.java b/core/src/main/java/org/apache/cxf/common/util/SpringClassUnwrapper.java
index c5cceec..a196eb0 100644
--- a/core/src/main/java/org/apache/cxf/common/util/SpringClassUnwrapper.java
+++ b/core/src/main/java/org/apache/cxf/common/util/SpringClassUnwrapper.java
@@ -70,8 +70,7 @@ class SpringClassUnwrapper implements ClassUnwrapper {
try {
TargetSource targetSource = advised.getTargetSource();
- Object target = null;
-
+ final Object target;
try {
target = targetSource.getTarget();
} catch (BeanCreationException ex) {
diff --git a/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java b/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
index c5cde76..462896f 100644
--- a/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
+++ b/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
@@ -83,7 +83,7 @@ public final class URIParserUtil {
}
public static String normalize(final String uri) {
URL url = null;
- String result = null;
+ String result;
try {
url = new URL(uri);
result = escapeChars(url.toURI().normalize().toString().replace('\\', '/'));
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/MultiKeyPasswordKeyManager.java b/core/src/main/java/org/apache/cxf/configuration/jsse/MultiKeyPasswordKeyManager.java
index f507ffe..6a1aee5 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/MultiKeyPasswordKeyManager.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/MultiKeyPasswordKeyManager.java
@@ -52,7 +52,7 @@ public class MultiKeyPasswordKeyManager implements X509KeyManager {
};
}
public X509Certificate[] getCertificateChain(String alias) {
- Certificate[] chain = null;
+ final Certificate[] chain;
try {
chain = mKeyStore.getCertificateChain(alias);
} catch (KeyStoreException kse) {
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
index a729f25..bd16aa4 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
@@ -115,7 +115,7 @@ public final class TLSParameterJaxBUtils {
if (kst == null) {
return null;
}
- String type = null;
+ final String type;
if (trustStore) {
type = SSLUtils.getTrustStoreType(kst.isSetType()
? kst.getType() : null, LOG, KeyStore.getDefaultType());
@@ -128,7 +128,7 @@ public final class TLSParameterJaxBUtils {
? deobfuscate(kst.getPassword())
: null;
if (password == null) {
- String tmp = null;
+ final String tmp;
if (trustStore) {
tmp = SSLUtils.getTruststorePassword(null, LOG);
} else {
@@ -138,7 +138,7 @@ public final class TLSParameterJaxBUtils {
password = tmp.toCharArray();
}
}
- String provider = null;
+ final String provider;
if (trustStore) {
provider = SSLUtils.getTruststoreProvider(kst.isSetProvider() ? kst.getProvider() : null, LOG);
} else {
@@ -164,7 +164,7 @@ public final class TLSParameterJaxBUtils {
} else if (kst.isSetUrl()) {
keyStore.load(new URL(kst.getUrl()).openStream(), password);
} else {
- String loc = null;
+ final String loc;
if (trustStore) {
loc = SSLUtils.getTruststore(null, LOG);
} else {
@@ -357,10 +357,9 @@ public final class TLSParameterJaxBUtils {
if (callbackHandlerClass == null) {
return null;
}
- CallbackHandler ch = null;
try {
- ch = (CallbackHandler)ClassLoaderUtils.loadClass(callbackHandlerClass, TLSParameterJaxBUtils.class)
- .newInstance();
+ final CallbackHandler ch = (CallbackHandler) ClassLoaderUtils
+ .loadClass(callbackHandlerClass, TLSParameterJaxBUtils.class).newInstance();
String prompt = kmc.getKeyStore().getFile();
if (prompt == null) {
prompt = kmc.getKeyStore().getResource();
diff --git a/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java b/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
index 2e8d3ee..340211b 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
@@ -130,9 +130,8 @@ public class EndpointImpl extends AbstractAttributedInterceptorProvider implemen
final void createBinding(BindingInfo bi) throws EndpointException {
if (null != bi) {
String namespace = bi.getBindingId();
- BindingFactory bf = null;
try {
- bf = bus.getExtension(BindingFactoryManager.class).getBindingFactory(namespace);
+ final BindingFactory bf = bus.getExtension(BindingFactoryManager.class).getBindingFactory(namespace);
if (null == bf) {
Message msg = new Message("NO_BINDING_FACTORY", BUNDLE, namespace);
throw new EndpointException(msg);
diff --git a/core/src/main/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java b/core/src/main/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java
index 43b19e3..53605cc 100644
--- a/core/src/main/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java
@@ -192,9 +192,8 @@ public class XSLTOutInterceptor extends AbstractXSLTInterceptor {
@Override
protected void doClose() {
- Reader transformedReader = null;
try {
- transformedReader = XSLTUtils.transform(xsltTemplate, getReader());
+ final Reader transformedReader = XSLTUtils.transform(xsltTemplate, getReader());
IOUtils.copyAndCloseInput(transformedReader, origWriter, IOUtils.DEFAULT_BUFFER_SIZE);
} catch (IOException e) {
throw new Fault("READER_COPY", LOG, e, e.getMessage());
diff --git a/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java b/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
index 01d123e..4abd6a3 100644
--- a/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
@@ -247,7 +247,7 @@ public final class ServiceUtils {
*/
public static String makePackageName(String namespace) {
- String hostname = null;
+ String hostname;
String path = "";
// get the target namespace of the document
diff --git a/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java b/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
index 670b73e..70d5ae0 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
@@ -64,7 +64,7 @@ public abstract class AbstractFaultChainInitiatorObserver implements MessageObse
Exchange exchange = message.getExchange();
- Message faultMessage = null;
+ Message faultMessage;
// now that we have switched over to the fault chain,
// prevent any further operations on the in/out message
diff --git a/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java b/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java
index b1d293b..8cc757e 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java
@@ -96,9 +96,8 @@ public class AnnotationInterceptors {
}
private <T> T initializeAnnotationObject(String annObjectName, Class<T> type) {
- Object object = null;
try {
- object = ClassLoaderUtils.loadClass(annObjectName, this.getClass()).newInstance();
+ final Object object = ClassLoaderUtils.loadClass(annObjectName, this.getClass()).newInstance();
return type.cast(object);
} catch (Throwable e) {
throw new Fault(new org.apache.cxf.common.i18n.Message(
@@ -107,10 +106,8 @@ public class AnnotationInterceptors {
}
}
private <T> T initializeAnnotationObject(Class<T> type) {
- Object object = null;
try {
- object = type.newInstance();
- return type.cast(object);
+ return type.cast(type.newInstance());
} catch (Throwable e) {
throw new Fault(new org.apache.cxf.common.i18n.Message(
"COULD_NOT_CREATE_ANNOTATION_OBJECT",
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
index 821a61a..440968c 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
@@ -200,7 +200,6 @@ public final class StaxUtils {
}
} catch (Throwable t) {
//ignore, can always drop down to the pooled factories
- xif = null;
}
SAFE_INPUT_FACTORY = xif;
@@ -304,7 +303,6 @@ public final class StaxUtils {
if (LOG.isLoggable(Level.FINE)) {
LOG.log(Level.FINE, "XMLInputFactory.newInstance() failed with: ", t);
}
- factory = null;
}
if (factory == null || !setRestrictionProperties(factory)) {
try {
diff --git a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
index aafe755..03b1992 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
@@ -289,7 +289,6 @@ public class W3CDOMStreamReader extends AbstractDOMStreamReader<Node, Node> {
schemaType = attr.getSchemaTypeInfo();
} catch (Throwable t) {
//DOM level 2?
- schemaType = null;
}
return (schemaType == null) ? "CDATA"
: schemaType.getTypeName() == null ? "CDATA" : schemaType.getTypeName();
diff --git a/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java b/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
index fd6c34f..a4b8aa3 100644
--- a/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
+++ b/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
@@ -67,7 +67,7 @@ public class ChainInitiationObserver implements MessageObserver {
if (loader != null) {
origLoader = ClassLoaderUtils.setThreadContextClassloader(loader);
}
- InterceptorChain phaseChain = null;
+ InterceptorChain phaseChain;
if (m.getInterceptorChain() != null) {
phaseChain = m.getInterceptorChain();
diff --git a/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java b/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
index e59e7ff..bff113e 100644
--- a/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
+++ b/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
@@ -174,10 +174,10 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
if (LOG.isLoggable(Level.FINE)) {
StringBuilder buf = new StringBuilder(128).append("Constructing automatic work queue with:\n")
- .append("max queue size: ").append(maxQueueSize).append("\n")
- .append("initialThreads: ").append(initialThreads).append("\n")
- .append("lowWaterMark: ").append(lowWaterMark).append("\n")
- .append("highWaterMark: ").append(highWaterMark).append("\n");
+ .append("max queue size: ").append(maxQueueSize).append('\n')
+ .append("initialThreads: ").append(initialThreads).append('\n')
+ .append("lowWaterMark: ").append(lowWaterMark).append('\n')
+ .append("highWaterMark: ").append(highWaterMark).append('\n');
LOG.fine(buf.toString());
}
@@ -200,7 +200,7 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
executor.setCorePoolSize(lowWaterMark);
}
- ReentrantLock l = null;
+ ReentrantLock l;
try {
Field f = ThreadPoolExecutor.class.getDeclaredField("mainLock");
ReflectionUtil.setAccessible(f);
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
index 6d202d7..dcdfe72 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
@@ -82,9 +82,9 @@ public class AttachmentSerializerTest {
// Set the SOAP content type
msg.put(Message.CONTENT_TYPE, soapContentType);
- String soapCtType = null;
- String soapCtParams = null;
- String soapCtParamsEscaped = null;
+ final String soapCtType;
+ final String soapCtParams;
+ final String soapCtParamsEscaped;
int p = soapContentType.indexOf(';');
if (p != -1) {
soapCtParams = soapContentType.substring(p);
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
index 52813af..9b407f2 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
@@ -30,21 +30,18 @@ public class BusApplicationContextTest {
@Test
public void testGetResources() {
- BusApplicationContext ctx = null;
-
- try {
- ctx = new BusApplicationContext("nowhere.xml", false);
+ try (BusApplicationContext ctx = new BusApplicationContext("nowhere.xml", false)) {
fail("Bus creation should have thrown exception.");
} catch (BeansException bex) {
//Expected
}
String cfgFile = "/org/apache/cxf/bus/spring/resources/bus-overwrite.xml";
- ctx = new BusApplicationContext(cfgFile, false);
- assertEquals("Unexpected number of resources", 1, ctx.getConfigResources().length);
- ctx.close();
- ctx = new BusApplicationContext(cfgFile, true);
- assertEquals("Unexpected number of resources", 2, ctx.getConfigResources().length);
- ctx.close();
+ try (BusApplicationContext ctx = new BusApplicationContext(cfgFile, false)) {
+ assertEquals("Unexpected number of resources", 1, ctx.getConfigResources().length);
+ }
+ try (BusApplicationContext ctx = new BusApplicationContext(cfgFile, true)) {
+ assertEquals("Unexpected number of resources", 2, ctx.getConfigResources().length);
+ }
}
}
\ No newline at end of file
diff --git a/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java b/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
index 13f4ee8..b6bb066 100644
--- a/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
+++ b/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
@@ -44,15 +44,13 @@ public class URIResolverTest {
public void testJARProtocol() throws Exception {
uriResolver = new URIResolver();
- byte[] barray = new byte[]{0};
- byte[] barray2 = new byte[]{1};
String uriStr = "jar:" + resourceURL.toString() + "!/wsdl/hello_world.wsdl";
// Check standard Java API's work with "jar:"
URL jarURL = new URL(uriStr);
InputStream is = jarURL.openStream();
assertNotNull(is);
- barray = new byte[is.available()];
+ byte[] barray = new byte[is.available()];
is.read(barray);
is.close();
@@ -60,7 +58,7 @@ public class URIResolverTest {
InputStream is2 = uriResolver.getInputStream();
assertNotNull(is2);
- barray2 = new byte[is2.available()];
+ byte[] barray2 = new byte[is2.available()];
is2.read(barray2);
is2.close();
assertEquals(IOUtils.newStringFromBytes(barray), IOUtils.newStringFromBytes(barray2));
diff --git a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
index 8bd4922..1e97337 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
@@ -349,9 +349,8 @@ public class StaxUtilsTest {
@Test
public void testDefaultPrefixInRootElementWithJDKInternalCopyTransformer() throws Exception {
- TransformerFactory trf = null;
try {
- trf = TransformerFactory
+ final TransformerFactory trf = TransformerFactory
.newInstance("com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl", null);
trf.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
diff --git a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
index 79060ce..f9c3af3 100644
--- a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
+++ b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
@@ -95,7 +95,7 @@ public class AutomaticWorkQueueTest {
int x = 0;
try {
synchronized (lock) {
- for (x = 0; x < 6; x++) {
+ for (; x < 6; x++) {
workqueue.execute(new Runnable() {
public void run() {
synchronized (lock) {
@@ -385,10 +385,9 @@ public class AutomaticWorkQueueTest {
private static void checkCompleted(DeadLockThread dead) throws InterruptedException {
int oldCompleted = 0;
- int newCompleted = 0;
int noProgressCount = 0;
while (!dead.isFinished()) {
- newCompleted = dead.getWorkItemCompletedCount();
+ int newCompleted = dead.getWorkItemCompletedCount();
if (newCompleted > oldCompleted) {
oldCompleted = newCompleted;
noProgressCount = 0;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
index 66d77bd..1ddac82 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
@@ -94,7 +94,6 @@ public class EHCacheTokenStore implements TokenStore, Closeable, BusLifeCycleLis
}
}
- @SuppressWarnings("unchecked")
public Collection<String> getTokenIdentifiers() {
if (cache == null) {
return null;