This is an automated email from the ASF dual-hosted git repository.
coheigea 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 6e7c568 Grouping catch statements where possible
6e7c568 is described below
commit 6e7c568c7be2a6bf20eb6af8410b42a5ed10e0e3
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Wed Nov 14 14:22:09 2018 +0000
Grouping catch statements where possible
---
core/src/main/java/org/apache/cxf/BusFactory.java | 4 +---
.../cxf/attachment/AttachmentDataSource.java | 8 ++------
.../apache/cxf/common/util/ProxyClassLoader.java | 8 ++------
.../org/apache/cxf/common/util/ProxyHelper.java | 4 +---
.../org/apache/cxf/common/util/ReflectionUtil.java | 24 ++++++----------------
.../cxf/databinding/AbstractDataBinding.java | 4 +---
.../cxf/endpoint/AbstractConduitSelector.java | 4 +---
.../feature/transform/AbstractXSLTInterceptor.java | 6 +-----
.../org/apache/cxf/helpers/HttpHeaderHelper.java | 4 +---
.../apache/cxf/interceptor/StaxInInterceptor.java | 4 +---
.../apache/cxf/interceptor/StaxOutInterceptor.java | 4 +---
.../java/org/apache/cxf/resource/URIResolver.java | 4 +---
.../security/TestUserPasswordLoginModule.java | 4 +---
.../apache/cxf/binding/corba/utils/OrbConfig.java | 4 +---
.../soap/interceptor/SoapHeaderInterceptor.java | 5 +----
.../apache/cxf/aegis/type/basic/Base64Type.java | 4 +---
.../cxf/aegis/type/basic/XMLBeanTypeInfo.java | 6 +-----
.../apache/cxf/jaxrs/JAXRSServerFactoryBean.java | 9 --------
.../jaxrs/security/JAASAuthenticationFilter.java | 3 ---
.../soap/SOAPHandlerFaultInInterceptor.java | 4 +---
.../jaxws/handler/soap/SOAPHandlerInterceptor.java | 4 +---
.../jaxws/handler/soap/SOAPMessageContextImpl.java | 4 +---
.../interceptors/MessageModeOutInterceptor.java | 5 +----
.../jaxws/interceptors/WebFaultOutInterceptor.java | 10 ++-------
.../JaxWsWebServicePublisherBeanPostProcessor.java | 4 +---
.../cxf/jaxws/support/JaxWsServiceFactoryBean.java | 4 +---
.../org/apache/cxf/frontend/ClientFactoryBean.java | 4 +---
.../org/apache/cxf/frontend/ServerFactoryBean.java | 8 ++------
.../cxf/javascript/JavascriptTestUtilities.java | 6 +-----
.../org/apache/cxf/javascript/JsNamedNodeMap.java | 6 +-----
.../org/apache/cxf/javascript/JsSimpleDomNode.java | 6 +-----
.../apache/cxf/javascript/JsSimpleDomParser.java | 10 ++-------
.../apache/cxf/javascript/JsXMLHttpRequest.java | 13 ++----------
.../apache/cxf/javascript/fortest/MtoMImpl.java | 3 ---
.../jmx/export/ModelMBeanAssemblerTest.java | 4 +---
.../cxf/jaxrs/ext/search/odata/ODataParser.java | 9 ++------
.../security/jose/common/KeyManagementUtils.java | 16 ++-------------
.../security/oauth/filters/OAuthRequestFilter.java | 3 ---
.../security/oauth/filters/OAuthServletFilter.java | 3 ---
.../services/AbstractAccessTokenValidator.java | 2 --
.../AbstractRequestAssertionConsumerHandler.java | 4 +---
.../cxf/rs/security/xml/XmlSecInInterceptor.java | 8 +-------
.../cxf/rs/security/xml/XmlSecOutInterceptor.java | 2 --
.../apache/cxf/rt/security/crypto/HmacUtils.java | 8 ++------
.../http/asyncclient/AsyncHTTPConduitTest.java | 8 ++------
.../osgi/HTTPJettyTransportActivator.java | 4 +---
.../netty/client/integration/NettyClientTest.java | 8 ++------
.../client/integration/SSLNettyClientTest.java | 8 ++------
.../osgi/HTTPUndertowTransportActivator.java | 4 +---
.../http/auth/AbstractSpnegoAuthSupplier.java | 4 +---
.../http/osgi/HttpConduitConfigApplier.java | 6 +-----
.../spring/HttpConduitBeanDefinitionParser.java | 12 +----------
.../https/httpclient/DefaultHostnameVerifier.java | 4 +---
.../servlet/ServletContextResourceResolver.java | 4 +---
.../servicelist/ServiceListJAASAuthenticator.java | 4 +---
.../backend/manager/SubscriptionManagerImpl.java | 4 +---
.../main/java/org/apache/cxf/ws/rm/RMEndpoint.java | 4 +---
.../cxf/ws/rm/persistence/jdbc/RMTxStore.java | 4 +---
.../cxf/ws/security/wss4j/StaxSerializer.java | 3 ---
.../security/wss4j/UsernameTokenInterceptor.java | 4 +---
.../ws/security/wss4j/WSS4JStaxOutInterceptor.java | 4 +---
.../policyhandlers/AsymmetricBindingHandler.java | 5 +----
.../cxf/wsdl/service/factory/ClassReader.java | 6 +-----
.../factory/ReflectionServiceFactoryBean.java | 4 +---
.../org/apache/cxf/wsdl11/CatalogWSDLLocator.java | 3 ---
.../org/apache/cxf/sts/request/RequestParser.java | 8 +-------
.../sts/token/validator/X509TokenValidator.java | 3 ---
.../apache/cxf/ws/discovery/WSDiscoveryClient.java | 8 ++------
.../java/org/apache/cxf/wsn/jms/JmsPublisher.java | 6 +-----
.../cxf/xkms/x509/validator/DateValidator.java | 4 +---
.../xkms/x509/repo/ldap/LdapCertificateRepo.java | 10 ++-------
.../cxf/systest/jaxrs/BadgerFishProvider.java | 8 ++------
.../apache/cxf/systest/jaxws/ClientServerTest.java | 4 +---
.../jaxws/websocket/ClientServerWebSocketTest.java | 4 +---
.../cxf/systest/jms/JMSClientServerTest.java | 4 +---
.../https/constraints/CertConstraintsTest.java | 2 --
.../ws/basicauth/TestUserPasswordLoginModule.java | 4 +---
.../org/apache/cxf/tools/java2js/JavaToJS.java | 6 +-----
.../tools/java2js/processor/JavaToJSProcessor.java | 3 ---
.../generator/wsdl11/WSDL11Generator.java | 4 +---
.../javascript/WSDLToJavaScriptProcessor.java | 3 ---
.../java/org/apache/cxf/tools/misc/WSDLToSoap.java | 4 ----
82 files changed, 88 insertions(+), 367 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/BusFactory.java
b/core/src/main/java/org/apache/cxf/BusFactory.java
index 22a8f5d..b6b75af 100644
--- a/core/src/main/java/org/apache/cxf/BusFactory.java
+++ b/core/src/main/java/org/apache/cxf/BusFactory.java
@@ -398,9 +398,7 @@ public abstract class BusFactory {
idx = busFactoryCondition.indexOf(',');
}
cls.getClassLoader().loadClass(busFactoryCondition);
- } catch (ClassNotFoundException e) {
- busFactoryClass = DEFAULT_BUS_FACTORY;
- } catch (NoClassDefFoundError e) {
+ } catch (ClassNotFoundException | NoClassDefFoundError e) {
busFactoryClass = DEFAULT_BUS_FACTORY;
}
diff --git
a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
index b8773c6..fd87ffb 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
@@ -56,11 +56,7 @@ public class AttachmentDataSource implements DataSource {
if (delegate != null) {
delegate.setInputStream(cache.getInputStream());
}
- } catch (CacheSizeExceededException cee) {
- cache.close();
- cache = null;
- throw cee;
- } catch (IOException cee) {
+ } catch (CacheSizeExceededException | IOException cee) {
cache.close();
cache = null;
throw cee;
@@ -113,4 +109,4 @@ public class AttachmentDataSource implements DataSource {
public OutputStream getOutputStream() throws IOException {
throw new UnsupportedOperationException();
}
-}
\ No newline at end of file
+}
diff --git
a/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java
b/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java
index 55d5ac5..dfdd12b 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java
@@ -61,18 +61,14 @@ public class ProxyClassLoader extends ClassLoader {
for (ClassLoader loader : loaders) {
try {
return loader.loadClass(name);
- } catch (ClassNotFoundException cnfe) {
- // Try next
- } catch (NoClassDefFoundError cnfe) {
+ } catch (ClassNotFoundException | NoClassDefFoundError cnfe) {
// Try next
}
}
if (checkSystem) {
try {
return getSystemClassLoader().loadClass(name);
- } catch (ClassNotFoundException cnfe) {
- // Try next
- } catch (NoClassDefFoundError cnfe) {
+ } catch (ClassNotFoundException | NoClassDefFoundError cnfe) {
// Try next
}
}
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 803ad39..7b185aa 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
@@ -113,9 +113,7 @@ public class ProxyHelper {
}
}
}
- } catch (NoClassDefFoundError e) {
- return false;
- } catch (ClassNotFoundException e) {
+ } catch (NoClassDefFoundError | ClassNotFoundException e) {
return false;
}
}
diff --git a/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
b/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
index b3f5aa5..146d7fc 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
@@ -52,9 +52,7 @@ public final class ReflectionUtil {
try {
f.setAccessible(true);
return responseClass.cast(f.get(o));
- } catch (SecurityException e) {
- return null;
- } catch (IllegalAccessException e) {
+ } catch (SecurityException | IllegalAccessException e) {
return null;
} finally {
f.setAccessible(b);
@@ -73,9 +71,7 @@ public final class ReflectionUtil {
try {
f.setAccessible(true);
return responseClass.cast(f.get(o));
- } catch (SecurityException e) {
- return null;
- } catch (IllegalAccessException e) {
+ } catch (SecurityException | IllegalAccessException e) {
return null;
} finally {
f.setAccessible(b);
@@ -89,9 +85,7 @@ public final class ReflectionUtil {
public Field run() {
try {
return cls.getDeclaredField(name);
- } catch (SecurityException e) {
- return null;
- } catch (NoSuchFieldException e) {
+ } catch (SecurityException | NoSuchFieldException e) {
return null;
}
}
@@ -103,9 +97,7 @@ public final class ReflectionUtil {
public Constructor<T> run() {
try {
return cls.getDeclaredConstructor(args);
- } catch (SecurityException e) {
- return null;
- } catch (NoSuchMethodException e) {
+ } catch (SecurityException | NoSuchMethodException e) {
return null;
}
}
@@ -117,9 +109,7 @@ public final class ReflectionUtil {
public Constructor<T> run() {
try {
return cls.getConstructor(args);
- } catch (SecurityException e) {
- return null;
- } catch (NoSuchMethodException e) {
+ } catch (SecurityException | NoSuchMethodException e) {
return null;
}
}
@@ -247,9 +237,7 @@ public final class ReflectionUtil {
if (propertyDescriptor != null) {
descriptors.add(propertyDescriptor);
}
- } catch (IllegalArgumentException e) {
- throw new RuntimeException(e);
- } catch (IllegalAccessException e) {
+ } catch (IllegalArgumentException | IllegalAccessException
e) {
throw new RuntimeException(e);
} catch (InvocationTargetException e) {
throw new RuntimeException(e.getCause());
diff --git
a/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
b/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
index 0c8dac1..b3379ee 100644
--- a/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
+++ b/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
@@ -233,9 +233,7 @@ public abstract class AbstractDataBinding implements
DataBinding {
private Document copy(Document doc) {
try {
return StaxUtils.copy(doc);
- } catch (XMLStreamException e) {
- // ignore
- } catch (ParserConfigurationException e) {
+ } catch (XMLStreamException | ParserConfigurationException e) {
// ignore
}
return doc;
diff --git
a/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
b/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
index 156175c..6a303d2 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
@@ -113,9 +113,7 @@ public abstract class AbstractConduitSelector implements
ConduitSelector, Closea
} else {
getLogger().warning("ConduitInitiatorManager not found");
}
- } catch (BusException ex) {
- throw new Fault(ex);
- } catch (IOException ex) {
+ } catch (BusException | IOException ex) {
throw new Fault(ex);
}
}
diff --git
a/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java
b/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java
index 429bef8..1dc91c8 100644
---
a/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java
+++
b/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java
@@ -69,11 +69,7 @@ public abstract class AbstractXSLTInterceptor extends
AbstractPhaseInterceptor<M
}
xsltTemplate = transformerFactory.newTemplates(new DOMSource(doc));
- } catch (TransformerConfigurationException e) {
- throw new IllegalArgumentException(
- String.format("Cannot create
XSLT template from path: %s",
- xsltPath), e);
- } catch (XMLStreamException e) {
+ } catch (TransformerConfigurationException | XMLStreamException e) {
throw new IllegalArgumentException(
String.format("Cannot create
XSLT template from path: %s",
xsltPath), e);
diff --git a/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
b/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
index c6edbac..0ed3e52 100644
--- a/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
+++ b/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
@@ -120,9 +120,7 @@ public final class HttpHeaderHelper {
if (newenc == null) {
try {
newenc = Charset.forName(enc).name();
- } catch (IllegalCharsetNameException icne) {
- return null;
- } catch (UnsupportedCharsetException uce) {
+ } catch (IllegalCharsetNameException | UnsupportedCharsetException
e) {
return null;
}
String tmpenc = encodings.putIfAbsent(enc, newenc);
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 0beb021..9bb5a81 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
@@ -171,9 +171,7 @@ public class StaxInInterceptor extends
AbstractPhaseInterceptor<Message> {
try {
xif = (XMLInputFactory)(cls.newInstance());
factories.put(o, xif);
- } catch (InstantiationException e) {
- throw new Fault(e);
- } catch (IllegalAccessException e) {
+ } catch (InstantiationException | IllegalAccessException e) {
throw new Fault(e);
}
}
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 af41e12..f8deb33 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
@@ -172,9 +172,7 @@ public class StaxOutInterceptor extends
AbstractPhaseInterceptor<Message> {
try {
xif = (XMLOutputFactory)(cls.newInstance());
factories.put(o, xif);
- } catch (InstantiationException e) {
- throw new Fault(e);
- } catch (IllegalAccessException e) {
+ } catch (InstantiationException | IllegalAccessException e) {
throw new Fault(e);
}
}
diff --git a/core/src/main/java/org/apache/cxf/resource/URIResolver.java
b/core/src/main/java/org/apache/cxf/resource/URIResolver.java
index 5a9e43d..d36bc79 100644
--- a/core/src/main/java/org/apache/cxf/resource/URIResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/URIResolver.java
@@ -404,9 +404,7 @@ public class URIResolver {
cache.put(uriStr, bout);
}
is = bout.createInputStream();
- } catch (MalformedURLException e) {
- // do nothing
- } catch (URISyntaxException e) {
+ } catch (MalformedURLException | URISyntaxException e) {
// do nothing
}
}
diff --git
a/core/src/test/java/org/apache/cxf/interceptor/security/TestUserPasswordLoginModule.java
b/core/src/test/java/org/apache/cxf/interceptor/security/TestUserPasswordLoginModule.java
index c5209cb..f35a8c6 100644
---
a/core/src/test/java/org/apache/cxf/interceptor/security/TestUserPasswordLoginModule.java
+++
b/core/src/test/java/org/apache/cxf/interceptor/security/TestUserPasswordLoginModule.java
@@ -55,9 +55,7 @@ public class TestUserPasswordLoginModule implements
LoginModule {
Callback[] callbacks = new Callback[] {nameCallback, passwordCallback};
try {
this.callbackHandler.handle(callbacks);
- } catch (IOException e) {
- throw new LoginException(e.getMessage());
- } catch (UnsupportedCallbackException e) {
+ } catch (IOException | UnsupportedCallbackException e) {
throw new LoginException(e.getMessage());
}
String userName = nameCallback.getName();
diff --git
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
index f91deeb..1436a35 100644
---
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
+++
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
@@ -162,9 +162,7 @@ public class OrbConfig {
Method addBindingMethod =
bootMgrClass.getMethod("add_binding", byte[].class,
org.omg.CORBA.Object.class);
addBindingMethod.invoke(bootMgr, key.getBytes(), object);
- } catch (ClassNotFoundException ex) {
- //Not supported by the orb. skip it.
- } catch (java.lang.reflect.InvocationTargetException ex) {
+ } catch (ClassNotFoundException |
java.lang.reflect.InvocationTargetException ex) {
//Not supported by the orb. skip it.
} catch (java.lang.Exception ex) {
throw new CorbaBindingException(ex.getMessage(), ex);
diff --git
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
index fbd3872..d2ab75c 100644
---
a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
+++
b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
@@ -196,10 +196,7 @@ public class SoapHeaderInterceptor extends
AbstractInDatabindingInterceptor {
};
v.setErrorHandler(errorHandler);
v.validate(ds);
- } catch (SAXException e) {
- throw new
Fault("COULD_NOT_VALIDATE_SOAP_HEADER_CAUSED_BY", LOG, e, e.getClass()
- .getCanonicalName(), e.getMessage());
- } catch (IOException e) {
+ } catch (SAXException | IOException e) {
throw new
Fault("COULD_NOT_VALIDATE_SOAP_HEADER_CAUSED_BY", LOG, e, e.getClass()
.getCanonicalName(), e.getMessage());
}
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java
index a34b10f..2e2488d 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java
@@ -92,9 +92,7 @@ public class Base64Type extends AegisType {
reader.next();
return bos.toByteArray();
- } catch (Base64Exception e) {
- throw new DatabindingException("Could not parse base64Binary
data.", e);
- } catch (XMLStreamException e) {
+ } catch (Base64Exception | XMLStreamException e) {
throw new DatabindingException("Could not parse base64Binary
data.", e);
}
}
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
index 1b8fa84..93dc78c 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
@@ -134,11 +134,7 @@ public class XMLBeanTypeInfo extends BeanTypeInfo {
}
customTypeObject.setTypeClass(typeClass);
customTypeObject.setSchemaType(schemaType);
- } catch (ClassNotFoundException e1) {
- //
- } catch (InstantiationException e2) {
- //
- } catch (IllegalAccessException e3) {
+ } catch (ClassNotFoundException | InstantiationException |
IllegalAccessException e1) {
//
}
}
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
index cc75745..6ea0632 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.jaxrs;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -31,11 +30,9 @@ import java.util.Set;
import javax.ws.rs.core.Application;
import org.apache.cxf.Bus;
-import org.apache.cxf.BusException;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.classloader.ClassLoaderUtils.ClassLoaderHolder;
import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.endpoint.EndpointException;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.endpoint.ServerImpl;
import org.apache.cxf.feature.Feature;
@@ -215,12 +212,6 @@ public class JAXRSServerFactoryBean extends
AbstractJAXRSFactoryBean {
throw re;
}
}
- } catch (EndpointException e) {
- throw new ServiceConstructionException(e);
- } catch (BusException e) {
- throw new ServiceConstructionException(e);
- } catch (IOException e) {
- throw new ServiceConstructionException(e);
} catch (Exception e) {
throw new ServiceConstructionException(e);
} finally {
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
index cbf383f..0980e36 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/JAASAuthenticationFilter.java
@@ -36,7 +36,6 @@ import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.UriBuilder;
import org.apache.cxf.common.util.StringUtils;
-import org.apache.cxf.interceptor.security.AuthenticationException;
import org.apache.cxf.interceptor.security.JAASLoginInterceptor;
import org.apache.cxf.interceptor.security.NamePasswordCallbackHandler;
import org.apache.cxf.jaxrs.impl.HttpHeadersImpl;
@@ -110,8 +109,6 @@ public class JAASAuthenticationFilter implements
ContainerRequestFilter {
Message m = JAXRSUtils.getCurrentMessage();
try {
interceptor.handleMessage(m);
- } catch (AuthenticationException ex) {
- context.abortWith(handleAuthenticationException(ex, m));
} catch (SecurityException ex) {
context.abortWith(handleAuthenticationException(ex, m));
}
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
index 0489b7a..5d30d9a 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
@@ -141,9 +141,7 @@ public class SOAPHandlerFaultInInterceptor extends
xmlReader = StaxUtils.createXMLStreamReader(bodySource);
xmlReader.nextTag();
xmlReader.nextTag(); // move past body tag
- } catch (SOAPException e) {
- e.printStackTrace();
- } catch (XMLStreamException e) {
+ } catch (SOAPException | XMLStreamException e) {
e.printStackTrace();
}
return xmlReader;
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
index 10c242c..3c27e09 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
@@ -293,9 +293,7 @@ public class SOAPHandlerInterceptor extends
xmlReader = StaxUtils.createXMLStreamReader(bodySource);
xmlReader.nextTag();
xmlReader.nextTag(); // move past body tag
- } catch (SOAPException e) {
- e.printStackTrace();
- } catch (XMLStreamException e) {
+ } catch (SOAPException | XMLStreamException e) {
e.printStackTrace();
}
return xmlReader;
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPMessageContextImpl.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPMessageContextImpl.java
index c26fab8..b7a9d43 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPMessageContextImpl.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPMessageContextImpl.java
@@ -102,9 +102,7 @@ public class SOAPMessageContextImpl extends
WrappedMessageContext implements SOA
}
}
return ret.toArray(new Object[0]);
- } catch (SOAPException e) {
- throw new WebServiceException(e);
- } catch (JAXBException e) {
+ } catch (SOAPException | JAXBException e) {
throw new WebServiceException(e);
}
}
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java
index ff7b196..78c4137 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java
@@ -306,10 +306,7 @@ public class MessageModeOutInterceptor extends
AbstractPhaseInterceptor<Message>
if (o instanceof Source) {
StaxUtils.copy((Source)o, new SAAJStreamWriter(part));
}
- } catch (SOAPException e) {
- throw new SoapFault("Error creating SOAPMessage", e,
- message.getVersion().getSender());
- } catch (XMLStreamException e) {
+ } catch (SOAPException | XMLStreamException e) {
throw new SoapFault("Error creating SOAPMessage", e,
message.getVersion().getSender());
}
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
index fd2a051..8b4e1a3 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
@@ -145,9 +145,7 @@ public class WebFaultOutInterceptor extends
FaultOutInterceptor {
} catch (InvocationTargetException e) {
throw new Fault(new
org.apache.cxf.common.i18n.Message("INVOCATION_TARGET_EXC", BUNDLE), e);
- } catch (IllegalAccessException e) {
- throw new Fault(new
org.apache.cxf.common.i18n.Message("COULD_NOT_INVOKE", BUNDLE), e);
- } catch (IllegalArgumentException e) {
+ } catch (IllegalAccessException | IllegalArgumentException e) {
throw new Fault(new
org.apache.cxf.common.i18n.Message("COULD_NOT_INVOKE", BUNDLE), e);
}
Service service = message.getExchange().getService();
@@ -224,11 +222,7 @@ public class WebFaultOutInterceptor extends
FaultOutInterceptor {
}
return ret;
}
- } catch (ClassNotFoundException e1) {
- //ignore
- } catch (InstantiationException e) {
- //ignore
- } catch (IllegalAccessException e) {
+ } catch (ClassNotFoundException | InstantiationException |
IllegalAccessException e1) {
//ignore
}
}
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java
index 21ef3b0..e56b6ce 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spring/JaxWsWebServicePublisherBeanPostProcessor.java
@@ -193,9 +193,7 @@ public class JaxWsWebServicePublisherBeanPostProcessor
public void setServletConfig(ServletConfig servletConfig) {
try {
shadowCxfServlet = (Servlet)servletClass.newInstance();
- } catch (InstantiationException e) {
- throw new RuntimeException(e);
- } catch (IllegalAccessException e) {
+ } catch (InstantiationException | IllegalAccessException e) {
throw new RuntimeException(e);
}
try {
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
index c7655a8..4e98839 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBean.java
@@ -397,9 +397,7 @@ public class JaxWsServiceFactoryBean extends
ReflectionServiceFactoryBean {
}
}
}
- } catch (SecurityException e) {
- throw new ServiceConstructionException(e);
- } catch (NoSuchMethodException e) {
+ } catch (SecurityException | NoSuchMethodException e) {
throw new ServiceConstructionException(e);
}
diff --git
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
index 8c2d911..ae2dacb 100644
---
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
+++
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientFactoryBean.java
@@ -93,9 +93,7 @@ public class ClientFactoryBean extends
AbstractWSDLBasedEndpointFactory {
applyProperties(ep);
client = createClient(ep);
initializeAnnotationInterceptors(ep, getServiceClass());
- } catch (EndpointException e) {
- throw new ServiceConstructionException(e);
- } catch (BusException e) {
+ } catch (EndpointException | BusException e) {
throw new ServiceConstructionException(e);
}
applyFeatures(client);
diff --git
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
index b314dca..a76c3ba 100644
---
a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
+++
b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
@@ -189,11 +189,7 @@ public class ServerFactoryBean extends
AbstractWSDLBasedEndpointFactory {
}
}
- } catch (EndpointException e) {
- throw new ServiceConstructionException(e);
- } catch (BusException e) {
- throw new ServiceConstructionException(e);
- } catch (IOException e) {
+ } catch (EndpointException | BusException | IOException e) {
throw new ServiceConstructionException(e);
}
@@ -331,4 +327,4 @@ public class ServerFactoryBean extends
AbstractWSDLBasedEndpointFactory {
return getWsdlURL();
}
-}
\ No newline at end of file
+}
diff --git
a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java
index 590b062..b4427f2 100644
---
a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java
+++
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JavascriptTestUtilities.java
@@ -211,11 +211,7 @@ public class JavascriptTestUtilities extends TestUtilities
{
// so that the stock test for IE can gracefully fail.
rhinoContext.evaluateString(rhinoScope, "var window = new
Object();", "<internal>", 0, null);
- } catch (IllegalAccessException e) {
- throw new RuntimeException(e);
- } catch (InstantiationException e) {
- throw new RuntimeException(e);
- } catch (InvocationTargetException e) {
+ } catch (IllegalAccessException | InstantiationException |
InvocationTargetException e) {
throw new RuntimeException(e);
} finally {
Context.exit();
diff --git
a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsNamedNodeMap.java
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsNamedNodeMap.java
index b363c6e..9778e39 100644
---
a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsNamedNodeMap.java
+++
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsNamedNodeMap.java
@@ -48,11 +48,7 @@ public class JsNamedNodeMap extends ScriptableObject {
public static void register(ScriptableObject scope) {
try {
ScriptableObject.defineClass(scope, JsNamedNodeMap.class);
- } catch (IllegalAccessException e) {
- throw new RuntimeException(e);
- } catch (InstantiationException e) {
- throw new RuntimeException(e);
- } catch (InvocationTargetException e) {
+ } catch (IllegalAccessException | InstantiationException |
InvocationTargetException e) {
throw new RuntimeException(e);
}
}
diff --git
a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
index 4a9d4d1..c53f811 100644
---
a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
+++
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomNode.java
@@ -54,11 +54,7 @@ public class JsSimpleDomNode extends ScriptableObject {
public static void register(ScriptableObject scope) {
try {
ScriptableObject.defineClass(scope, JsSimpleDomNode.class);
- } catch (IllegalAccessException e) {
- throw new RuntimeException(e);
- } catch (InstantiationException e) {
- throw new RuntimeException(e);
- } catch (InvocationTargetException e) {
+ } catch (IllegalAccessException | InstantiationException |
InvocationTargetException e) {
throw new RuntimeException(e);
}
}
diff --git
a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomParser.java
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomParser.java
index 9e8dc1d..405ae90 100644
---
a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomParser.java
+++
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsSimpleDomParser.java
@@ -58,11 +58,7 @@ public class JsSimpleDomParser extends ScriptableObject {
public static void register(ScriptableObject scope) {
try {
ScriptableObject.defineClass(scope, JsSimpleDomParser.class);
- } catch (IllegalAccessException e) {
- throw new RuntimeException(e);
- } catch (InstantiationException e) {
- throw new RuntimeException(e);
- } catch (InvocationTargetException e) {
+ } catch (IllegalAccessException | InstantiationException |
InvocationTargetException e) {
throw new RuntimeException(e);
}
}
@@ -80,9 +76,7 @@ public class JsSimpleDomParser extends ScriptableObject {
Document document;
try {
document = documentBuilder.parse(inputSource);
- } catch (SAXException e) {
- throw new RuntimeException(e);
- } catch (IOException e) {
+ } catch (SAXException | IOException e) {
throw new RuntimeException(e);
}
diff --git
a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java
index 8c67add..a9e7080 100644
---
a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java
+++
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/JsXMLHttpRequest.java
@@ -46,7 +46,6 @@ import java.util.logging.Logger;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.TransformerFactoryConfigurationError;
@@ -118,11 +117,7 @@ public class JsXMLHttpRequest extends ScriptableObject {
public static void register(ScriptableObject scope) {
try {
ScriptableObject.defineClass(scope, JsXMLHttpRequest.class);
- } catch (IllegalAccessException e) {
- throw new RuntimeException(e);
- } catch (InstantiationException e) {
- throw new RuntimeException(e);
- } catch (InvocationTargetException e) {
+ } catch (IllegalAccessException | InstantiationException |
InvocationTargetException e) {
throw new RuntimeException(e);
}
}
@@ -459,11 +454,7 @@ public class JsXMLHttpRequest extends ScriptableObject {
TransformerFactory transformerFactory =
TransformerFactory.newInstance();
transformerFactory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING,
true);
transformerFactory.newTransformer().transform(source, result);
- } catch (TransformerConfigurationException e) {
- throw new RuntimeException(e);
- } catch (TransformerException e) {
- throw new RuntimeException(e);
- } catch (TransformerFactoryConfigurationError e) {
+ } catch (TransformerException | TransformerFactoryConfigurationError
e) {
throw new RuntimeException(e);
}
return baos.toByteArray();
diff --git
a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/MtoMImpl.java
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/MtoMImpl.java
index ed4ca6d..9f74b29 100644
---
a/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/MtoMImpl.java
+++
b/rt/javascript/javascript-tests/src/test/java/org/apache/cxf/javascript/fortest/MtoMImpl.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
import javax.activation.DataHandler;
import javax.jws.WebService;
@@ -50,8 +49,6 @@ public class MtoMImpl implements MtoM {
InputStreamReader isr = new InputStreamReader(someData, "utf-8");
IOUtils.copy(isr, sw, 4096);
returnData = sw.toString();
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git
a/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java
b/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java
index 9119bbe..e9aa88e 100644
---
a/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java
+++
b/rt/management/src/test/java/org/apache/cxf/management/jmx/export/ModelMBeanAssemblerTest.java
@@ -84,9 +84,7 @@ public class ModelMBeanAssemblerTest extends Assert {
try {
ton = new ObjectName("org.apache.cxf:Type=testInstrumentation");
- } catch (MalformedObjectNameException e) {
- e.printStackTrace();
- } catch (NullPointerException e) {
+ } catch (MalformedObjectNameException | NullPointerException e) {
e.printStackTrace();
}
diff --git
a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java
b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java
index 060d859..18946a3 100644
---
a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java
+++
b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/odata/ODataParser.java
@@ -284,13 +284,8 @@ public class ODataParser<T> extends
AbstractSearchConditionParser<T> {
final FilterExpression expression =
parser.parseFilterString(searchExpression);
final FilterExpressionVisitor visitor = new
FilterExpressionVisitor(condition);
return (SearchCondition< T >)expression.accept(visitor);
- } catch (ODataMessageException ex) {
- throw new SearchParseException(ex);
- } catch (ODataApplicationException ex) {
- throw new SearchParseException(ex);
- } catch (InstantiationException ex) {
- throw new SearchParseException(ex);
- } catch (IllegalAccessException ex) {
+ } catch (ODataMessageException | ODataApplicationException
+ | InstantiationException | IllegalAccessException ex) {
throw new SearchParseException(ex);
}
}
diff --git
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/KeyManagementUtils.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/KeyManagementUtils.java
index 5a7942b..bf4c25d 100644
---
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/KeyManagementUtils.java
+++
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/KeyManagementUtils.java
@@ -77,10 +77,7 @@ public final class KeyManagementUtils {
byte[] digest =
MessageDigestUtils.createDigest(certs[0].getEncoded(),
digestAlgo);
return Base64UrlUtility.encode(digest);
- } catch (NoSuchAlgorithmException ex) {
- LOG.log(Level.FINE, "Error creating digest", ex);
- throw new JoseException(ex);
- } catch (CertificateEncodingException ex) {
+ } catch (NoSuchAlgorithmException | CertificateEncodingException
ex) {
LOG.log(Level.FINE, "Error creating digest", ex);
throw new JoseException(ex);
}
@@ -493,16 +490,7 @@ public final class KeyManagementUtils {
}
}
}
- } catch (KeyStoreException e) {
- LOG.log(Level.WARNING, "X509Certificate can not be loaded: ", e);
- throw new JoseException(e);
- } catch (CertificateEncodingException e) {
- LOG.log(Level.WARNING, "X509Certificate can not be loaded: ", e);
- throw new JoseException(e);
- } catch (NoSuchAlgorithmException e) {
- LOG.log(Level.WARNING, "X509Certificate can not be loaded: ", e);
- throw new JoseException(e);
- } catch (Base64Exception e) {
+ } catch (KeyStoreException | CertificateEncodingException |
NoSuchAlgorithmException | Base64Exception e) {
LOG.log(Level.WARNING, "X509Certificate can not be loaded: ", e);
throw new JoseException(e);
}
diff --git
a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java
b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java
index 8b60bb5..b2abff4 100644
---
a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java
+++
b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthRequestFilter.java
@@ -24,7 +24,6 @@ import javax.ws.rs.container.PreMatching;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.Provider;
-import net.oauth.OAuthProblemException;
import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.jaxrs.ext.MessageContextImpl;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
@@ -47,8 +46,6 @@ public class OAuthRequestFilter extends AbstractAuthFilter
implements ContainerR
OAuthInfo info = handleOAuthRequest(mc.getHttpServletRequest());
setSecurityContext(mc, m, info);
- } catch (OAuthProblemException e) {
- context.abortWith(Response.status(401).header("WWW-Authenticate",
"OAuth").build());
} catch (Exception e) {
context.abortWith(Response.status(401).header("WWW-Authenticate",
"OAuth").build());
}
diff --git
a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthServletFilter.java
b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthServletFilter.java
index 7012b9a..b43d771 100644
---
a/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthServletFilter.java
+++
b/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthServletFilter.java
@@ -31,7 +31,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
-import net.oauth.OAuthProblemException;
import net.oauth.server.OAuthServlet;
import org.apache.cxf.common.util.PropertyUtils;
import org.apache.cxf.rs.security.oauth.data.OAuthContext;
@@ -60,8 +59,6 @@ public class OAuthServletFilter extends AbstractAuthFilter
implements javax.serv
OAuthInfo info = handleOAuthRequest(req);
req = setSecurityContext(req, info);
chain.doFilter(req, resp);
- } catch (OAuthProblemException e) {
- OAuthServlet.handleException(resp, e, "");
} catch (Exception e) {
OAuthServlet.handleException(resp, e, "");
}
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java
index dc793c8..79813d1 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java
@@ -118,8 +118,6 @@ public abstract class AbstractAccessTokenValidator {
// Convert the HTTP Authorization scheme data into a token
accessTokenV =
handler.validateAccessToken(getMessageContext(), authScheme, authSchemeData,
extraProps);
- } catch (OAuthServiceException ex) {
-
AuthorizationUtils.throwAuthorizationFailure(Collections.singleton(authScheme),
realm);
} catch (RuntimeException ex) {
AuthorizationUtils.throwAuthorizationFailure(Collections.singleton(authScheme),
realm);
}
diff --git
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
index 4a1e27e..8bf89e2 100644
---
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
+++
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractRequestAssertionConsumerHandler.java
@@ -280,9 +280,7 @@ public abstract class
AbstractRequestAssertionConsumerHandler extends AbstractSS
tokenStream = !postBinding && isSupportDeflateEncoding()
? new DeflateEncoderDecoder().inflateToken(deflatedToken)
: new ByteArrayInputStream(deflatedToken);
- } catch (Base64Exception ex) {
- throw ExceptionUtils.toBadRequestException(ex, null);
- } catch (DataFormatException ex) {
+ } catch (Base64Exception | DataFormatException ex) {
throw ExceptionUtils.toBadRequestException(ex, null);
}
} else {
diff --git
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
index 45b59ae..f329744 100644
---
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
+++
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecInInterceptor.java
@@ -133,13 +133,7 @@ public class XmlSecInInterceptor extends
AbstractPhaseInterceptor<Message> imple
inboundXMLSec.processInMessage(originalXmlStreamReader, null,
securityEventListener);
inMsg.setContent(XMLStreamReader.class, newXmlStreamReader);
- } catch (XMLStreamException e) {
- throwFault(e.getMessage(), e);
- } catch (XMLSecurityException e) {
- throwFault(e.getMessage(), e);
- } catch (IOException e) {
- throwFault(e.getMessage(), e);
- } catch (UnsupportedCallbackException e) {
+ } catch (XMLStreamException | XMLSecurityException | IOException |
UnsupportedCallbackException e) {
throwFault(e.getMessage(), e);
}
}
diff --git
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
index f7baa28..a035261 100644
---
a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
+++
b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlSecOutInterceptor.java
@@ -129,8 +129,6 @@ public class XmlSecOutInterceptor extends
AbstractPhaseInterceptor<Message> {
newXMLStreamWriter = outboundXMLSec.processOutMessage(os,
encoding);
message.setContent(XMLStreamWriter.class, newXMLStreamWriter);
- } catch (XMLSecurityException e) {
- throwFault(e.getMessage(), e);
} catch (Exception e) {
throwFault(e.getMessage(), e);
}
diff --git
a/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/HmacUtils.java
b/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/HmacUtils.java
index 8b8aa5a..6dc85a2 100644
--- a/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/HmacUtils.java
+++ b/rt/security/src/main/java/org/apache/cxf/rt/security/crypto/HmacUtils.java
@@ -56,9 +56,7 @@ public final class HmacUtils {
public static Mac getMac(String macAlgoJavaName, String provider) {
try {
return provider == null ? Mac.getInstance(macAlgoJavaName) :
Mac.getInstance(macAlgoJavaName, provider);
- } catch (NoSuchAlgorithmException e) {
- throw new SecurityException(e);
- } catch (NoSuchProviderException e) {
+ } catch (NoSuchAlgorithmException | NoSuchProviderException e) {
throw new SecurityException(e);
}
}
@@ -120,9 +118,7 @@ public final class HmacUtils {
} else {
hmac.init(secretKey, spec);
}
- } catch (InvalidKeyException e) {
- throw new SecurityException(e);
- } catch (InvalidAlgorithmParameterException e) {
+ } catch (InvalidKeyException | InvalidAlgorithmParameterException e) {
throw new SecurityException(e);
}
}
diff --git
a/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
b/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
index c87b28f..fd0a0c8 100644
---
a/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
+++
b/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
@@ -216,9 +216,7 @@ public class AsyncHTTPConduitTest extends
AbstractBusClientServerTestBase {
public void handleResponse(Response<GreetMeResponse> res) {
try {
res.get().getResponseType();
- } catch (InterruptedException e) {
- e.printStackTrace();
- } catch (ExecutionException e) {
+ } catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
}
}
@@ -309,9 +307,7 @@ public class AsyncHTTPConduitTest extends
AbstractBusClientServerTestBase {
if (c != Integer.parseInt(s)) {
System.out.println("Problem " + c + " != " + s);
}
- } catch (InterruptedException e) {
- e.printStackTrace();
- } catch (ExecutionException e) {
+ } catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
}
wdone[c] = true;
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
index 7dd9d42..63620b6 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
@@ -119,9 +119,7 @@ public class HTTPJettyTransportActivator
JettyHTTPServerEngine e =
factory.retrieveJettyHTTPServerEngine(port);
configure(e, properties);
- } catch (GeneralSecurityException e) {
- throw new ConfigurationException(null, null, e);
- } catch (IOException e) {
+ } catch (GeneralSecurityException | IOException e) {
throw new ConfigurationException(null, null, e);
}
}
diff --git
a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/NettyClientTest.java
b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/NettyClientTest.java
index 63586f0..5a23776 100644
---
a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/NettyClientTest.java
+++
b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/NettyClientTest.java
@@ -113,9 +113,7 @@ public class NettyClientTest extends
AbstractBusClientServerTestBase {
public void handleResponse(Response<GreetMeResponse> res) {
try {
res.get().getResponseType();
- } catch (InterruptedException e) {
- e.printStackTrace();
- } catch (ExecutionException e) {
+ } catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
}
}
@@ -136,9 +134,7 @@ public class NettyClientTest extends
AbstractBusClientServerTestBase {
public void handleResponse(Response<GreetMeLaterResponse> res) {
try {
response = res.get();
- } catch (InterruptedException e) {
- e.printStackTrace();
- } catch (ExecutionException e) {
+ } catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
}
}
diff --git
a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java
b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java
index a6c0dfd..1ecfaef 100644
---
a/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java
+++
b/rt/transports/http-netty/netty-client/src/test/java/org/apache/cxf/transport/http/netty/client/integration/SSLNettyClientTest.java
@@ -104,9 +104,7 @@ public class SSLNettyClientTest extends
AbstractBusClientServerTestBase {
public void handleResponse(Response<GreetMeResponse> res) {
try {
res.get().getResponseType();
- } catch (InterruptedException e) {
- e.printStackTrace();
- } catch (ExecutionException e) {
+ } catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
}
}
@@ -169,9 +167,7 @@ public class SSLNettyClientTest extends
AbstractBusClientServerTestBase {
public void handleResponse(Response<GreetMeLaterResponse> res) {
try {
response = res.get();
- } catch (InterruptedException e) {
- e.printStackTrace();
- } catch (ExecutionException e) {
+ } catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
}
}
diff --git
a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/osgi/HTTPUndertowTransportActivator.java
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/osgi/HTTPUndertowTransportActivator.java
index 2a54ce2..c041abb 100644
---
a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/osgi/HTTPUndertowTransportActivator.java
+++
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/osgi/HTTPUndertowTransportActivator.java
@@ -119,9 +119,7 @@ public class HTTPUndertowTransportActivator
UndertowHTTPServerEngine e =
factory.retrieveUndertowHTTPServerEngine(port);
configure(e, properties);
- } catch (GeneralSecurityException e) {
- throw new ConfigurationException(null, null, e);
- } catch (IOException e) {
+ } catch (GeneralSecurityException | IOException e) {
throw new ConfigurationException(null, null, e);
}
}
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
index 2129e29..a77a581 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
@@ -79,9 +79,7 @@ public abstract class AbstractSpnegoAuthSupplier {
byte[] token = getToken(authPolicy, spn, oid, message);
return HttpAuthHeader.AUTH_TYPE_NEGOTIATE + " " +
Base64Utility.encode(token);
- } catch (LoginException e) {
- throw new RuntimeException(e.getMessage(), e);
- } catch (GSSException e) {
+ } catch (LoginException | GSSException e) {
throw new RuntimeException(e.getMessage(), e);
}
}
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpConduitConfigApplier.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpConduitConfigApplier.java
index e65ee51..e0fcfe6 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpConduitConfigApplier.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HttpConduitConfigApplier.java
@@ -363,11 +363,7 @@ class HttpConduitConfigApplier {
Object obj;
try {
obj = Class.forName(v).newInstance();
- } catch (InstantiationException e) {
- throw new RuntimeException(e);
- } catch (IllegalAccessException e) {
- throw new RuntimeException(e);
- } catch (ClassNotFoundException e) {
+ } catch (InstantiationException | IllegalAccessException |
ClassNotFoundException e) {
throw new RuntimeException(e);
}
if (obj instanceof HttpAuthSupplier) {
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
index d098de5..95f5c14 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/spring/HttpConduitBeanDefinitionParser.java
@@ -211,17 +211,7 @@ public class HttpConduitBeanDefinitionParser
+ elementClass.getName() + ".");
}
bean.addPropertyValue(elementName, obj);
- } catch (IllegalAccessException ex) {
- throw new IllegalArgumentException(
- "Element '" + elementName + "' could not load "
- + classProperty
- + " - " + ex);
- } catch (ClassNotFoundException ex) {
- throw new IllegalArgumentException(
- "Element '" + elementName + "' could not load "
- + classProperty
- + " - " + ex);
- } catch (InstantiationException ex) {
+ } catch (IllegalAccessException | ClassNotFoundException |
InstantiationException ex) {
throw new IllegalArgumentException(
"Element '" + elementName + "' could not load "
+ classProperty
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/DefaultHostnameVerifier.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/DefaultHostnameVerifier.java
index 7446174..8c02547 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/DefaultHostnameVerifier.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/DefaultHostnameVerifier.java
@@ -267,9 +267,7 @@ public final class DefaultHostnameVerifier implements
HostnameVerifier {
if (value != null) {
return value.toString();
}
- } catch (NoSuchElementException ignore) {
- //
- } catch (NamingException ignore) {
+ } catch (NoSuchElementException | NamingException ignore) {
//
}
}
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
index 75a94f4..81365fb 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletContextResourceResolver.java
@@ -105,9 +105,7 @@ public class ServletContextResourceResolver implements
ResourceResolver {
urlMap.put(url.toString(), url);
return clz.cast(url);
}
- } catch (MalformedURLException e1) {
- //ignore
- } catch (URISyntaxException e) {
+ } catch (MalformedURLException | URISyntaxException e1) {
//ignore
}
} else if (clz.isAssignableFrom(InputStream.class)) {
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListJAASAuthenticator.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListJAASAuthenticator.java
index 04e2bdb..075be00 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListJAASAuthenticator.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/ServiceListJAASAuthenticator.java
@@ -153,9 +153,7 @@ public class ServiceListJAASAuthenticator {
try {
transformed = Base64Utility.decode(srcString);
return new String(transformed, "ISO-8859-1");
- } catch (UnsupportedEncodingException uee) {
- return srcString;
- } catch (Base64Exception e) {
+ } catch (UnsupportedEncodingException | Base64Exception e) {
return srcString;
}
}
diff --git
a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerImpl.java
b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerImpl.java
index 3318088..c8690f5 100644
---
a/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerImpl.java
+++
b/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerImpl.java
@@ -211,9 +211,7 @@ public class SubscriptionManagerImpl implements
SubscriptionManager {
if (!EPRInspectionTool.containsUsableEPR(notifyTo.getValue())) {
throw new NoDeliveryMechanismEstablished();
}
- } catch (NullPointerException npe) {
- throw new NoDeliveryMechanismEstablished();
- } catch (IndexOutOfBoundsException ioobe) {
+ } catch (NullPointerException | IndexOutOfBoundsException npe) {
throw new NoDeliveryMechanismEstablished();
}
ticket.setDelivery(request);
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java
index 950f95b..ae7ac9a 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java
@@ -314,9 +314,7 @@ public class RMEndpoint {
int seq = acknowledgementSequence.incrementAndGet();
try {
modelMBean.sendNotification(new
AcknowledgementNotification(this, seq, ssid, number));
- } catch (RuntimeOperationsException e) {
- LOG.log(Level.WARNING, "Error handling JMX notification", e);
- } catch (MBeanException e) {
+ } catch (RuntimeOperationsException | MBeanException e) {
LOG.log(Level.WARNING, "Error handling JMX notification", e);
}
}
diff --git
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
index 79b298c..beff782 100644
---
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
+++
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
@@ -1110,9 +1110,7 @@ public class RMTxStore implements RMStore {
}
Class.forName(driverClassName);
con = DriverManager.getConnection(url, userName, password);
- } catch (ClassNotFoundException ex) {
- LogUtils.log(LOG, Level.SEVERE, "CONNECT_EXC", ex);
- } catch (SQLException ex) {
+ } catch (ClassNotFoundException | SQLException ex) {
LogUtils.log(LOG, Level.SEVERE, "CONNECT_EXC", ex);
}
}
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSerializer.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSerializer.java
index 65a65d8..6b4bbcd 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSerializer.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/StaxSerializer.java
@@ -25,7 +25,6 @@ import java.io.InputStream;
import java.io.OutputStreamWriter;
import java.io.SequenceInputStream;
import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
import java.util.HashMap;
import java.util.Map;
import java.util.Vector;
@@ -178,8 +177,6 @@ public class StaxSerializer extends AbstractSerializer {
outputStreamWriter.write("</dummy>");
outputStreamWriter.close();
v.add(byteArrayOutputStream.createInputStream());
- } catch (UnsupportedEncodingException e) {
- throw new XMLEncryptionException(e);
} catch (IOException e) {
throw new XMLEncryptionException(e);
}
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
index dfb1108..4eefbc6 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/UsernameTokenInterceptor.java
@@ -141,9 +141,7 @@ public class UsernameTokenInterceptor extends
AbstractTokenInterceptor {
if (principal instanceof UsernameTokenPrincipal) {
storeResults((UsernameTokenPrincipal)principal,
subject, message);
}
- } catch (WSSecurityException ex) {
- throw new Fault(ex);
- } catch (Base64DecodingException ex) {
+ } catch (WSSecurityException | Base64DecodingException ex) {
throw new Fault(ex);
}
}
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
index 2c2ee35..7968f51 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java
@@ -178,9 +178,7 @@ public class WSS4JStaxOutInterceptor extends
AbstractWSS4JStaxInterceptor {
newXMLStreamWriter = outboundWSSec.processOutMessage(os, encoding,
outboundSecurityContext);
mc.setContent(XMLStreamWriter.class, newXMLStreamWriter);
- } catch (WSSecurityException e) {
- throw new Fault(e);
- } catch (WSSPolicyException e) {
+ } catch (WSSecurityException | WSSPolicyException e) {
throw new Fault(e);
}
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
index ec3dba5..a5c23d6 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
@@ -359,10 +359,7 @@ public class AsymmetricBindingHandler extends
AbstractBindingBuilder {
}
}
}
- } catch (WSSecurityException ex) {
- LOG.log(Level.FINE, ex.getMessage(), ex);
- throw new Fault(ex);
- } catch (SOAPException ex) {
+ } catch (WSSecurityException | SOAPException ex) {
LOG.log(Level.FINE, ex.getMessage(), ex);
throw new Fault(ex);
}
diff --git
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java
index 283adee..7c00664 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java
@@ -402,11 +402,7 @@ class ClassReader extends ByteArrayInputStream {
} catch (InvocationTargetException e) {
try {
throw e.getTargetException();
- } catch (Error ex) {
- throw ex;
- } catch (RuntimeException ex) {
- throw ex;
- } catch (IOException ex) {
+ } catch (Error | RuntimeException | IOException ex) {
throw ex;
} catch (Throwable ex) {
pos = curPos;
diff --git
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
index 01822ab..4c66649 100644
---
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
+++
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
@@ -2160,9 +2160,7 @@ public class ReflectionServiceFactoryBean extends
org.apache.cxf.service.factory
try {
Method m = exClass.getMethod("getFaultInfo");
return m.getReturnType();
- } catch (SecurityException e) {
- throw new ServiceConstructionException(e);
- } catch (NoSuchMethodException e) {
+ } catch (SecurityException | NoSuchMethodException e) {
throw new ServiceConstructionException(e);
}
}
diff --git
a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/CatalogWSDLLocator.java
b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/CatalogWSDLLocator.java
index 2d8d6e7..b44e7b4 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/CatalogWSDLLocator.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl11/CatalogWSDLLocator.java
@@ -19,7 +19,6 @@
package org.apache.cxf.wsdl11;
import java.io.IOException;
-import java.net.MalformedURLException;
import javax.wsdl.xml.WSDLLocator;
@@ -64,8 +63,6 @@ public class CatalogWSDLLocator implements WSDLLocator {
if (s != null) {
result = resolver.resolve(s, null);
}
- } catch (MalformedURLException e) {
- //ignore
} catch (IOException e) {
//ignore
}
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
index befdbf5..97f4291 100644
---
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
@@ -133,9 +133,6 @@ public class RequestParser {
);
}
}
- } catch (STSException ex) {
- LOG.log(Level.WARNING, "", ex);
- throw ex;
} catch (RuntimeException ex) {
LOG.log(Level.WARNING, "", ex);
throw ex;
@@ -481,10 +478,7 @@ public class RequestParser {
}
}
}
- } catch (MarshalException e) {
- LOG.log(Level.WARNING, "", e);
- throw new STSException(e.getMessage(), e,
STSException.INVALID_REQUEST);
- } catch (KeyException e) {
+ } catch (MarshalException | KeyException e) {
LOG.log(Level.WARNING, "", e);
throw new STSException(e.getMessage(), e,
STSException.INVALID_REQUEST);
}
diff --git
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
index 58b012e..6aee58f 100644
---
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
+++
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java
@@ -166,9 +166,6 @@ public class X509TokenValidator implements TokenValidator {
X509Certificate cert =
x509Data.itemCertificate(0).getX509Certificate();
((X509Security)binarySecurity).setX509Certificate(cert);
}
- } catch (WSSecurityException ex) {
- LOG.log(Level.WARNING, "", ex);
- return response;
} catch (XMLSecurityException ex) {
LOG.log(Level.WARNING, "", ex);
return response;
diff --git
a/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
b/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
index 8c6b3da..c59ff69 100644
---
a/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
+++
b/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java
@@ -376,9 +376,7 @@ public class WSDiscoveryClient implements Closeable {
resetDispatch(h.getXAddrs().get(0));
}
}
- } catch (InterruptedException e) {
- // ?
- } catch (ExecutionException e) {
+ } catch (InterruptedException | ExecutionException e) {
// ?
}
}
@@ -422,9 +420,7 @@ public class WSDiscoveryClient implements Closeable {
resetDispatch(h.getXAddrs().get(0));
}
}
- } catch (InterruptedException e) {
- // ?
- } catch (ExecutionException e) {
+ } catch (InterruptedException | ExecutionException e) {
// ?
}
}
diff --git
a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPublisher.java
b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPublisher.java
index c43c3d2..c0fd7e2 100644
---
a/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPublisher.java
+++
b/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jms/JmsPublisher.java
@@ -100,11 +100,7 @@ public abstract class JmsPublisher extends
AbstractPublisher implements Consumer
jaxbContext.createMarshaller().marshal(notify, writer);
Message message = session.createTextMessage(writer.toString());
producer.send(message);
- } catch (JMSException e) {
- LOGGER.log(Level.WARNING, "Error dispatching message", e);
- } catch (JAXBException e) {
- LOGGER.log(Level.WARNING, "Error dispatching message", e);
- } catch (InvalidTopicException e) {
+ } catch (JMSException | JAXBException | InvalidTopicException e) {
LOGGER.log(Level.WARNING, "Error dispatching message", e);
} finally {
if (session != null) {
diff --git
a/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/validator/DateValidator.java
b/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/validator/DateValidator.java
index 87c9edf..609bbf8 100644
---
a/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/validator/DateValidator.java
+++
b/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/validator/DateValidator.java
@@ -49,9 +49,7 @@ public class DateValidator implements Validator {
try {
certificate.checkValidity(Date.from(now));
- } catch (CertificateNotYetValidException e) {
- return false;
- } catch (CertificateExpiredException e) {
+ } catch (CertificateNotYetValidException | CertificateExpiredException
e) {
return false;
}
/*
diff --git
a/services/xkms/xkms-x509-repo-ldap/src/main/java/org/apache/cxf/xkms/x509/repo/ldap/LdapCertificateRepo.java
b/services/xkms/xkms-x509-repo-ldap/src/main/java/org/apache/cxf/xkms/x509/repo/ldap/LdapCertificateRepo.java
index 5b81655..b490b61 100644
---
a/services/xkms/xkms-x509-repo-ldap/src/main/java/org/apache/cxf/xkms/x509/repo/ldap/LdapCertificateRepo.java
+++
b/services/xkms/xkms-x509-repo-ldap/src/main/java/org/apache/cxf/xkms/x509/repo/ldap/LdapCertificateRepo.java
@@ -110,9 +110,7 @@ public class LdapCertificateRepo implements CertificateRepo
{
}
}
return certificates;
- } catch (CertificateException e) {
- throw new RuntimeException(e.getMessage(), e);
- } catch (NamingException e) {
+ } catch (CertificateException | NamingException e) {
throw new RuntimeException(e.getMessage(), e);
}
}
@@ -133,11 +131,7 @@ public class LdapCertificateRepo implements
CertificateRepo {
}
}
return crls;
- } catch (CertificateException e) {
- throw new RuntimeException(e.getMessage(), e);
- } catch (NamingException e) {
- throw new RuntimeException(e.getMessage(), e);
- } catch (CRLException e) {
+ } catch (CertificateException | NamingException | CRLException e) {
throw new RuntimeException(e.getMessage(), e);
}
}
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BadgerFishProvider.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BadgerFishProvider.java
index d4906f2..4c9041d 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BadgerFishProvider.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BadgerFishProvider.java
@@ -84,9 +84,7 @@ public final class BadgerFishProvider
Object obj = unmarshaller.unmarshal(xsw);
xsw.close();
return obj;
- } catch (JAXBException e) {
- e.printStackTrace();
- } catch (XMLStreamException e) {
+ } catch (JAXBException | XMLStreamException e) {
e.printStackTrace();
}
@@ -108,9 +106,7 @@ public final class BadgerFishProvider
marshaller.marshal(obj, xsw);
xsw.close();
- } catch (JAXBException e) {
- e.printStackTrace();
- } catch (XMLStreamException e) {
+ } catch (JAXBException | XMLStreamException e) {
e.printStackTrace();
}
}
diff --git
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
index bae0237..a126402 100644
---
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
+++
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
@@ -536,9 +536,7 @@ public class ClientServerTest extends
AbstractBusClientServerTestBase {
try {
GreetMeLaterResponse reply = response.get();
replyBuffer = reply.getResponseType();
- } catch (InterruptedException ex) {
- ex.printStackTrace();
- } catch (ExecutionException ex) {
+ } catch (InterruptedException | ExecutionException ex) {
ex.printStackTrace();
}
}
diff --git
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/ClientServerWebSocketTest.java
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/ClientServerWebSocketTest.java
index 75ebaf6..6710477 100644
---
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/ClientServerWebSocketTest.java
+++
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/ClientServerWebSocketTest.java
@@ -378,9 +378,7 @@ public class ClientServerWebSocketTest extends
AbstractBusClientServerTestBase {
try {
GreetMeLaterResponse reply = response.get();
replyBuffer = reply.getResponseType();
- } catch (InterruptedException ex) {
- ex.printStackTrace();
- } catch (ExecutionException ex) {
+ } catch (InterruptedException | ExecutionException ex) {
ex.printStackTrace();
}
}
diff --git
a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
index d63f7c3..88755af 100644
---
a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
+++
b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
@@ -204,9 +204,7 @@ public class JMSClientServerTest extends
AbstractBusClientServerTestBase {
Thread thread2 = Thread.currentThread();
assertNotSame(thread, thread2);
assertEquals("Hello " + expected, response.get());
- } catch (InterruptedException e) {
- e.printStackTrace();
- } catch (ExecutionException e) {
+ } catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
}
}
diff --git
a/systests/transports/src/test/java/org/apache/cxf/systest/https/constraints/CertConstraintsTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/https/constraints/CertConstraintsTest.java
index 30bfe11..7955266 100644
---
a/systests/transports/src/test/java/org/apache/cxf/systest/https/constraints/CertConstraintsTest.java
+++
b/systests/transports/src/test/java/org/apache/cxf/systest/https/constraints/CertConstraintsTest.java
@@ -113,8 +113,6 @@ public class CertConstraintsTest extends
AbstractBusClientServerTestBase {
try {
assertEquals(port.greetMe("Kitty"), "Hello Kitty");
fail("Failure expected");
- } catch (javax.xml.ws.soap.SOAPFaultException ex) {
- // expected
} catch (javax.xml.ws.WebServiceException ex) {
// expected
}
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/TestUserPasswordLoginModule.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/TestUserPasswordLoginModule.java
index 28d91ef..d6097fc 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/TestUserPasswordLoginModule.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/TestUserPasswordLoginModule.java
@@ -55,9 +55,7 @@ public class TestUserPasswordLoginModule implements
LoginModule {
Callback[] callbacks = new Callback[] {nameCallback, passwordCallback};
try {
this.callbackHandler.handle(callbacks);
- } catch (IOException e) {
- throw new LoginException(e.getMessage());
- } catch (UnsupportedCallbackException e) {
+ } catch (IOException | UnsupportedCallbackException e) {
throw new LoginException(e.getMessage());
}
String userName = nameCallback.getName();
diff --git
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java
index 713a6f4..5891f28 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/JavaToJS.java
@@ -106,10 +106,6 @@ public class JavaToJS extends AbstractCXFToolContainer {
JavaToJS.class.getResourceAsStream("java2js.xml"),
false,
pargs);
- } catch (ToolException ex) {
- System.err.println("Java2JS Error : " + ex.getMessage());
- System.err.println();
- ex.printStackTrace();
} catch (Exception ex) {
System.err.println("Java2JS Error : " + ex.getMessage());
System.err.println();
@@ -124,4 +120,4 @@ public class JavaToJS extends AbstractCXFToolContainer {
throw new ToolException(msg, new BadUsageException(getUsage(),
errors));
}
}
-}
\ No newline at end of file
+}
diff --git
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java
index 0958ceb..1645982 100644
---
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java
+++
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java
@@ -21,7 +21,6 @@ package org.apache.cxf.tools.java2js.processor;
import java.io.BufferedWriter;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
@@ -105,8 +104,6 @@ public class JavaToJSProcessor implements Processor {
serviceBuilder.walk();
String serviceJavascript = serviceBuilder.getCode();
writer.append(serviceJavascript);
- } catch (FileNotFoundException e) {
- throw new ToolException(e);
} catch (IOException e) {
throw new ToolException(e);
} finally {
diff --git
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
index 78a6090..d55d51d 100644
---
a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
+++
b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WSDL11Generator.java
@@ -118,9 +118,7 @@ public class WSDL11Generator extends
AbstractGenerator<Definition> {
wex.printStackTrace();
} catch (FileNotFoundException fnfe) {
throw new ToolException("Output file " + file + " not found",
fnfe);
- } catch (IOException e) {
- e.printStackTrace();
- } catch (XMLStreamException e) {
+ } catch (IOException | XMLStreamException e) {
e.printStackTrace();
}
return def;
diff --git
a/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptProcessor.java
b/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptProcessor.java
index fb09b46..08b8085 100644
---
a/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptProcessor.java
+++
b/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScriptProcessor.java
@@ -22,7 +22,6 @@ package org.apache.cxf.tools.wsdlto.javascript;
import java.io.BufferedWriter;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
@@ -95,8 +94,6 @@ public class WSDLToJavaScriptProcessor extends
WSDLToProcessor {
serviceBuilder.walk();
String serviceJavascript = serviceBuilder.getCode();
writer.append(serviceJavascript);
- } catch (FileNotFoundException e) {
- throw new ToolException(e);
} catch (IOException e) {
throw new ToolException(e);
} finally {
diff --git
a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToSoap.java
b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToSoap.java
index a481ce4..b3410e1 100644
--- a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToSoap.java
+++ b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/WSDLToSoap.java
@@ -124,10 +124,6 @@ public class WSDLToSoap extends AbstractCXFToolContainer {
WSDLToSoap.class.getResourceAsStream("wsdl2soap.xml"),
false,
pargs);
- } catch (ToolException ex) {
- System.err.println("WSDL2Soap Error : " + ex.getMessage());
- System.err.println();
- ex.printStackTrace();
} catch (Exception ex) {
System.err.println("WSDL2Soap Error : " + ex.getMessage());
System.err.println();
