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 2019/07/11 11:32:05 UTC
[cxf] branch master updated: cxf-core: fix some new PMD warnings
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 ca147d9 cxf-core: fix some new PMD warnings
ca147d9 is described below
commit ca147d9ab196652532a6aa9c961fc8a5c490285c
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Thu Jul 11 13:24:17 2019 +0300
cxf-core: fix some new PMD warnings
---
.../apache/cxf/bus/blueprint/ConfigurerImpl.java | 11 +--
.../cxf/bus/extension/ExtensionManagerImpl.java | 18 +----
.../BusApplicationContextResourceResolver.java | 3 +-
.../apache/cxf/bus/spring/BusDefinitionParser.java | 3 +-
.../cxf/bus/spring/BusExtensionPostProcessor.java | 5 +-
.../spring/BusWiringBeanFactoryPostProcessor.java | 3 +-
...ontrolledValidationXmlBeanDefinitionReader.java | 6 +-
.../cxf/bus/spring/Jsr250BeanPostProcessor.java | 9 +--
.../java/org/apache/cxf/bus/spring/SpringBus.java | 3 +-
.../java/org/apache/cxf/common/jaxb/JAXBUtils.java | 14 ++--
.../common/logging/AbstractDelegatingLogger.java | 6 +-
.../org/apache/cxf/common/logging/Log4jLogger.java | 6 +-
.../apache/cxf/configuration/jsse/SSLUtils.java | 91 ++++++++--------------
.../spring/AbstractBeanDefinitionParser.java | 4 +-
.../cxf/configuration/spring/ConfigurerImpl.java | 11 +--
.../cxf/databinding/stax/StaxDataBinding.java | 2 +-
.../cxf/feature/transform/XSLTInInterceptor.java | 26 ++-----
.../apache/cxf/feature/transform/XSLTUtils.java | 35 +--------
.../java/org/apache/cxf/helpers/FileUtils.java | 21 +----
.../main/java/org/apache/cxf/helpers/IOUtils.java | 39 ++++------
.../interceptor/AbstractLoggingInterceptor.java | 19 ++---
.../cxf/interceptor/FaultOutInterceptor.java | 2 +-
.../cxf/interceptor/LoggingInInterceptor.java | 4 +-
.../cxf/interceptor/LoggingOutInterceptor.java | 2 +-
.../cxf/interceptor/MessageSenderInterceptor.java | 2 +-
.../interceptor/OneWayProcessorInterceptor.java | 2 +-
.../cxf/interceptor/StaxInEndingInterceptor.java | 2 +-
.../apache/cxf/interceptor/StaxInInterceptor.java | 5 +-
.../cxf/interceptor/StaxOutEndingInterceptor.java | 2 +-
.../apache/cxf/interceptor/StaxOutInterceptor.java | 5 +-
.../security/AbstractAuthorizingInInterceptor.java | 3 +-
.../AbstractSecurityContextInInterceptor.java | 3 +-
.../DelegatingAuthenticationInterceptor.java | 3 +-
.../interceptor/security/JAASLoginInterceptor.java | 3 +-
.../OperationInfoAuthorizingInterceptor.java | 3 +-
.../service/factory/SimpleMethodDispatcher.java | 6 +-
.../service/invoker/spring/SpringBeanFactory.java | 5 +-
.../cxf/staxutils/AbstractDOMStreamReader.java | 2 +-
.../cxf/staxutils/CachingXmlEventWriter.java | 2 +-
.../cxf/staxutils/DelegatingXMLStreamWriter.java | 2 +-
.../apache/cxf/staxutils/DepthXMLStreamReader.java | 5 +-
.../cxf/staxutils/PrettyPrintXMLStreamWriter.java | 2 +-
.../apache/cxf/staxutils/W3CDOMStreamWriter.java | 4 +-
.../cxf/staxutils/transform/InTransformReader.java | 2 +-
.../StaxSchemaValidationInInterceptor.java | 2 +-
.../StaxSchemaValidationOutInterceptor.java | 2 +-
.../transport/common/gzip/GZIPInInterceptor.java | 2 +-
.../transport/common/gzip/GZIPOutInterceptor.java | 4 +-
.../validation/AbstractValidationInterceptor.java | 3 +-
.../apache/cxf/bus/extension/ExtensionTest.java | 2 +-
.../cxf/bus/spring/SpringBusFactoryTest.java | 5 +-
.../apache/cxf/common/logging/LogUtilsTest.java | 2 +-
.../apache/cxf/common/util/ClassHelperTest.java | 2 +-
.../AbstractEndpointSelectionInterceptor.java | 3 +-
.../wsdl/interceptors/WrappedOutInterceptor.java | 2 +-
55 files changed, 151 insertions(+), 284 deletions(-)
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 009a385..7466180 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
@@ -79,18 +79,15 @@ public class ConfigurerImpl implements Configurer {
ComponentMetadata cmd = container.getComponentMetadata(s);
Class<?> cls = BlueprintBeanLocator.getClassForMetaData(container, cmd);
if (cls != null) {
- String orig = s;
- if (s.charAt(0) == '*') {
- //old wildcard
- s = "." + s.replaceAll("\\.", "\\.");
- }
- Matcher matcher = Pattern.compile(s).matcher("");
+ final String cid = s.charAt(0) != '*' ? s
+ : "." + s.replaceAll("\\.", "\\."); //old wildcard
+ Matcher matcher = Pattern.compile(cid).matcher("");
List<MatcherHolder> m = wildCardBeanDefinitions.get(cls.getName());
if (m == null) {
m = new ArrayList<>();
wildCardBeanDefinitions.put(cls.getName(), m);
}
- MatcherHolder holder = new MatcherHolder(orig, matcher);
+ MatcherHolder holder = new MatcherHolder(s, matcher);
m.add(holder);
}
}
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 b80cc23..53d1187 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
@@ -162,17 +162,11 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
while (urls.hasMoreElements()) {
final URL url = urls.nextElement();
- InputStream is;
- try {
- is = AccessController.doPrivileged(new PrivilegedExceptionAction<InputStream>() {
+ try (InputStream is = AccessController.doPrivileged(new PrivilegedExceptionAction<InputStream>() {
public InputStream run() throws Exception {
return url.openStream();
}
- });
- } catch (PrivilegedActionException pae) {
- throw (IOException)pae.getException();
- }
- try {
+ })) {
List<Extension> exts = new TextExtensionFragmentParser(loader).getExtensions(is);
for (Extension e : exts) {
if (loader != l) {
@@ -183,12 +177,8 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
ordered.add(e);
}
}
- } finally {
- try {
- is.close();
- } catch (IOException ex) {
- //ignore
- }
+ } catch (PrivilegedActionException pae) {
+ throw (IOException)pae.getException();
}
}
}
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
index 54cbbfd..8f31680 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
@@ -24,7 +24,6 @@ import java.net.URL;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.resource.ResourceResolver;
-import org.springframework.beans.BeansException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -96,7 +95,7 @@ public class BusApplicationContextResourceResolver
}
- public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+ public void setApplicationContext(ApplicationContext applicationContext) {
context = applicationContext;
}
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java b/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
index beebcc7..0bb1646 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
@@ -36,7 +36,6 @@ import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
-import org.springframework.beans.BeansException;
import org.springframework.beans.PropertyValue;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
@@ -194,7 +193,7 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser {
bus = bb;
}
- public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+ public void setApplicationContext(ApplicationContext applicationContext) {
if (bus != null) {
return;
}
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java b/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java
index a018217..cc0dc69 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java
@@ -22,7 +22,6 @@ package org.apache.cxf.bus.spring;
import org.apache.cxf.Bus;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.extension.BusExtension;
-import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -43,11 +42,11 @@ public class BusExtensionPostProcessor implements BeanPostProcessor, Application
}
- public Object postProcessAfterInitialization(Object bean, String beanId) throws BeansException {
+ public Object postProcessAfterInitialization(Object bean, String beanId) {
return bean;
}
- public Object postProcessBeforeInitialization(Object bean, String beanId) throws BeansException {
+ public Object postProcessBeforeInitialization(Object bean, String beanId) {
if (bean instanceof BusExtension && null != getBus()) {
Class<? extends Object> cls = ((BusExtension)bean).getRegistrationType();
registerExt(bean, cls);
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java b/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java
index a0ff4cc..5853800 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java
@@ -27,7 +27,6 @@ import org.apache.cxf.Bus;
import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
import org.apache.cxf.configuration.spring.BusWiringType;
import org.apache.cxf.helpers.CastUtils;
-import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
@@ -91,7 +90,7 @@ public class BusWiringBeanFactoryPostProcessor implements BeanFactoryPostProcess
return new RuntimeBeanReference(name);
}
- public void postProcessBeanFactory(ConfigurableListableBeanFactory factory) throws BeansException {
+ public void postProcessBeanFactory(ConfigurableListableBeanFactory factory) {
Object inject = bus;
if (inject == null) {
inject = getBusForName(Bus.DEFAULT_BUS_ID, factory, true, null);
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java b/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java
index 9813b62..086dca5 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java
@@ -93,8 +93,7 @@ public class ControlledValidationXmlBeanDefinitionReader extends XmlBeanDefiniti
}
@Override
- protected int doLoadBeanDefinitions(InputSource inputSource,
- Resource resource) throws BeanDefinitionStoreException {
+ protected int doLoadBeanDefinitions(InputSource inputSource, Resource resource) {
// sadly, the Spring class we are extending has the critical function
// getValidationModeForResource
// marked private instead of protected, so trickery is called for here.
@@ -124,8 +123,7 @@ public class ControlledValidationXmlBeanDefinitionReader extends XmlBeanDefiniti
}
@Override
- public int loadBeanDefinitions(final EncodedResource encodedResource)
- throws BeanDefinitionStoreException {
+ public int loadBeanDefinitions(final EncodedResource encodedResource) {
if (!noFastinfoset) {
try {
return fastInfosetLoadBeanDefinitions(encodedResource);
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java b/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
index 2ad66d7..9aca9b7 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
@@ -24,7 +24,6 @@ package org.apache.cxf.bus.spring;
import org.apache.cxf.Bus;
import org.apache.cxf.common.injection.ResourceInjector;
import org.apache.cxf.resource.ResourceManager;
-import org.springframework.beans.BeansException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
import org.springframework.context.ApplicationContext;
@@ -44,8 +43,8 @@ public class Jsr250BeanPostProcessor
Jsr250BeanPostProcessor() {
}
- public void setApplicationContext(ApplicationContext arg0) throws BeansException {
- context = arg0;
+ public void setApplicationContext(ApplicationContext applicationContext) {
+ context = applicationContext;
try {
Class<?> cls = Class
.forName("org.springframework.context.annotation.CommonAnnotationBeanPostProcessor");
@@ -103,7 +102,7 @@ public class Jsr250BeanPostProcessor
}
return resourceManager;
}
- public Object postProcessAfterInitialization(Object bean, String beanId) throws BeansException {
+ public Object postProcessAfterInitialization(Object bean, String beanId) {
if (!isProcessing) {
if (resourceManager == null && bean instanceof ResourceManager) {
resourceManager = (ResourceManager)bean;
@@ -118,7 +117,7 @@ public class Jsr250BeanPostProcessor
return bean;
}
- public Object postProcessBeforeInitialization(Object bean, String beanId) throws BeansException {
+ public Object postProcessBeforeInitialization(Object bean, String beanId) {
if (!isProcessing) {
return bean;
}
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java b/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java
index d715428..af3b95d 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java
@@ -24,7 +24,6 @@ import org.apache.cxf.configuration.ConfiguredBeanLocator;
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.configuration.spring.ConfigurerImpl;
import org.apache.cxf.resource.ResourceManager;
-import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ApplicationEvent;
@@ -50,7 +49,7 @@ public class SpringBus extends ExtensionManagerBus
}
/** {@inheritDoc}*/
- public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+ public void setApplicationContext(ApplicationContext applicationContext) {
ctx = (AbstractApplicationContext)applicationContext;
@SuppressWarnings("rawtypes")
ApplicationListener listener = new ApplicationListener() {
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 3201197..c0a14c2 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
@@ -897,9 +897,8 @@ public final class JAXBUtils {
}
for (Map.Entry<String, InputStream> entry : packages.entrySet()) {
if (entry.getValue() != null) {
- BufferedReader reader = null;
- try {
- reader = new BufferedReader(new InputStreamReader(entry.getValue(), StandardCharsets.UTF_8));
+ try (BufferedReader reader = new BufferedReader(
+ new InputStreamReader(entry.getValue(), StandardCharsets.UTF_8))) {
String pkg = entry.getKey();
ClassLoader loader = packageLoaders.get(pkg);
if (!StringUtils.isEmpty(pkg)) {
@@ -922,15 +921,12 @@ public final class JAXBUtils {
}
line = reader.readLine();
}
- } catch (Exception e) {
+ } catch (IOException e) {
// ignore
} finally {
try {
- if (reader != null) {
- reader.close();
- entry.getValue().close();
- }
- } catch (Exception e) {
+ entry.getValue().close();
+ } catch (IOException e) {
// ignore
}
}
diff --git a/core/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java b/core/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
index 5d2aef1..aa114c7 100644
--- a/core/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
+++ b/core/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
@@ -268,7 +268,7 @@ public abstract class AbstractDelegatingLogger extends Logger {
}
}
- public void setLevel(Level newLevel) throws SecurityException {
+ public void setLevel(Level newLevel) {
throw new UnsupportedOperationException();
}
@@ -283,7 +283,7 @@ public abstract class AbstractDelegatingLogger extends Logger {
return false;
}
- public synchronized void addHandler(Handler handler) throws SecurityException {
+ public synchronized void addHandler(Handler handler) {
if (supportsHandlers()) {
super.addHandler(handler);
return;
@@ -291,7 +291,7 @@ public abstract class AbstractDelegatingLogger extends Logger {
throw new UnsupportedOperationException();
}
- public synchronized void removeHandler(Handler handler) throws SecurityException {
+ public synchronized void removeHandler(Handler handler) {
if (supportsHandlers()) {
super.removeHandler(handler);
return;
diff --git a/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java b/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
index cf47b7a..29a330e 100644
--- a/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
+++ b/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
@@ -84,14 +84,14 @@ public class Log4jLogger extends AbstractDelegatingLogger {
return null;
}
- public void setLevel(Level newLevel) throws SecurityException {
+ public void setLevel(Level newLevel) {
log.setLevel(TO_LOG4J.get(newLevel));
}
- public synchronized void addHandler(Handler handler) throws SecurityException {
+ public synchronized void addHandler(Handler handler) {
log.addAppender(new HandlerWrapper(handler));
}
- public synchronized void removeHandler(Handler handler) throws SecurityException {
+ public synchronized void removeHandler(Handler handler) {
log.removeAppender("HandlerWrapper-" + handler.hashCode());
}
public synchronized Handler[] getHandlers() {
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
index 4fff623..96f8e6e 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
@@ -103,41 +103,27 @@ public final class SSLUtils {
String keyStorePassword = getKeystorePassword(null, log);
String keyPassword = getKeyPassword(null, log);
String keyStoreType = getKeystoreType(null, log);
- InputStream is = null;
- try {
- if (location != null) {
- File file = new File(location);
- if (FileUtils.exists(file)) {
- is = Files.newInputStream(file.toPath());
- } else {
- is = getResourceAsStream(location);
+ if (location != null) {
+ File file = new File(location);
+ try (InputStream is = FileUtils.exists(file) ? Files.newInputStream(file.toPath())
+ : getResourceAsStream(location)) {
+ if (is != null) {
+ KeyManagerFactory kmf =
+ KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+ KeyStore ks = KeyStore.getInstance(keyStoreType != null ? keyStoreType : KeyStore.getDefaultType());
+ ks.load(is, (keyStorePassword != null) ? keyStorePassword.toCharArray() : null);
+ kmf.init(ks, (keyPassword != null) ? keyPassword.toCharArray() : null);
+ defaultManagers = kmf.getKeyManagers();
}
- }
-
- if (is != null) {
- KeyManagerFactory kmf =
- KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
- KeyStore ks = KeyStore.getInstance(keyStoreType != null ? keyStoreType : KeyStore.getDefaultType());
-
- ks.load(is, (keyStorePassword != null) ? keyStorePassword.toCharArray() : null);
- kmf.init(ks, (keyPassword != null) ? keyPassword.toCharArray() : null);
- defaultManagers = kmf.getKeyManagers();
- } else {
- log.log(Level.FINER, "No default keystore {0}", location);
+ } catch (Exception e) {
+ log.log(Level.WARNING, "Default key managers cannot be initialized: " + e.getMessage(), e);
defaultManagers = new KeyManager[0];
}
- } catch (Exception e) {
- log.log(Level.WARNING, "Default key managers cannot be initialized: " + e.getMessage(), e);
+ }
+ if (null == defaultManagers) {
+ log.log(Level.FINER, "No default keystore {0}", location);
defaultManagers = new KeyManager[0];
- } finally {
- if (is != null) {
- try {
- is.close();
- } catch (IOException e) {
- log.warning("Keystore stream cannot be closed: " + e.getMessage());
- }
- }
}
}
@@ -148,41 +134,26 @@ public final class SSLUtils {
String location = getTruststore(null, log);
String trustStorePassword = getTruststorePassword(null, log);
String trustStoreType = getTrustStoreType(null, log, DEFAULT_TRUST_STORE_TYPE);
- InputStream is = null;
- try {
- if (location != null) {
- File file = new File(location);
- if (FileUtils.exists(file)) {
- is = Files.newInputStream(file.toPath());
+ if (location != null) {
+ File file = new File(location);
+ try (InputStream is = FileUtils.exists(file) ? Files.newInputStream(file.toPath())
+ : getResourceAsStream(location)) {
+ if (is != null) {
+ TrustManagerFactory tmf =
+ TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+ KeyStore ks = KeyStore.getInstance(trustStoreType);
+
+ ks.load(is, (trustStorePassword != null) ? trustStorePassword.toCharArray() : null);
+ tmf.init(ks);
+ return tmf.getTrustManagers();
} else {
- is = getResourceAsStream(location);
- }
- }
-
- if (is != null) {
- TrustManagerFactory tmf =
- TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
- KeyStore ks = KeyStore.getInstance(trustStoreType);
-
- ks.load(is, (trustStorePassword != null) ? trustStorePassword.toCharArray() : null);
- tmf.init(ks);
- return tmf.getTrustManagers();
- } else {
- log.log(Level.FINER, "No default trust keystore {0}", location);
- }
- } catch (Exception e) {
- log.log(Level.WARNING, "Default trust managers cannot be initialized: " + e.getMessage(), e);
- } finally {
- if (is != null) {
- try {
- is.close();
- } catch (IOException e) {
- log.warning("Keystore stream cannot be closed: " + e.getMessage());
+ log.log(Level.FINER, "No default trust keystore {0}", location);
}
+ } catch (Exception e) {
+ log.log(Level.WARNING, "Default trust managers cannot be initialized: " + e.getMessage(), e);
}
}
-
return null;
}
diff --git a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java b/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
index 28bbfb2..4fc5921 100644
--- a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
@@ -46,7 +46,6 @@ import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.staxutils.StaxUtils;
-import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
@@ -179,8 +178,7 @@ public abstract class AbstractBeanDefinitionParser
}
@Override
- protected String resolveId(Element elem, AbstractBeanDefinition definition,
- ParserContext ctx) throws BeanDefinitionStoreException {
+ protected String resolveId(Element elem, AbstractBeanDefinition definition, ParserContext ctx) {
// REVISIT: use getAttributeNS instead
diff --git a/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java b/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
index 17b80ff..d4ba94d 100644
--- a/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
+++ b/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
@@ -101,19 +101,16 @@ public class ConfigurerImpl extends BeanConfigurerSupport
BeanDefinition bd = bdr.getBeanDefinition(n);
String className = bd.getBeanClassName();
if (null != className) {
- String orig = n;
- if (n.charAt(0) == '*') {
- //old wildcard
- n = "." + n.replaceAll("\\.", "\\.");
- }
+ final String name = n.charAt(0) != '*' ? n
+ : "." + n.replaceAll("\\.", "\\."); //old wildcard
try {
- Matcher matcher = Pattern.compile(n).matcher("");
+ Matcher matcher = Pattern.compile(name).matcher("");
List<MatcherHolder> m = wildCardBeanDefinitions.get(className);
if (m == null) {
m = new ArrayList<>();
wildCardBeanDefinitions.put(className, m);
}
- MatcherHolder holder = new MatcherHolder(orig, matcher);
+ MatcherHolder holder = new MatcherHolder(n, matcher);
m.add(holder);
} catch (PatternSyntaxException npe) {
//not a valid patter, we'll ignore
diff --git a/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java b/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java
index a78b691..40b8b7b 100644
--- a/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java
+++ b/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java
@@ -76,7 +76,7 @@ public class StaxDataBinding extends AbstractInterceptorProvidingDataBinding {
addBefore(StaxInEndingInterceptor.class.getName());
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
message.getInterceptorChain().remove(StaxInEndingInterceptor.INSTANCE);
}
}
diff --git a/core/src/main/java/org/apache/cxf/feature/transform/XSLTInInterceptor.java b/core/src/main/java/org/apache/cxf/feature/transform/XSLTInInterceptor.java
index 7e23d31..5e98493 100644
--- a/core/src/main/java/org/apache/cxf/feature/transform/XSLTInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/feature/transform/XSLTInInterceptor.java
@@ -102,28 +102,18 @@ public class XSLTInInterceptor extends AbstractXSLTInterceptor {
}
protected void transformIS(Message message, InputStream is) {
- try {
- InputStream transformedIS = XSLTUtils.transform(getXSLTTemplate(), is);
- message.setContent(InputStream.class, transformedIS);
- } finally {
- try {
- is.close();
- } catch (IOException e) {
- LOG.warning("Cannot close stream after transformation: " + e.getMessage());
- }
+ try (InputStream inputStream = is) {
+ message.setContent(InputStream.class, XSLTUtils.transform(getXSLTTemplate(), inputStream));
+ } catch (IOException e) {
+ LOG.warning("Cannot close stream after transformation: " + e.getMessage());
}
}
protected void transformReader(Message message, Reader reader) {
- try {
- Reader transformedReader = XSLTUtils.transform(getXSLTTemplate(), reader);
- message.setContent(Reader.class, transformedReader);
- } finally {
- try {
- reader.close();
- } catch (IOException e) {
- LOG.warning("Cannot close stream after transformation: " + e.getMessage());
- }
+ try (Reader r = reader) {
+ message.setContent(Reader.class, XSLTUtils.transform(getXSLTTemplate(), r));
+ } catch (IOException e) {
+ LOG.warning("Cannot close stream after transformation: " + e.getMessage());
}
}
}
diff --git a/core/src/main/java/org/apache/cxf/feature/transform/XSLTUtils.java b/core/src/main/java/org/apache/cxf/feature/transform/XSLTUtils.java
index ac37c97..4b35b2f 100644
--- a/core/src/main/java/org/apache/cxf/feature/transform/XSLTUtils.java
+++ b/core/src/main/java/org/apache/cxf/feature/transform/XSLTUtils.java
@@ -24,7 +24,6 @@ import java.io.InputStream;
import java.io.Reader;
import java.util.logging.Logger;
-import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.Source;
import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
@@ -51,10 +50,8 @@ public final class XSLTUtils {
}
public static InputStream transform(Templates xsltTemplate, InputStream in) {
- CachedOutputStream out = new CachedOutputStream();
- try {
- XMLStreamReader reader = StaxUtils.createXMLStreamReader(in);
- Source beforeSource = new StaxSource(reader);
+ try (InputStream inputStream = in; CachedOutputStream out = new CachedOutputStream()) {
+ Source beforeSource = new StaxSource(StaxUtils.createXMLStreamReader(inputStream));
Transformer trans = xsltTemplate.newTransformer();
trans.transform(beforeSource, new StreamResult(out));
@@ -64,25 +61,12 @@ public final class XSLTUtils {
throw new Fault("GET_CACHED_INPUT_STREAM", LOG, e, e.getMessage());
} catch (TransformerException e) {
throw new Fault("XML_TRANSFORM", LOG, e, e.getMessage());
- } finally {
- try {
- in.close();
- } catch (Exception e) {
- // ignore
- }
- try {
- out.close();
- } catch (Exception e) {
- // ignore
- }
}
}
public static Reader transform(Templates xsltTemplate, Reader inReader) {
- CachedWriter outWriter = new CachedWriter();
- try {
- XMLStreamReader reader = StaxUtils.createXMLStreamReader(inReader);
- Source beforeSource = new StaxSource(reader);
+ try (Reader reader = inReader; CachedWriter outWriter = new CachedWriter()) {
+ Source beforeSource = new StaxSource(StaxUtils.createXMLStreamReader(reader));
Transformer trans = xsltTemplate.newTransformer();
trans.transform(beforeSource, new StreamResult(outWriter));
@@ -92,17 +76,6 @@ public final class XSLTUtils {
throw new Fault("GET_CACHED_INPUT_STREAM", LOG, e, e.getMessage());
} catch (TransformerException e) {
throw new Fault("XML_TRANSFORM", LOG, e, e.getMessage());
- } finally {
- try {
- inReader.close();
- } catch (Exception e) {
- // ignore
- }
- try {
- outWriter.close();
- } catch (Exception e) {
- // ignore
- }
}
}
diff --git a/core/src/main/java/org/apache/cxf/helpers/FileUtils.java b/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
index c203750..b166c58 100644
--- a/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
@@ -289,25 +289,12 @@ public final class FileUtils {
}
public static String getStringFromFile(File location) {
- InputStream is = null;
- String result = null;
-
- try {
- is = Files.newInputStream(location.toPath());
- result = normalizeCRLF(is);
- } catch (Exception e) {
+ try (InputStream is = Files.newInputStream(location.toPath())) {
+ return normalizeCRLF(is);
+ } catch (IOException e) {
e.printStackTrace();
- } finally {
- if (is != null) {
- try {
- is.close();
- } catch (Exception e) {
- //do nothing
- }
- }
}
-
- return result;
+ return null;
}
public static String normalizeCRLF(InputStream instream) {
diff --git a/core/src/main/java/org/apache/cxf/helpers/IOUtils.java b/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
index 08d040c..efa8ded 100644
--- a/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
@@ -148,37 +148,29 @@ public final class IOUtils {
public static int copyAndCloseInput(final InputStream input,
final OutputStream output) throws IOException {
- try {
- return copy(input, output);
- } finally {
- input.close();
+ try (InputStream in = input) {
+ return copy(in, output);
}
}
public static int copyAndCloseInput(final InputStream input,
final OutputStream output, int bufferSize) throws IOException {
- try {
- return copy(input, output, bufferSize);
- } finally {
- input.close();
+ try (InputStream in = input) {
+ return copy(in, output, bufferSize);
}
}
public static void copyAndCloseInput(final Reader input,
final Writer output) throws IOException {
- try {
- copy(input, output, DEFAULT_BUFFER_SIZE);
- } finally {
- input.close();
+ try (Reader r = input) {
+ copy(r, output, DEFAULT_BUFFER_SIZE);
}
}
public static void copyAndCloseInput(final Reader input,
final Writer output, int bufferSize) throws IOException {
- try {
- copy(input, output, bufferSize);
- } finally {
- input.close();
+ try (Reader r = input) {
+ copy(r, output, bufferSize);
}
}
@@ -305,18 +297,16 @@ public final class IOUtils {
StringBuilder buf = new StringBuilder();
final char[] buffer = new char[bufSize];
- try {
- int n = input.read(buffer);
+ try (Reader r = input) {
+ int n = r.read(buffer);
while (-1 != n) {
if (n == 0) {
throw new IOException("0 bytes read in violation of InputStream.read(byte[])");
}
buf.append(buffer, 0, n);
- n = input.read(buffer);
+ n = r.read(buffer);
}
return buf.toString();
- } finally {
- input.close();
}
}
@@ -397,11 +387,10 @@ public final class IOUtils {
if (i < DEFAULT_BUFFER_SIZE) {
i = DEFAULT_BUFFER_SIZE;
}
- try (ByteArrayOutputStream bos = new ByteArrayOutputStream(i)) {
- copy(in, bos);
+ try (InputStream input = in; ByteArrayOutputStream bos = new ByteArrayOutputStream(i)) {
+ copy(input, bos);
return bos.toByteArray();
- } finally {
- in.close();
}
}
+
}
diff --git a/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java
index 2a1395b..d36e11c 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java
@@ -26,7 +26,7 @@ import java.io.PrintWriter;
import java.io.StringReader;
import java.io.StringWriter;
import java.net.URI;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.LogRecord;
@@ -59,15 +59,8 @@ public abstract class AbstractLoggingInterceptor extends AbstractPhaseIntercepto
protected static final String MULTIPART_CONTENT_MESSAGE = "--- Multipart Content ---";
private static final String MULTIPART_CONTENT_MEDIA_TYPE = "multipart";
private static final String LIVE_LOGGING_PROP = "org.apache.cxf.logging.enable";
- private static final List<String> BINARY_CONTENT_MEDIA_TYPES;
- static {
- BINARY_CONTENT_MEDIA_TYPES = new ArrayList<>();
- BINARY_CONTENT_MEDIA_TYPES.add("application/octet-stream");
- BINARY_CONTENT_MEDIA_TYPES.add("application/pdf");
- BINARY_CONTENT_MEDIA_TYPES.add("image/png");
- BINARY_CONTENT_MEDIA_TYPES.add("image/jpeg");
- BINARY_CONTENT_MEDIA_TYPES.add("image/gif");
- }
+ private static final List<String> BINARY_CONTENT_MEDIA_TYPES = Arrays.asList(
+ "application/octet-stream", "application/pdf", "image/png", "image/jpeg", "image/gif");
protected int limit = DEFAULT_LIMIT;
protected long threshold = -1;
@@ -84,7 +77,7 @@ public abstract class AbstractLoggingInterceptor extends AbstractPhaseIntercepto
super(id, phase);
}
- protected static boolean isLoggingDisabledNow(Message message) throws Fault {
+ protected static boolean isLoggingDisabledNow(Message message) {
Object liveLoggingProp = message.getContextualProperty(LIVE_LOGGING_PROP);
return liveLoggingProp != null && PropertyUtils.isFalse(liveLoggingProp);
}
@@ -177,8 +170,7 @@ public abstract class AbstractLoggingInterceptor extends AbstractPhaseIntercepto
StringWriter swriter = new StringWriter();
XMLStreamWriter xwriter = StaxUtils.createXMLStreamWriter(swriter);
xwriter = new PrettyPrintXMLStreamWriter(xwriter, 2);
- InputStream in = cos.getInputStream();
- try {
+ try (InputStream in = cos.getInputStream()) {
InputStreamReader inputStreamReader = StringUtils.isEmpty(encoding)
? new InputStreamReader(in) : new InputStreamReader(in, encoding);
StaxUtils.copy(new StreamSource(inputStreamReader), xwriter);
@@ -191,7 +183,6 @@ public abstract class AbstractLoggingInterceptor extends AbstractPhaseIntercepto
} catch (XMLStreamException xse2) {
//ignore
}
- in.close();
}
String result = swriter.toString();
diff --git a/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
index bbd9564..a4e877b 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
@@ -57,7 +57,7 @@ public class FaultOutInterceptor extends AbstractPhaseInterceptor<Message> {
super(Phase.PRE_PROTOCOL);
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
Fault f = (Fault)message.getContent(Exception.class);
if (f == null) {
return;
diff --git a/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
index e4339c9..c7b24cc 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
@@ -76,14 +76,14 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
this.writer = w;
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
Logger logger = getMessageLogger(message);
if (logger != null && (writer != null || logger.isLoggable(Level.INFO))) {
logging(logger, message);
}
}
- protected void logging(Logger logger, Message message) throws Fault {
+ protected void logging(Logger logger, Message message) {
if (message.containsKey(LoggingMessage.ID_KEY)) {
return;
}
diff --git a/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
index 8fedb60..0f9ef6e 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
@@ -63,7 +63,7 @@ public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
final OutputStream os = message.getContent(OutputStream.class);
final Writer iowriter = message.getContent(Writer.class);
if (os == null && iowriter == null) {
diff --git a/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java
index ed55a17..ad4a098 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java
@@ -58,7 +58,7 @@ public class MessageSenderInterceptor extends AbstractPhaseInterceptor<Message>
super(Phase.PREPARE_SEND_ENDING);
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
try {
getConduit(message).close(message);
} catch (SocketTimeoutException e) {
diff --git a/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
index 642a270..14e2aa5 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
@@ -67,7 +67,7 @@ public class OneWayProcessorInterceptor extends AbstractPhaseInterceptor<Message
}
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
if (message.getExchange().isOneWay()
&& !isRequestor(message)
diff --git a/core/src/main/java/org/apache/cxf/interceptor/StaxInEndingInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/StaxInEndingInterceptor.java
index 14818f8..cdad27a 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/StaxInEndingInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/StaxInEndingInterceptor.java
@@ -42,7 +42,7 @@ public class StaxInEndingInterceptor extends AbstractPhaseInterceptor<Message> {
super(phase);
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
XMLStreamReader xtr = message.getContent(XMLStreamReader.class);
if (xtr != null && !MessageUtils.getContextualBoolean(message, STAX_IN_NOCLOSE, false)) {
try {
diff --git a/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
index 9bb5a81..3465f15 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
@@ -146,7 +146,10 @@ public class StaxInInterceptor extends AbstractPhaseInterceptor<Message> {
}
- public static XMLInputFactory getXMLInputFactory(Message m) throws Fault {
+ /**
+ * @throws Fault
+ */
+ public static XMLInputFactory getXMLInputFactory(Message m) {
Object o = m.getContextualProperty(XMLInputFactory.class.getName());
if (o instanceof XMLInputFactory) {
return (XMLInputFactory)o;
diff --git a/core/src/main/java/org/apache/cxf/interceptor/StaxOutEndingInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/StaxOutEndingInterceptor.java
index ed6bfa6..d2cba0d 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/StaxOutEndingInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/StaxOutEndingInterceptor.java
@@ -48,7 +48,7 @@ public class StaxOutEndingInterceptor extends AbstractPhaseInterceptor<Message>
this.writerHolder = writerHolder;
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
try {
XMLStreamWriter xtw = message.getContent(XMLStreamWriter.class);
if (xtw != null) {
diff --git a/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
index f8deb33..3f03845 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
@@ -145,7 +145,10 @@ public class StaxOutInterceptor extends AbstractPhaseInterceptor<Message> {
return encoding;
}
- public static XMLOutputFactory getXMLOutputFactory(Message m) throws Fault {
+ /**
+ * @throws Fault
+ */
+ public static XMLOutputFactory getXMLOutputFactory(Message m) {
Object o = m.getContextualProperty(XMLOutputFactory.class.getName());
if (o instanceof XMLOutputFactory) {
m.put(AbstractOutDatabindingInterceptor.DISABLE_OUTPUTSTREAM_OPTIMIZATION,
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java
index 6a2fb94..42a6951 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java
@@ -25,7 +25,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
@@ -45,7 +44,7 @@ public abstract class AbstractAuthorizingInInterceptor extends AbstractPhaseInte
public AbstractAuthorizingInInterceptor(boolean uniqueId) {
super(null, Phase.PRE_INVOKE, uniqueId);
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
Method method = getTargetMethod(message);
SecurityContext sc = message.get(SecurityContext.class);
if (sc != null && sc.getUserPrincipal() != null) {
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/AbstractSecurityContextInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/AbstractSecurityContextInInterceptor.java
index 8d71bda..d9fbeb0 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/AbstractSecurityContextInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/AbstractSecurityContextInInterceptor.java
@@ -25,7 +25,6 @@ import javax.security.auth.Subject;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.security.SecurityToken;
-import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
@@ -40,7 +39,7 @@ public abstract class AbstractSecurityContextInInterceptor extends AbstractPhase
super(Phase.PRE_INVOKE);
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
SecurityToken token = message.get(SecurityToken.class);
if (token == null) {
reportSecurityException("Security Token is not available on the current message");
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/DelegatingAuthenticationInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/DelegatingAuthenticationInterceptor.java
index fe42b1f..7254a8f 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/DelegatingAuthenticationInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/DelegatingAuthenticationInterceptor.java
@@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.Map;
import org.apache.cxf.helpers.CastUtils;
-import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
@@ -42,7 +41,7 @@ public class DelegatingAuthenticationInterceptor extends AbstractPhaseIntercepto
super(phase);
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
String scheme = getAuthenticationScheme(message);
Interceptor<Message> handler = authenticationHandlers.get(scheme);
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java
index 06801ff..c51e662 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java
@@ -33,7 +33,6 @@ import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.InterceptorChain;
import org.apache.cxf.interceptor.security.callback.CallbackHandlerProvider;
import org.apache.cxf.interceptor.security.callback.CallbackHandlerProviderAuthPol;
@@ -121,7 +120,7 @@ public class JAASLoginInterceptor extends AbstractPhaseInterceptor<Message> {
return null;
}
- public void handleMessage(final Message message) throws Fault {
+ public void handleMessage(final Message message) {
if (allowNamedPrincipals) {
SecurityContext sc = message.get(SecurityContext.class);
if (sc != null && sc.getUserPrincipal() != null
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java
index 6e3b1b5..e46d847 100755
--- a/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java
@@ -25,7 +25,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.security.SecurityContext;
import org.apache.cxf.service.model.BindingOperationInfo;
@@ -38,7 +37,7 @@ public class OperationInfoAuthorizingInterceptor extends SimpleAuthorizingInterc
private static final Logger LOG = LogUtils.getL7dLogger(OperationInfoAuthorizingInterceptor.class);
@Override
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
OperationInfo opinfo = getTargetOperationInfo(message);
SecurityContext sc = message.get(SecurityContext.class);
if (sc != null && sc.getUserPrincipal() != null) {
diff --git a/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java b/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java
index 587f283..64c8d1c 100644
--- a/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java
+++ b/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java
@@ -74,10 +74,10 @@ public class SimpleMethodDispatcher
BindingInfo b = endpoint.getEndpointInfo().getBinding();
for (BindingOperationInfo bop2 : b.getOperations()) {
if (bop2.getOperationInfo().equals(o)) {
- bop2 = getRealOperation(o, bop2);
+ BindingOperationInfo realBop = getRealOperation(o, bop2);
- bops.put(b, bop2);
- return bop2;
+ bops.put(b, realBop);
+ return realBop;
}
}
}
diff --git a/core/src/main/java/org/apache/cxf/service/invoker/spring/SpringBeanFactory.java b/core/src/main/java/org/apache/cxf/service/invoker/spring/SpringBeanFactory.java
index b7840f5..8df1c68 100644
--- a/core/src/main/java/org/apache/cxf/service/invoker/spring/SpringBeanFactory.java
+++ b/core/src/main/java/org/apache/cxf/service/invoker/spring/SpringBeanFactory.java
@@ -21,7 +21,6 @@ package org.apache.cxf.service.invoker.spring;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.service.invoker.Factory;
-import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -58,8 +57,8 @@ public class SpringBeanFactory implements Factory, ApplicationContextAware {
//nothing
}
- public void setApplicationContext(ApplicationContext arg0) throws BeansException {
- ctx = arg0;
+ public void setApplicationContext(ApplicationContext applicationContext) {
+ ctx = applicationContext;
}
}
diff --git a/core/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
index c07d3bd..e6396ca 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
@@ -111,7 +111,7 @@ public abstract class AbstractDOMStreamReader<T, I> implements XMLStreamReader {
*
* @see javax.xml.stream.XMLStreamReader#getProperty(java.lang.String)
*/
- public Object getProperty(String key) throws IllegalArgumentException {
+ public Object getProperty(String name) {
return null;
}
diff --git a/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java b/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java
index d559485..79c2725 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java
@@ -79,7 +79,7 @@ public class CachingXmlEventWriter implements XMLStreamWriter {
return curContext.getPrefix(ns);
}
- public Object getProperty(String arg0) throws IllegalArgumentException {
+ public Object getProperty(String name) {
//nothing
return null;
}
diff --git a/core/src/main/java/org/apache/cxf/staxutils/DelegatingXMLStreamWriter.java b/core/src/main/java/org/apache/cxf/staxutils/DelegatingXMLStreamWriter.java
index 35b0496..994244d 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/DelegatingXMLStreamWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/DelegatingXMLStreamWriter.java
@@ -50,7 +50,7 @@ public class DelegatingXMLStreamWriter implements XMLStreamWriter {
return delegate.getPrefix(uri);
}
- public Object getProperty(String name) throws IllegalArgumentException {
+ public Object getProperty(String name) {
return delegate.getProperty(name);
}
diff --git a/core/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java
index bcc4def..1cc93ec 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java
@@ -151,9 +151,8 @@ public class DepthXMLStreamReader implements XMLStreamReader {
return reader.getPrefix();
}
- public Object getProperty(String arg0) throws IllegalArgumentException {
-
- return reader.getProperty(arg0);
+ public Object getProperty(String name) {
+ return reader.getProperty(name);
}
public String getText() {
diff --git a/core/src/main/java/org/apache/cxf/staxutils/PrettyPrintXMLStreamWriter.java b/core/src/main/java/org/apache/cxf/staxutils/PrettyPrintXMLStreamWriter.java
index 65ad99a..dc0e01f 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/PrettyPrintXMLStreamWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/PrettyPrintXMLStreamWriter.java
@@ -85,7 +85,7 @@ public class PrettyPrintXMLStreamWriter implements XMLStreamWriter {
return baseWriter.getPrefix(uri);
}
- public java.lang.Object getProperty(java.lang.String name) throws IllegalArgumentException {
+ public Object getProperty(java.lang.String name) {
return baseWriter.getProperty(name);
}
diff --git a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
index 75dad8c..d73036e 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
@@ -336,8 +336,8 @@ public class W3CDOMStreamWriter implements XMLStreamWriter {
return context;
}
- public Object getProperty(String prop) throws IllegalArgumentException {
- return properties.get(prop);
+ public Object getProperty(String name) {
+ return properties.get(name);
}
public void close() throws XMLStreamException {
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java b/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
index a3b0e7b..bd9b4b5 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
@@ -268,7 +268,7 @@ public class InTransformReader extends DepthXMLStreamReader {
}
- public Object getProperty(String name) throws IllegalArgumentException {
+ public Object getProperty(String name) {
if (INTERN_NAMES.equals(name) || INTERN_NS.equals(name)) {
return Boolean.FALSE;
}
diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java b/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java
index 03db30b..6205852 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java
@@ -41,7 +41,7 @@ public class StaxSchemaValidationInInterceptor extends AbstractPhaseInterceptor<
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
XMLStreamReader xmlReader = message.getContent(XMLStreamReader.class);
try {
setSchemaInMessage(message, xmlReader);
diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java b/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java
index 1865d91..c30bf14 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java
@@ -41,7 +41,7 @@ public class StaxSchemaValidationOutInterceptor extends AbstractPhaseInterceptor
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
try {
setSchemaInMessage(message, writer);
diff --git a/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java b/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java
index 6e377e6..6ddf697 100644
--- a/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java
@@ -59,7 +59,7 @@ public class GZIPInInterceptor extends AbstractPhaseInterceptor<Message> {
addBefore(AttachmentInInterceptor.class.getName());
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
if (isGET(message)) {
return;
}
diff --git a/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java b/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
index 555a306..8a80d07 100644
--- a/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
@@ -133,7 +133,7 @@ public class GZIPOutInterceptor extends AbstractPhaseInterceptor<Message> {
return threshold;
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
UseGzip use = gzipPermitted(message);
if (use != UseGzip.NO) {
// remember the original output stream, we will write compressed
@@ -169,7 +169,7 @@ public class GZIPOutInterceptor extends AbstractPhaseInterceptor<Message> {
* @throws Fault if the Accept-Encoding header does not allow any encoding
* that we can support (identity, gzip or x-gzip).
*/
- public UseGzip gzipPermitted(Message message) throws Fault {
+ public UseGzip gzipPermitted(Message message) {
UseGzip permitted = UseGzip.NO;
if (supportedPayloadContentTypes != null && message.containsKey(Message.CONTENT_TYPE)
&& !supportedPayloadContentTypes.contains(message.get(Message.CONTENT_TYPE))) {
diff --git a/core/src/main/java/org/apache/cxf/validation/AbstractValidationInterceptor.java b/core/src/main/java/org/apache/cxf/validation/AbstractValidationInterceptor.java
index 47cf1bb..cb5d6c9 100644
--- a/core/src/main/java/org/apache/cxf/validation/AbstractValidationInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/validation/AbstractValidationInterceptor.java
@@ -29,7 +29,6 @@ import javax.validation.executable.ValidateOnExecution;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageContentsList;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
@@ -58,7 +57,7 @@ public abstract class AbstractValidationInterceptor extends AbstractPhaseInterce
}
@Override
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
final Object theServiceObject = getServiceObject(message);
if (theServiceObject == null) {
return;
diff --git a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
index f586ba4..ae03f1d 100644
--- a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
@@ -52,7 +52,7 @@ public class ExtensionTest {
}
@Test
- public void testLoad() throws ExtensionException {
+ public void testLoad() throws Exception {
Extension e = new Extension();
ClassLoader cl = Thread.currentThread().getContextClassLoader();
e.setClassname("no.such.Extension");
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
index 505a7e4..058e826 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
@@ -39,7 +39,6 @@ import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.endpoint.ServerRegistry;
import org.apache.cxf.feature.AbstractFeature;
import org.apache.cxf.feature.Feature;
-import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
@@ -213,10 +212,10 @@ public class SpringBusFactoryTest {
public void handleFault(Message message) {
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
}
- public void postHandleMessage(Message message) throws Fault {
+ public void postHandleMessage(Message message) {
}
}
diff --git a/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java b/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
index 51e1dbd..2cdabb1 100644
--- a/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
@@ -164,7 +164,7 @@ public class LogUtilsTest {
String cname;
String mname;
- public void close() throws SecurityException {
+ public void close() {
}
public void flush() {
}
diff --git a/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java b/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
index dd38c31..d8aa69b 100644
--- a/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/ClassHelperTest.java
@@ -191,7 +191,7 @@ public class ClassHelperTest {
EasyMock.verify(bus);
}
-
+
@Test
public void getRealLambdaClassPropertyWasSetInBus() {
EasyMock.expect(bus.getProperty(ClassHelper.USE_DEFAULT_CLASS_HELPER)).andReturn(true);
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/AbstractEndpointSelectionInterceptor.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/AbstractEndpointSelectionInterceptor.java
index 9a490dd..4f8d855 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/AbstractEndpointSelectionInterceptor.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/AbstractEndpointSelectionInterceptor.java
@@ -23,7 +23,6 @@ import java.util.Set;
import org.apache.cxf.binding.Binding;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.CastUtils;
-import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.interceptor.InterceptorChain;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
@@ -40,7 +39,7 @@ public abstract class AbstractEndpointSelectionInterceptor extends AbstractPhase
super(id, phase);
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
Exchange ex = message.getExchange();
Set<Endpoint> endpoints = CastUtils.cast((Set<?>)ex.get(MultipleEndpointObserver.ENDPOINTS));
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/WrappedOutInterceptor.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/WrappedOutInterceptor.java
index 15ce65c..ece46ec 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/WrappedOutInterceptor.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/WrappedOutInterceptor.java
@@ -95,7 +95,7 @@ public class WrappedOutInterceptor extends AbstractOutDatabindingInterceptor {
super(phase);
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) {
try {
XMLStreamWriter xtw = message.getContent(XMLStreamWriter.class);
if (xtw != null) {