You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/08/04 16:07:24 UTC
[01/12] cxf git commit: Fix unessary elses and static references in
integration
Repository: cxf
Updated Branches:
refs/heads/master 7443f0109 -> 13bcc2362
Fix unessary elses and static references in integration
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/813c06f6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/813c06f6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/813c06f6
Branch: refs/heads/master
Commit: 813c06f6946c8e065c57af224741b2f245c6aafe
Parents: d111a1d
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 10:19:52 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 10:40:43 2017 -0400
----------------------------------------------------------------------
.../java/org/apache/cxf/cdi/CdiBusBean.java | 4 +-
.../cxf/cdi/JAXRSCdiResourceExtension.java | 2 +-
.../cxf/connector/CXFConnectionParam.java | 6 +-
.../cxf/jca/core/classloader/Handler.java | 3 +-
.../jca/core/classloader/PlugInClassLoader.java | 14 ++---
.../classloader/PlugInClassLoaderHelper.java | 58 ++++++++++----------
.../AbstractManagedConnectionFactoryImpl.java | 9 ++-
.../cxf/jca/cxf/ConnectionFactoryImpl.java | 3 +-
.../org/apache/cxf/jca/cxf/JCABusFactory.java | 7 +--
.../org/apache/cxf/jca/jarloader/JarLoader.java | 3 +-
.../outbound/ManagedConnectionFactoryImpl.java | 3 +-
.../ManagedConnectionFactoryImplTest.java | 1 +
.../cxf/jca/cxf/ConnectionFactoryImplTest.java | 2 +
.../cxf/ManagedConnectionFactoryImplTest.java | 1 +
.../cxf/jca/cxf/ManagedConnectionImplTest.java | 1 +
.../cxf/jca/cxf/ResourceAdapterImplTest.java | 2 +
16 files changed, 57 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/813c06f6/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java
----------------------------------------------------------------------
diff --git a/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java b/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java
index 523701e..f54ac4a 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java
@@ -26,7 +26,7 @@ import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.InjectionTarget;
import org.apache.cxf.Bus;
-import org.apache.cxf.bus.CXFBusFactory;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.extension.ExtensionManagerBus;
final class CdiBusBean extends AbstractCXFBean< ExtensionManagerBus > {
@@ -63,7 +63,7 @@ final class CdiBusBean extends AbstractCXFBean< ExtensionManagerBus > {
@Override
public ExtensionManagerBus create(final CreationalContext< ExtensionManagerBus > ctx) {
final ExtensionManagerBus instance = injectionTarget.produce(ctx);
- CXFBusFactory.possiblySetDefaultBus(instance);
+ BusFactory.possiblySetDefaultBus(instance);
instance.initialize();
injectionTarget.inject(instance, ctx);
http://git-wip-us.apache.org/repos/asf/cxf/blob/813c06f6/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
----------------------------------------------------------------------
diff --git a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
index 5ce8807..def5b02 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
@@ -111,7 +111,7 @@ public class JAXRSCdiResourceExtension implements Extension {
} else if (event.getAnnotated().isAnnotationPresent(Provider.class)) {
providerBeans.add(event.getBean());
} else if (event.getBean().getTypes().contains(javax.ws.rs.core.Feature.class)) {
- providerBeans.add((Bean< ? extends Feature >)event.getBean());
+ providerBeans.add(event.getBean());
} else if (event.getBean().getTypes().contains(Feature.class)) {
featureBeans.add((Bean< ? extends Feature >)event.getBean());
} else if (CdiBusBean.CXF.equals(event.getBean().getName())
http://git-wip-us.apache.org/repos/asf/cxf/blob/813c06f6/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java b/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java
index dd062d6..7bd1110 100644
--- a/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java
+++ b/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java
@@ -103,9 +103,8 @@ public class CXFConnectionParam {
public int hashCode() {
if (getServiceName() != null) {
return getInterface().hashCode() ^ getServiceName().hashCode();
- } else {
- return getInterface().hashCode() ^ (getAddress() != null ? getAddress().hashCode() : 1);
}
+ return getInterface().hashCode() ^ (getAddress() != null ? getAddress().hashCode() : 1);
}
public String toString() {
@@ -122,8 +121,7 @@ public class CXFConnectionParam {
private boolean areEquals(Object obj1, Object obj2) {
if (obj1 == null) {
return null == obj2;
- } else {
- return obj1.equals(obj2);
}
+ return obj1.equals(obj2);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/813c06f6/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/Handler.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/Handler.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/Handler.java
index 14e7d0d..753da32 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/Handler.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/Handler.java
@@ -42,9 +42,8 @@ public class Handler extends URLStreamHandler {
if (bytes != null) {
return new java.io.ByteArrayInputStream(bytes);
- } else {
- throw new java.io.IOException(url.getPath() + " not found");
}
+ throw new java.io.IOException(url.getPath() + " not found");
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/813c06f6/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
index 7cb3ee7..b350bc2 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
@@ -143,15 +143,13 @@ public class PlugInClassLoader extends SecureClassLoader {
if (bytes != null) {
return defineClass(name, bytes, 0, bytes.length, protectionDomain);
- } else {
- LOG.config("can't find name " + name + " , try to using the ploader");
- Class<?> result = ploader.loadClass(name);
- if (null == result) {
- throw new ClassNotFoundException(name);
- } else {
- return result;
- }
}
+ LOG.config("can't find name " + name + " , try to using the ploader");
+ Class<?> result = ploader.loadClass(name);
+ if (null == result) {
+ throw new ClassNotFoundException(name);
+ }
+ return result;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/813c06f6/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
index 052c169..a00ec6a 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
@@ -62,37 +62,35 @@ public final class PlugInClassLoaderHelper {
} catch (java.net.MalformedURLException mue) {
throw new IOException(mue.getMessage());
}
- } else {
- // something with !/
- // check for a nested directory reference
- if (isNestedDirectoryReference(name)) {
- throw new IOException(
- "Accessing contents of directories within jars is currently not supported");
- } else {
- String enclosingJar = name.substring(0, name.lastIndexOf("!/") + 2);
- String resourceName = name.substring(name.lastIndexOf("!/") + 2);
- Map<?, ?> jarMap = JarLoader.getJarContents(enclosingJar);
-
- if (null != jarMap && jarMap.containsKey(resourceName)) {
- byte bytes[] = (byte[])jarMap.get(resourceName);
-
- // this class will not be looked for again
- // once it is loaded so to save memory we
- // remove it form the map, if it is not a
- // class we add it to the nonClasses cache,
- // this is only true for in memory cache.
- // REVISIT - this needs to be more specific,
- // some classes Home|Remote interfaces are
- // loaded multiple times - see remote class
- // downloading for the moment disable this
- // jarMap.remove(resourceName);
- //
- if (!name.endsWith(".class")) {
- nonClassesMap.put(name, bytes);
- }
- return bytes;
- }
+ }
+ // something with !/
+ // check for a nested directory reference
+ if (isNestedDirectoryReference(name)) {
+ throw new IOException(
+ "Accessing contents of directories within jars is currently not supported");
+ }
+ String enclosingJar = name.substring(0, name.lastIndexOf("!/") + 2);
+ String resourceName = name.substring(name.lastIndexOf("!/") + 2);
+ Map<?, ?> jarMap = JarLoader.getJarContents(enclosingJar);
+
+ if (null != jarMap && jarMap.containsKey(resourceName)) {
+ byte bytes[] = (byte[])jarMap.get(resourceName);
+
+ // this class will not be looked for again
+ // once it is loaded so to save memory we
+ // remove it form the map, if it is not a
+ // class we add it to the nonClasses cache,
+ // this is only true for in memory cache.
+ // REVISIT - this needs to be more specific,
+ // some classes Home|Remote interfaces are
+ // loaded multiple times - see remote class
+ // downloading for the moment disable this
+ // jarMap.remove(resourceName);
+ //
+ if (!name.endsWith(".class")) {
+ nonClassesMap.put(name, bytes);
}
+ return bytes;
}
// failed to locate the resource
http://git-wip-us.apache.org/repos/asf/cxf/blob/813c06f6/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
index 0168b08..cf3e6c6 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
@@ -85,12 +85,11 @@ public abstract class AbstractManagedConnectionFactoryImpl extends ResourceBean
if (!conn.isBound()) {
LOG.fine("Match against unbounded, con= " + conn + ", info=" + crInfo);
return conn;
- } else {
- if (isMatch(conn, crInfo, subject)) {
- LOG.fine("Match against bounded, con= " + conn + ", info=" + crInfo);
+ }
+ if (isMatch(conn, crInfo, subject)) {
+ LOG.fine("Match against bounded, con= " + conn + ", info=" + crInfo);
- return conn;
- }
+ return conn;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/813c06f6/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ConnectionFactoryImpl.java
index 902511a..5601de0 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ConnectionFactoryImpl.java
@@ -81,9 +81,8 @@ public class ConnectionFactoryImpl implements CXFConnectionFactory,
// non-managed, null Subject
ManagedConnection connection = managedConnectionFactory.createManagedConnection(null, reqInfo);
return connection.getConnection(null, reqInfo);
- } else {
- return connectionManager.allocateConnection(managedConnectionFactory, reqInfo);
}
+ return connectionManager.allocateConnection(managedConnectionFactory, reqInfo);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/813c06f6/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
index 82a73b4..46aa82e 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
@@ -83,10 +83,9 @@ public class JCABusFactory {
} catch (Exception ex) {
if (ex instanceof ResourceAdapterInternalException) {
throw (ResourceException)ex;
- } else {
- throw new ResourceAdapterInternalException(
- new Message("FAIL_TO_INITIALIZE_JCABUSFACTORY", BUNDLE).toString(), ex);
}
+ throw new ResourceAdapterInternalException(
+ new Message("FAIL_TO_INITIALIZE_JCABUSFACTORY", BUNDLE).toString(), ex);
} finally {
Thread.currentThread().setContextClassLoader(original);
}
@@ -258,7 +257,7 @@ public class JCABusFactory {
LOG.info("ejbServicePropertiesFile modified, initializing/updating servants");
initializeServantsFromProperties(loadProperties(propsFile.toURI().toURL()));
}
- Thread.sleep((long)pollIntervalSeconds * 1000L);
+ Thread.sleep(pollIntervalSeconds * 1000L);
} catch (Exception e) {
LOG.info("MonitorThread: failed to initialiseServantsFromProperties "
+ "with properties absolute path=" + propsFile.getAbsolutePath());
http://git-wip-us.apache.org/repos/asf/cxf/blob/813c06f6/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java b/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
index f587c1a..0844c89 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
@@ -124,9 +124,8 @@ public final class JarLoader {
if (name.indexOf("!/") != -1) {
return name.substring(0, name.indexOf("!/"));
- } else {
- return name;
}
+ return name;
}
private static void readArchive(String name) throws MalformedURLException, IOException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/813c06f6/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
index ba4bd07..98aa044 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
@@ -191,9 +191,8 @@ public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
if (resourceAdapter instanceof ResourceAdapterImpl) {
return ((ResourceAdapterImpl)resourceAdapter).getBootstrapContext()
.getWorkManager();
- } else {
- return null;
}
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/813c06f6/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
index 68b03f8..6913e6e 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
@@ -41,6 +41,7 @@ public class ManagedConnectionFactoryImplTest extends Assert {
@Test
+ @SuppressWarnings("cast")
public void testManagedConnectionFactoryImplInstanceOfResourceBean() throws Exception {
assertNotNull("mcf is not null", mcf);
assertTrue("ManagedConnectionFactoryImpl is ResourceBean", mcf instanceof ResourceBean);
http://git-wip-us.apache.org/repos/asf/cxf/blob/813c06f6/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
index 5ecd26f..cf0125f 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
@@ -54,11 +54,13 @@ public class ConnectionFactoryImplTest extends Assert {
}
@Test
+ @SuppressWarnings("cast")
public void testInstanceOfSerializable() throws Exception {
assertTrue("Instance of Serializable", cf instanceof Serializable);
}
@Test
+ @SuppressWarnings("cast")
public void testInstanceOfReferencable() throws Exception {
assertTrue("Instance of Referenceable", cf instanceof Referenceable);
http://git-wip-us.apache.org/repos/asf/cxf/blob/813c06f6/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
index 1a3cafb..d95dbda 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
@@ -231,6 +231,7 @@ public class ManagedConnectionFactoryImplTest extends Assert {
assertEquals("init was called once", 1, mcit.initCalledCount);
}
+ @SuppressWarnings("cast")
@Test
public void testCreateManagedConnection() throws Exception {
ManagedConnectionFactoryImplTester mcit = new ManagedConnectionFactoryImplTester();
http://git-wip-us.apache.org/repos/asf/cxf/blob/813c06f6/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
index e42cfda..c09b47b 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
@@ -45,6 +45,7 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
protected QName portName;
@Test
+ @SuppressWarnings("cast")
public void testInstanceOfConnection() throws Exception {
assertTrue("Instance of Connection", mci instanceof Connection);
((Connection)mci).close();
http://git-wip-us.apache.org/repos/asf/cxf/blob/813c06f6/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
index 3929e55..a96fda0 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
@@ -45,6 +45,7 @@ public class ResourceAdapterImplTest extends Assert {
}
@Test
+ @SuppressWarnings("cast")
public void testConstructorWithoutProperties() throws Exception {
ResourceAdapterImpl rai = new ResourceAdapterImpl();
assertTrue("constructed without props", rai instanceof ResourceAdapterImpl);
@@ -54,6 +55,7 @@ public class ResourceAdapterImplTest extends Assert {
}
@Test
+ @SuppressWarnings("cast")
public void testConstructorWithProperties() throws Exception {
Properties props = new Properties();
ResourceAdapterImpl rai = new ResourceAdapterImpl(props);
[08/12] cxf git commit: Fix unecessary elses and static references in
maven-plugins
Posted by dk...@apache.org.
Fix unecessary elses and static references in maven-plugins
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bb5f3b26
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bb5f3b26
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bb5f3b26
Branch: refs/heads/master
Commit: bb5f3b264c4d16b5545360b9c8a84138676a7c0a
Parents: 813c06f
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 10:21:21 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 10:40:44 2017 -0400
----------------------------------------------------------------------
.../cxf/maven_plugin/AbstractCodegenMoho.java | 43 ++++++++++----------
.../wsdl2java/WsdlOptionLoader.java | 3 +-
.../maven_plugin/javatowadl/DumpJavaDoc.java | 3 +-
.../maven_plugin/javatowadl/Java2WADLMojo.java | 5 +--
4 files changed, 25 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/bb5f3b26/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
index 6ae3a3d..c5e5a7f 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
@@ -434,29 +434,28 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
if (proxy.getHost() == null) {
throw new MojoExecutionException("Proxy in settings.xml has no host");
- } else {
- if (proxy.getHost() != null) {
- System.setProperty(HTTP_PROXY_HOST, proxy.getHost());
- }
- if (String.valueOf(proxy.getPort()) != null) {
- System.setProperty(HTTP_PROXY_PORT, String.valueOf(proxy.getPort()));
- }
- if (proxy.getNonProxyHosts() != null) {
- System.setProperty(HTTP_NON_PROXY_HOSTS, proxy.getNonProxyHosts());
- }
- if (!StringUtils.isEmpty(proxy.getUsername())
- && !StringUtils.isEmpty(proxy.getPassword())) {
- final String authUser = proxy.getUsername();
- final String authPassword = proxy.getPassword();
- Authenticator.setDefault(new Authenticator() {
- public PasswordAuthentication getPasswordAuthentication() {
- return new PasswordAuthentication(authUser, authPassword.toCharArray());
- }
- });
+ }
+ if (proxy.getHost() != null) {
+ System.setProperty(HTTP_PROXY_HOST, proxy.getHost());
+ }
+ if (String.valueOf(proxy.getPort()) != null) {
+ System.setProperty(HTTP_PROXY_PORT, String.valueOf(proxy.getPort()));
+ }
+ if (proxy.getNonProxyHosts() != null) {
+ System.setProperty(HTTP_NON_PROXY_HOSTS, proxy.getNonProxyHosts());
+ }
+ if (!StringUtils.isEmpty(proxy.getUsername())
+ && !StringUtils.isEmpty(proxy.getPassword())) {
+ final String authUser = proxy.getUsername();
+ final String authPassword = proxy.getPassword();
+ Authenticator.setDefault(new Authenticator() {
+ public PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(authUser, authPassword.toCharArray());
+ }
+ });
- System.setProperty(HTTP_PROXY_USER, authUser);
- System.setProperty(HTTP_PROXY_PORT, authPassword);
- }
+ System.setProperty(HTTP_PROXY_USER, authUser);
+ System.setProperty(HTTP_PROXY_PORT, authPassword);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/bb5f3b26/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java
index 6444e31..677d94e 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java
@@ -58,9 +58,8 @@ public final class WsdlOptionLoader {
WsdlOption option = new WsdlOption();
if (WsdlUtilities.fillWsdlOptionFromArtifact(option, artifact, outputDir)) {
return option;
- } else {
- return null;
}
+ return null;
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/bb5f3b26/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
index c84eade..8369efc 100644
--- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
+++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
@@ -96,9 +96,8 @@ public final class DumpJavaDoc {
if (foundTagOption) {
reporter.printError("Only one -dumpJavaDocFile option allowed.");
return false;
- } else {
- foundTagOption = true;
}
+ foundTagOption = true;
}
}
if (!foundTagOption) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/bb5f3b26/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
index 422aae5..8dae3b8 100644
--- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
+++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
@@ -330,10 +330,9 @@ public class Java2WADLMojo extends AbstractMojo {
private String getBaseURI() {
if (address != null) {
return address;
- } else {
- // the consumer may use the original target URI to figure out absolute URI
- return "/";
}
+ // the consumer may use the original target URI to figure out absolute URI
+ return "/";
}
[10/12] cxf git commit: Fix warnings in testutils
Posted by dk...@apache.org.
Fix warnings in testutils
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8f1d4751
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8f1d4751
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8f1d4751
Branch: refs/heads/master
Commit: 8f1d4751b3ed127584b4112b3bcd6d6096b4b012
Parents: aaa4010
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 10:40:19 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 10:40:44 2017 -0400
----------------------------------------------------------------------
.../greeter_control/AbstractGreeterImpl.java | 3 +--
.../jaxb_element_test/JaxbElementTestImpl.java | 3 +--
.../java/org/apache/cxf/test/XPathAssert.java | 28 +++++++++-----------
.../cxf/testutil/common/ServerLauncher.java | 19 +++++++------
.../AnnotatedGreeterImpl.java | 5 ++--
.../AnnotatedGreeterNoOverloadImpl.java | 5 ++--
.../AnotherDerivedGreeterImpl.java | 5 ++--
.../DerivedGreeterImpl.java | 5 ++--
.../RPCLitGreeterImpl.java | 3 +--
9 files changed, 33 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f1d4751/testutils/src/main/java/org/apache/cxf/greeter_control/AbstractGreeterImpl.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/cxf/greeter_control/AbstractGreeterImpl.java b/testutils/src/main/java/org/apache/cxf/greeter_control/AbstractGreeterImpl.java
index f8b8085..e311449 100644
--- a/testutils/src/main/java/org/apache/cxf/greeter_control/AbstractGreeterImpl.java
+++ b/testutils/src/main/java/org/apache/cxf/greeter_control/AbstractGreeterImpl.java
@@ -110,9 +110,8 @@ public class AbstractGreeterImpl implements Greeter {
fd.setMajor((short)2);
fd.setMinor((short)1);
throw new PingMeFault("Pings succeed only every other time.", fd);
- } else {
- LOG.fine("Executing operation pingMe");
}
+ LOG.fine("Executing operation pingMe");
}
public Response<PingMeResponse> pingMeAsync() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f1d4751/testutils/src/main/java/org/apache/cxf/jaxb_element_test/JaxbElementTestImpl.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/cxf/jaxb_element_test/JaxbElementTestImpl.java b/testutils/src/main/java/org/apache/cxf/jaxb_element_test/JaxbElementTestImpl.java
index 2bc0e39..b840df0 100644
--- a/testutils/src/main/java/org/apache/cxf/jaxb_element_test/JaxbElementTestImpl.java
+++ b/testutils/src/main/java/org/apache/cxf/jaxb_element_test/JaxbElementTestImpl.java
@@ -31,8 +31,7 @@ public class JaxbElementTestImpl implements JaxbElementTest {
public String newOperation(String in) {
if (in == null) {
return "in=null";
- } else {
- return "in=" + in;
}
+ return "in=" + in;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f1d4751/testutils/src/main/java/org/apache/cxf/test/XPathAssert.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/cxf/test/XPathAssert.java b/testutils/src/main/java/org/apache/cxf/test/XPathAssert.java
index 5284c3e..0d448f1 100644
--- a/testutils/src/main/java/org/apache/cxf/test/XPathAssert.java
+++ b/testutils/src/main/java/org/apache/cxf/test/XPathAssert.java
@@ -137,13 +137,12 @@ public final class XPathAssert {
String value2 = DOMUtils.getContent(result);
Assert.assertEquals(value, value2);
return;
- } else {
- o = createXPath(namespaces).compile(xpath)
- .evaluate(node, XPathConstants.STRING);
- if (o instanceof String) {
- Assert.assertEquals(value, (String)o);
- return;
- }
+ }
+ o = createXPath(namespaces).compile(xpath)
+ .evaluate(node, XPathConstants.STRING);
+ if (o instanceof String) {
+ Assert.assertEquals(value, o);
+ return;
}
throw new AssertionFailedError("No nodes were found for expression: "
+ xpath
@@ -172,14 +171,13 @@ public final class XPathAssert {
QName q2 = DOMUtils.createQName(value2, result);
Assert.assertEquals(value, q2);
return;
- } else {
- o = createXPath(namespaces).compile(xpath)
- .evaluate(node, XPathConstants.STRING);
- if (o instanceof String) {
- QName q2 = DOMUtils.createQName(o.toString(), node);
- Assert.assertEquals(value, q2);
- return;
- }
+ }
+ o = createXPath(namespaces).compile(xpath)
+ .evaluate(node, XPathConstants.STRING);
+ if (o instanceof String) {
+ QName q2 = DOMUtils.createQName(o.toString(), node);
+ Assert.assertEquals(value, q2);
+ return;
}
throw new AssertionFailedError("No nodes were found for expression: "
+ xpath
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f1d4751/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java b/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
index 6996432..ed2f0bf 100644
--- a/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
+++ b/testutils/src/main/java/org/apache/cxf/testutil/common/ServerLauncher.java
@@ -147,18 +147,17 @@ public class ServerLauncher {
ex.printStackTrace();
throw new IOException(ex.getMessage());
}
- } else {
- if (process != null) {
- if (!serverIsStopped) {
- try {
- signalStop();
- } catch (IOException ex) {
- //ignore
- }
+ }
+ if (process != null) {
+ if (!serverIsStopped) {
+ try {
+ signalStop();
+ } catch (IOException ex) {
+ //ignore
}
- waitForServerToStop();
- process.destroy();
}
+ waitForServerToStop();
+ process.destroy();
}
return serverPassed;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f1d4751/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterImpl.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterImpl.java b/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterImpl.java
index 0c8e175..a992f25 100644
--- a/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterImpl.java
+++ b/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterImpl.java
@@ -56,10 +56,9 @@ public class AnnotatedGreeterImpl {
public int getInvocationCount(String method) {
if (invocationCount.containsKey(method)) {
return invocationCount.get(method).intValue();
- } else {
- System.out.println("No invocation count for method: " + method);
- return 0;
}
+ System.out.println("No invocation count for method: " + method);
+ return 0;
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f1d4751/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterNoOverloadImpl.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterNoOverloadImpl.java b/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterNoOverloadImpl.java
index 3687388..8df14b3 100644
--- a/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterNoOverloadImpl.java
+++ b/testutils/src/main/java/org/apache/hello_world_soap_http/AnnotatedGreeterNoOverloadImpl.java
@@ -56,10 +56,9 @@ public class AnnotatedGreeterNoOverloadImpl {
public int getInvocationCount(String method) {
if (invocationCount.containsKey(method)) {
return invocationCount.get(method).intValue();
- } else {
- System.out.println("No invocation count for method: " + method);
- return 0;
}
+ System.out.println("No invocation count for method: " + method);
+ return 0;
}
@WebMethod
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f1d4751/testutils/src/main/java/org/apache/hello_world_soap_http/AnotherDerivedGreeterImpl.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/hello_world_soap_http/AnotherDerivedGreeterImpl.java b/testutils/src/main/java/org/apache/hello_world_soap_http/AnotherDerivedGreeterImpl.java
index 1e25685..0c97383 100644
--- a/testutils/src/main/java/org/apache/hello_world_soap_http/AnotherDerivedGreeterImpl.java
+++ b/testutils/src/main/java/org/apache/hello_world_soap_http/AnotherDerivedGreeterImpl.java
@@ -56,10 +56,9 @@ public class AnotherDerivedGreeterImpl implements GreeterEndpointInterface {
public int getInvocationCount(String method) {
if (invocationCount.containsKey(method)) {
return invocationCount.get(method).intValue();
- } else {
- System.out.println("No invocation count for method: " + method);
- return 0;
}
+ System.out.println("No invocation count for method: " + method);
+ return 0;
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f1d4751/testutils/src/main/java/org/apache/hello_world_soap_http/DerivedGreeterImpl.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/hello_world_soap_http/DerivedGreeterImpl.java b/testutils/src/main/java/org/apache/hello_world_soap_http/DerivedGreeterImpl.java
index 32e3fc9..b5ff92c 100644
--- a/testutils/src/main/java/org/apache/hello_world_soap_http/DerivedGreeterImpl.java
+++ b/testutils/src/main/java/org/apache/hello_world_soap_http/DerivedGreeterImpl.java
@@ -56,10 +56,9 @@ public class DerivedGreeterImpl implements Greeter {
public int getInvocationCount(String method) {
if (invocationCount.containsKey(method)) {
return invocationCount.get(method).intValue();
- } else {
- System.out.println("No invocation count for method: " + method);
- return 0;
}
+ System.out.println("No invocation count for method: " + method);
+ return 0;
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/8f1d4751/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java
----------------------------------------------------------------------
diff --git a/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java b/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java
index 7f0e7de..2fb81a1 100644
--- a/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java
+++ b/testutils/src/main/java/org/apache/hello_world_soap_http/RPCLitGreeterImpl.java
@@ -39,9 +39,8 @@ public class RPCLitGreeterImpl implements GreeterRPCLit {
//System.out.println("Message received: " + me + "\n");
if ("return null".equals(me)) {
return null;
- } else {
- return "Hello " + me;
}
+ return "Hello " + me;
}
public String sayHi() {
[07/12] cxf git commit: Fix a BUNCH more warnings
Posted by dk...@apache.org.
Fix a BUNCH more warnings
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/13bcc236
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/13bcc236
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/13bcc236
Branch: refs/heads/master
Commit: 13bcc2362509c6d893ed21fff9461d576fda1ccc
Parents: 8f1d475
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 10:40:30 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 10:40:44 2017 -0400
----------------------------------------------------------------------
.../apache/cxf/osgi/itests/jaxrs/BookStore.java | 17 ++--
.../apache/cxf/clustering/RetryStrategy.java | 5 +-
.../logging/event/DefaultLogEventMapper.java | 24 ++---
.../cxf/throttling/SimpleThrottlingManager.java | 3 +-
.../java/org/apache/cxf/jaxrs/JAXRSInvoker.java | 11 +--
.../org/apache/cxf/jaxrs/JAXRSServiceImpl.java | 3 +-
.../JAXRSServerFactoryBeanDefinitionParser.java | 3 +-
.../cxf/jaxrs/ext/MessageContextImpl.java | 3 +-
.../org/apache/cxf/jaxrs/ext/xml/XMLSource.java | 9 +-
.../jaxrs/impl/AbstractResponseContextImpl.java | 8 +-
.../cxf/jaxrs/impl/AsyncResponseImpl.java | 3 +-
.../jaxrs/impl/CacheControlHeaderProvider.java | 18 ++--
.../jaxrs/impl/ContainerRequestContextImpl.java | 11 +--
.../apache/cxf/jaxrs/impl/HttpHeadersImpl.java | 34 +++----
.../jaxrs/impl/HttpServletRequestFilter.java | 6 +-
.../apache/cxf/jaxrs/impl/LinkBuilderImpl.java | 19 ++--
.../cxf/jaxrs/impl/LinkHeaderProvider.java | 3 +-
.../cxf/jaxrs/impl/MediaTypeHeaderProvider.java | 6 +-
.../org/apache/cxf/jaxrs/impl/MetadataMap.java | 10 +-
.../cxf/jaxrs/impl/NewCookieHeaderProvider.java | 6 +-
.../apache/cxf/jaxrs/impl/PathSegmentImpl.java | 3 +-
.../cxf/jaxrs/impl/ReaderInterceptorMBR.java | 2 +-
.../cxf/jaxrs/impl/ResponseBuilderImpl.java | 3 +-
.../org/apache/cxf/jaxrs/impl/ResponseImpl.java | 26 +++---
.../jaxrs/provider/AbstractJAXBProvider.java | 3 +-
.../cxf/jaxrs/provider/ProviderFactory.java | 4 +-
.../provider/RequestDispatcherProvider.java | 2 +-
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 2 +-
.../validation/JAXRSBeanValidationInvoker.java | 2 +-
.../jaxb/jaxbelement/ParamJAXBElement.java | 11 +--
.../jaxrs/provider/DataSourceProviderTest.java | 4 +-
.../provider/FormEncodingProviderTest.java | 39 ++++----
.../provider/PrimitiveTextProviderTest.java | 2 +-
.../cxf/jaxrs/provider/ProviderFactoryTest.java | 2 +-
.../cxf/jaxrs/provider/SourceProviderTest.java | 2 +-
.../cxf/jaxrs/provider/XPathProviderTest.java | 2 +-
.../cxf/jaxws/EndpointReferenceBuilder.java | 2 +-
.../blueprint/EndpointDefinitionParser.java | 6 +-
.../dynamic/JaxWsDynamicClientFactory.java | 3 +-
.../logical/LogicalHandlerOutInterceptor.java | 4 +-
.../handler/soap/SOAPHandlerInterceptor.java | 3 +-
.../apache/cxf/jaxws/SEIWithJAXBAnnoTest.java | 4 +-
.../cxf/jaxws/dispatch/DispatchOpTest.java | 5 +-
.../apache/cxf/jaxws/dispatch/DispatchTest.java | 5 +-
.../jaxws/handler/HandlerChainInvokerTest.java | 16 ++--
.../endpoint/dynamic/DynamicClientFactory.java | 8 +-
.../ServerFactoryBeanDefinitionParser.java | 3 +-
.../ResponseTimeMessageInInterceptor.java | 4 +-
.../ResponseTimeMessageInvokerInterceptor.java | 4 +-
.../ResponseTimeMessageOutInterceptor.java | 2 +-
.../cxf/jaxrs/client/ClientProviderFactory.java | 2 +-
.../cxf/jaxrs/client/JaxrsClientCallback.java | 4 +-
.../CacheControlClientReaderInterceptor.java | 2 +-
.../client/spec/ClientResponseContextImpl.java | 2 +-
.../cxf/jaxrs/model/wadl/WadlGenerator.java | 2 +-
.../provider/json/SimpleTypeJsonProvider.java | 2 +-
.../cxf/jaxrs/rx/provider/ObservableReader.java | 2 +-
.../ext/search/tika/TikaContentExtractor.java | 3 +-
.../jpa/JPATypedQueryVisitorFiqlTest.java | 2 +-
.../jpa/JPATypedQueryVisitorODataTest.java | 2 +-
.../jose/common/KeyManagementUtils.java | 2 +-
.../jwe/AesGcmContentEncryptionAlgorithm.java | 4 +-
.../security/jose/jws/JwsJsonConsumerTest.java | 6 +-
.../DefaultEHCacheOAuthDataProvider.java | 2 +-
.../provider/OAuthServerJoseJwtProducer.java | 4 +-
.../oauth2/services/AccessTokenService.java | 2 +-
.../services/AuthorizationCodeGrantService.java | 2 +-
.../rs/security/oauth2/utils/EHCacheUtil.java | 2 +-
.../security/oidc/idp/FormIdTokenResponse.java | 2 +-
.../rs/security/oidc/utils/OidcUtilsTest.java | 4 +-
.../saml/sso/EHCacheTokenReplayCache.java | 4 +-
.../cxf/rs/security/saml/sso/EHCacheUtil.java | 2 +-
.../saml/sso/SamlPostBindingFilter.java | 2 +-
.../saml/sso/state/EHCacheSPStateManager.java | 4 +-
.../saml/sso/AbstractSAMLCallbackHandler.java | 6 +-
.../saml/sso/CombinedValidatorTest.java | 6 +-
.../saml/sso/SAMLResponseValidatorTest.java | 2 +-
.../saml/sso/SAMLSSOResponseValidatorTest.java | 2 +-
.../cxf/rs/security/common/RSSecurityUtils.java | 2 +-
.../apache/cxf/rs/security/saml/SAMLUtils.java | 2 +-
.../interceptor/WSS4JBasicAuthValidator.java | 6 +-
.../http_jetty/JettyHTTPServerEngine.java | 2 +-
.../JettyHTTPServerEngineFactoryHolder.java | 4 +-
.../http_jetty/JettyHTTPDestinationTest.java | 8 +-
.../http/netty/client/NettyHttpConduit.java | 4 +-
.../netty/server/NettyHttpDestinationTest.java | 8 +-
.../UndertowHTTPServerEngineFactoryHolder.java | 4 +-
.../osgi/HTTPUndertowTransportActivator.java | 2 +-
.../UndertowHTTPDestinationTest.java | 8 +-
.../http/auth/AbstractSpnegoAuthSupplier.java | 2 +-
.../HttpConduitBPBeanDefinitionParser.java | 3 +-
.../HttpDestinationBPBeanDefinitionParser.java | 3 +-
.../cxf/transport/servlet/CXFServlet.java | 2 +-
.../cxf/transport/jms/JMSHeaderTypeTest.java | 2 +-
.../apache/cxf/transport/udp/UDPConduit.java | 2 +-
.../websocket/ahc/AhcWebSocketConduit.java | 2 +-
.../apache/cxf/ws/addressing/soap/MAPCodec.java | 8 +-
.../ws/addressing/soap/VersionTransformer.java | 87 ++++++------------
.../cxf/ws/addressing/soap/MAPCodecTest.java | 96 ++++++++++----------
.../policy/ClientPolicyInFaultInterceptor.java | 2 +-
.../cxf/ws/policy/PolicyInInterceptor.java | 2 +-
.../cxf/ws/policy/PolicyOutInterceptor.java | 2 +-
.../policy/ServerPolicyOutFaultInterceptor.java | 2 +-
.../cxf/ws/rm/persistence/PersistenceUtils.java | 2 +-
.../cxf/ws/rm/policy/RM12AssertionBuilder.java | 3 +-
.../cxf/ws/rm/policy/RMPolicyUtilities.java | 5 +-
.../FragmentDialectLanguageXPath10.java | 2 +-
.../wsdl/interceptors/BareInInterceptor.java | 3 +-
.../org/apache/cxf/xkms/cache/EHCacheUtil.java | 2 +-
.../provider/XkmsCryptoProviderFactory.java | 7 +-
.../cxf/systest/grizzly/EndpointAPITest.java | 4 +-
.../validators/CustomValidatorJAXBTest.java | 6 +-
.../org/apache/cxf/systest/jaxrs/BookStore.java | 2 +-
.../jaxrs/JAXRSClientServerSpringBookTest.java | 2 +-
.../extraction/JAXRSClientServerTikaTest.java | 2 +-
.../jaxrs/websocket/WebSocketTestClient.java | 2 +-
.../kerberos/common/SecurityTestUtil.java | 6 +-
.../jaxrs/kerberos/JAXRSKerberosBookTest.java | 6 +-
.../wssec/kerberos/KerberosTokenTest.java | 21 +++--
.../kerberos/wssec/spnego/SpnegoTokenTest.java | 13 +--
.../grants/CallbackHandlerLoginHandler.java | 4 +-
.../jaxrs/security/saml/JAXRSSamlTest.java | 4 +-
.../systest/jms/security/JMSWSSecurityTest.java | 22 ++---
.../apache/cxf/systest/jms/security/Server.java | 8 +-
.../systest/http_undertow/SessionServer.java | 3 +-
.../http_undertow/UndertowBasicAuthServer.java | 3 +-
.../http_undertow/UndertowBasicAuthTest.java | 3 +-
.../http_undertow/UndertowDigestAuthTest.java | 5 +-
.../websocket/WebSocketTestClient.java | 2 +-
.../org/apache/cxf/https/ssl3/SSLv3Test.java | 33 +++----
.../org/apache/cxf/systest/http/BareServer.java | 3 +-
.../apache/cxf/systest/http/SessionServer.java | 3 +-
.../http_jetty/JettyBasicAuthServer.java | 3 +-
.../systest/http_jetty/JettyBasicAuthTest.java | 3 +-
.../systest/http_jetty/JettyDigestAuthTest.java | 5 +-
.../https/ciphersuites/CipherSuitesTest.java | 73 +++++++--------
.../https/clientauth/ClientAuthTest.java | 29 +++---
.../hostname/HostnameVerificationTest.java | 17 ++--
.../systest/https/trust/TrustManagerTest.java | 21 +++--
.../apache/cxf/systest/bus/BusShutdownTest.java | 3 +-
.../ws/rm/MessageCallbackOnewayTest.java | 2 +-
.../wssec/examples/saml/SamlTokenTest.java | 45 ++++-----
.../secconv/SecureConversationTest.java | 5 +-
.../wssec/examples/ut/UsernameTokenTest.java | 29 +++---
.../wssec/examples/x509/X509TokenTest.java | 17 ++--
.../systest/ws/addr_responses/HelloService.java | 2 +-
.../apache/cxf/systest/ws/addr_wsdl/Server.java | 5 +-
.../ws/addressing/AbstractGreeterImpl.java | 2 +-
.../systest/ws/addressing/HeaderVerifier.java | 14 +--
.../cxf/systest/ws/addressing/MAPTestBase.java | 6 +-
.../cxf/systest/ws/addressing/MAPVerifier.java | 10 +-
151 files changed, 574 insertions(+), 624 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
index 1cebd2b..08b735f 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
@@ -89,10 +89,9 @@ public class BookStore {
Book b = books.get(id);
if (b == null) {
return Response.status(Status.NOT_FOUND).build();
- } else {
- b.setName(book.getName());
- return Response.ok().build();
}
+ b.setName(book.getName());
+ return Response.ok().build();
}
@POST
@@ -132,12 +131,11 @@ public class BookStore {
Book b = books.get(book.getId());
if (b != null) {
return Response.status(Status.CONFLICT).build();
- } else {
- books.put(book.getId(), book);
- URI createdURI = UriBuilder.fromUri(ui.getAbsolutePath())
- .path(Long.toString(book.getId())).build();
- return Response.created(createdURI).build();
}
+ books.put(book.getId(), book);
+ URI createdURI = UriBuilder.fromUri(ui.getAbsolutePath())
+ .path(Long.toString(book.getId())).build();
+ return Response.created(createdURI).build();
}
@DELETE
@@ -147,9 +145,8 @@ public class BookStore {
Book b = books.remove(id);
if (b == null) {
return Response.status(Status.NOT_FOUND).build();
- } else {
- return Response.ok().build();
}
+ return Response.ok().build();
}
private void init() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RetryStrategy.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RetryStrategy.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RetryStrategy.java
index a6cb801..727bbdc 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RetryStrategy.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RetryStrategy.java
@@ -53,10 +53,9 @@ public class RetryStrategy extends SequentialStrategy {
// and then stay on the same address for maxNumberOfRetries
if (++counter <= maxNumberOfRetries) {
return true;
- } else {
- counter = 0;
- return false;
}
+ counter = 0;
+ return false;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
index 27b9813..c598263 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
@@ -164,9 +164,8 @@ public class DefaultLogEventMapper {
String query = safeGet(message, Message.QUERY_STRING);
if (query != null) {
return uri + "?" + query;
- } else {
- return uri;
}
+ return uri;
}
private boolean isBinaryContent(Message message) {
@@ -221,9 +220,8 @@ public class DefaultLogEventMapper {
boolean isOutbound = MessageUtils.isOutbound(message);
if (isRequestor) {
return isOutbound ? message : message.getExchange().getOutMessage();
- } else {
- return isOutbound ? message.getExchange().getInMessage() : message;
}
+ return isOutbound ? message.getExchange().getInMessage() : message;
}
private String getRestOperationName(Message curMessage) {
@@ -273,16 +271,13 @@ public class DefaultLogEventMapper {
if (isOutbound) {
if (isFault) {
return EventType.FAULT_OUT;
- } else {
- return isRequestor ? EventType.REQ_OUT : EventType.RESP_OUT;
- }
- } else {
- if (isFault) {
- return EventType.FAULT_IN;
- } else {
- return isRequestor ? EventType.RESP_IN : EventType.REQ_IN;
}
+ return isRequestor ? EventType.REQ_OUT : EventType.RESP_OUT;
+ }
+ if (isFault) {
+ return EventType.FAULT_IN;
}
+ return isRequestor ? EventType.RESP_IN : EventType.REQ_IN;
}
/**
@@ -296,10 +291,9 @@ public class DefaultLogEventMapper {
Object opName = message.getExchange().get("org.apache.cxf.resource.operation.name");
if (opName == null) {
return true;
- } else {
- Integer responseCode = (Integer)message.get(Message.RESPONSE_CODE);
- return (responseCode != null) && (responseCode >= 400);
}
+ Integer responseCode = (Integer)message.get(Message.RESPONSE_CODE);
+ return (responseCode != null) && (responseCode >= 400);
}
public void setEpInfo(Message message, final LogEvent event) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
----------------------------------------------------------------------
diff --git a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
index 39f580a..bda3889 100644
--- a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
+++ b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
@@ -47,9 +47,8 @@ public class SimpleThrottlingManager extends ThrottleResponse implements Throttl
if (counter.incrementAndGet() >= threshold) {
m.put(THROTTLED_KEY, true);
return this;
- } else {
- return null;
}
+ return null;
}
public int getThreshold() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
index c0ca2ff..dd18c01 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
@@ -126,10 +126,9 @@ public class JAXRSInvoker extends AbstractInvoker {
Object asyncObj = ar.getResponseObject();
if (asyncObj instanceof Throwable) {
return handleAsyncFault(exchange, ar, (Throwable)asyncObj);
- } else {
- setResponseContentTypeIfNeeded(exchange.getInMessage(), asyncObj);
- return new MessageContentsList(asyncObj);
}
+ setResponseContentTypeIfNeeded(exchange.getInMessage(), asyncObj);
+ return new MessageContentsList(asyncObj);
}
private Object handleAsyncFault(Exchange exchange, AsyncResponseImpl ar, Throwable t) {
@@ -313,9 +312,8 @@ public class JAXRSInvoker extends AbstractInvoker {
if (r != null) {
JAXRSUtils.setMessageContentType(exchange.getInMessage(), r);
return new MessageContentsList(r);
- } else {
- return null;
}
+ return null;
}
private void setResponseContentTypeIfNeeded(Message inMessage, Object response) {
@@ -375,9 +373,8 @@ public class JAXRSInvoker extends AbstractInvoker {
OperationResourceInfo ori = exchange.get(OperationResourceInfo.class);
ClassResourceInfo cri = ori.getClassResourceInfo();
return cri.getResourceProvider();
- } else {
- return (ResourceProvider)provider;
}
+ return (ResourceProvider)provider;
}
public Object getServiceObject(Exchange exchange) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java
index dc8e7ca..6866b3a 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java
@@ -101,9 +101,8 @@ public class JAXRSServiceImpl extends AbstractAttributedInterceptorProvider impl
Class<?> primaryClass = classResourceInfos.get(0).getServiceClass();
String ns = PackageUtils.getNamespace(PackageUtils.getPackageName(primaryClass));
return new QName(ns, primaryClass.getSimpleName());
- } else {
- return new QName(address, "WebClient");
}
+ return new QName(address, "WebClient");
}
public List<ClassResourceInfo> getClassResourceInfos() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java
index cb097e8..a9d3612 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java
@@ -36,6 +36,7 @@ import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.model.UserResource;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
@@ -136,7 +137,7 @@ public class JAXRSServerFactoryBeanDefinitionParser extends SimpleBPBeanDefiniti
bean.setInitMethod("init");
// We don't really want to delay the registration of our Server
- bean.setActivation(MutableBeanMetadata.ACTIVATION_EAGER);
+ bean.setActivation(ComponentMetadata.ACTIVATION_EAGER);
return bean;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
index 270bcdc..d63d857 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
@@ -125,9 +125,8 @@ public class MessageContextImpl implements MessageContext {
Object value = m.getContextualProperty(key.toString());
if (value == null && key.getClass() == Class.class) {
return m.getExchange().get((Class<?>)key);
- } else {
- return value;
}
+ return value;
}
public <T> T getContext(Class<T> contextClass) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
index 0b2cb53..14f1de2 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
@@ -114,9 +114,8 @@ public class XMLSource {
Node node = (Node)obj;
if (cls.isPrimitive() || cls == String.class) {
return (T)readPrimitiveValue(node, cls);
- } else {
- return readNode(node, cls);
}
+ return readNode(node, cls);
}
return cls.cast(evaluate(expression, namespaces, XPathConstants.STRING));
}
@@ -348,9 +347,8 @@ public class XMLSource {
if (String.class == cls) {
if (node.getNodeType() == Node.ELEMENT_NODE) {
return StaxUtils.toString((Element)node);
- } else {
- return cls.cast(node.getNodeValue());
}
+ return cls.cast(node.getNodeValue());
}
return InjectionUtils.convertStringToPrimitive(node.getNodeValue(), cls);
@@ -379,9 +377,8 @@ public class XMLSource {
try {
if (cls.getAnnotation(XmlRootElement.class) != null) {
return cls.cast(u.unmarshal(s));
- } else {
- return u.unmarshal(s, cls).getValue();
}
+ return u.unmarshal(s, cls).getValue();
} finally {
JAXBUtils.closeUnmarshaller(u);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java
index 94f7fa8..fd83cee 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java
@@ -124,7 +124,7 @@ public abstract class AbstractResponseContextImpl {
}
public void setEntity(Object entity, Annotation[] anns, MediaType mt) {
- ((ResponseImpl)r).setEntity(entity, anns);
+ r.setEntity(entity, anns);
if (mt != null) {
r.getMetadata().putSingle(HttpHeaders.CONTENT_TYPE, mt);
m.put(Message.CONTENT_TYPE, mt.toString());
@@ -132,18 +132,18 @@ public abstract class AbstractResponseContextImpl {
}
public void setEntity(Object entity) {
- ((ResponseImpl)r).setEntity(entity, getResponseEntityAnnotations());
+ r.setEntity(entity, getResponseEntityAnnotations());
}
protected Annotation[] getResponseEntityAnnotations() {
- return ((ResponseImpl)r).getEntityAnnotations();
+ return r.getEntityAnnotations();
}
public void setStatus(int status) {
m.getExchange().put(Message.RESPONSE_CODE, status);
m.put(Message.RESPONSE_CODE, status);
- ((ResponseImpl)r).setStatus(status);
+ r.setStatus(status);
}
public void setStatusInfo(StatusType status) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
index 80a7fe5..f52d308 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
@@ -265,9 +265,8 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
cont.suspend(AsyncResponse.NO_TIMEOUT);
initialSuspend = false;
return true;
- } else {
- return false;
}
+ return false;
}
@SuppressWarnings("resource") // Response that is built here shouldn't be closed here
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java
index 7b3b42e..10e529c 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java
@@ -129,10 +129,9 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
}
}
return values.toArray(new String[values.size()]);
- } else {
- String separator = getSeparator();
- return StringUtils.split(c, separator);
}
+ String separator = getSeparator();
+ return StringUtils.split(c, separator);
}
public String toString(CacheControl c) {
@@ -191,13 +190,12 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
String f = i == token.length() + 1 ? "" : token.substring(i + 1);
if (f.length() < 2 || !f.startsWith("\"") || !f.endsWith("\"")) {
return;
- } else {
- f = f.length() == 2 ? "" : f.substring(1, f.length() - 1);
- if (f.length() > 0) {
- String[] values = StringUtils.split(f, ",");
- for (String v : values) {
- fields.add(v.trim());
- }
+ }
+ f = f.length() == 2 ? "" : f.substring(1, f.length() - 1);
+ if (f.length() > 0) {
+ String[] values = StringUtils.split(f, ",");
+ for (String v : values) {
+ fields.add(v.trim());
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
index 3dd0479..9d7bcc6 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
@@ -103,13 +103,12 @@ public class ContainerRequestContextImpl extends AbstractRequestContextImpl
if (!requestUriString.startsWith(baseUriString)) {
setRequestUri(requestUri, URI.create("/"));
return;
- } else {
- requestUriString = requestUriString.substring(baseUriString.length());
- if (requestUriString.isEmpty()) {
- requestUriString = "/";
- }
- requestUri = URI.create(requestUriString);
}
+ requestUriString = requestUriString.substring(baseUriString.length());
+ if (requestUriString.isEmpty()) {
+ requestUriString = "/";
+ }
+ requestUri = URI.create(requestUriString);
}
doSetRequestUri(requestUri);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
index bf144b7..b38b5b1 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
@@ -130,16 +130,15 @@ public class HttpHeadersImpl implements HttpHeaders {
String separator = getCookieSeparatorFromProperty();
if (separator != null) {
return separator;
- } else {
- if (value.contains(DOLLAR_CHAR)
- && (value.contains(COOKIE_VERSION_PARAM)
- || value.contains(COOKIE_PATH_PARAM)
- || value.contains(COOKIE_DOMAIN_PARAM))) {
- return DEFAULT_SEPARATOR;
- }
-
- return DEFAULT_COOKIE_SEPARATOR;
}
+ if (value.contains(DOLLAR_CHAR)
+ && (value.contains(COOKIE_VERSION_PARAM)
+ || value.contains(COOKIE_PATH_PARAM)
+ || value.contains(COOKIE_DOMAIN_PARAM))) {
+ return DEFAULT_SEPARATOR;
+ }
+
+ return DEFAULT_COOKIE_SEPARATOR;
}
private String getCookieSeparatorFromProperty() {
Object cookiePropValue = message.getContextualProperty(COOKIE_SEPARATOR_PROPERTY);
@@ -152,9 +151,8 @@ public class HttpHeadersImpl implements HttpHeaders {
throw ExceptionUtils.toInternalServerErrorException(null, null);
}
return separator;
- } else {
- return null;
}
+ return null;
}
public Locale getLanguage() {
@@ -177,9 +175,8 @@ public class HttpHeadersImpl implements HttpHeaders {
newHeaders.put(entry.getKey(), getRequestHeader(entry.getKey()));
}
return new MetadataMap<String, String>(Collections.unmodifiableMap(newHeaders), false);
- } else {
- return new MetadataMap<String, String>(Collections.unmodifiableMap(headers), false);
}
+ return new MetadataMap<String, String>(Collections.unmodifiableMap(headers), false);
}
public List<Locale> getAcceptableLanguages() {
@@ -263,13 +260,12 @@ public class HttpHeadersImpl implements HttpHeaders {
String[] ls = StringUtils.split(originalValue, sep);
if (ls.length == 1) {
return Collections.singletonList(ls[0].trim());
- } else {
- List<String> newValues = new ArrayList<>();
- for (String v : ls) {
- newValues.add(v.trim());
- }
- return newValues;
}
+ List<String> newValues = new ArrayList<>();
+ for (String v : ls) {
+ newValues.add(v.trim());
+ }
+ return newValues;
}
if (originalValue.startsWith("\"") && originalValue.endsWith("\"")) {
String actualValue = originalValue.length() == 2 ? ""
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
index 4e4b52a..119b891 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
@@ -58,9 +58,8 @@ public class HttpServletRequestFilter extends HttpServletRequestWrapper {
}
if (is instanceof ServletInputStream) {
return (ServletInputStream)is;
- } else {
- return super.getInputStream();
}
+ return super.getInputStream();
}
@Override
public String getParameter(String name) {
@@ -90,9 +89,8 @@ public class HttpServletRequestFilter extends HttpServletRequestWrapper {
map2.put(e.getKey(), e.getValue().toArray(new String[]{}));
}
return Collections.unmodifiableMap(map2);
- } else {
- return map1;
}
+ return map1;
}
@Override
public Enumeration<String> getParameterNames() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java
index caed5cd..e254344 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java
@@ -67,9 +67,8 @@ public class LinkBuilderImpl implements Builder {
if (!uri.isAbsolute() && baseUri != null && baseUri.isAbsolute()) {
UriBuilder linkUriBuilder = UriBuilder.fromUri(baseUri);
return HttpUtils.resolve(linkUriBuilder, uri);
- } else {
- return uri;
}
+ return uri;
}
@Override
@@ -190,14 +189,13 @@ public class LinkBuilderImpl implements Builder {
String rel = getRel();
if (rel == null) {
return Collections.<String>emptyList();
- } else {
- String[] values = rel.split(" ");
- List<String> rels = new ArrayList<>(values.length);
- for (String val : values) {
- rels.add(val.trim());
- }
- return rels;
}
+ String[] values = rel.split(" ");
+ List<String> rels = new ArrayList<>(values.length);
+ for (String val : values) {
+ rels.add(val.trim());
+ }
+ return rels;
}
@Override
@@ -256,9 +254,8 @@ public class LinkBuilderImpl implements Builder {
Link other = (Link)o;
return uri.equals(other.getUri())
&& getParams().equals(other.getParams());
- } else {
- return false;
}
+ return false;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
index 5bcc2f6..8eaaf4f 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
@@ -88,9 +88,8 @@ public class LinkHeaderProvider implements HeaderDelegate<Link> {
private String removeQuotesIfNeeded(String value) {
if (value.length() > 1 && value.startsWith("\"") && value.endsWith("\"")) {
return value.substring(1, value.length() - 1);
- } else {
- return value;
}
+ return value;
}
public String toString(Link link) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
index 281d0ca..a78f930 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
@@ -168,9 +168,8 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
return new MediaType(MediaType.MEDIA_TYPE_WILDCARD,
MediaType.MEDIA_TYPE_WILDCARD,
parameters);
- } else {
- return MediaType.WILDCARD_TYPE;
}
+ return MediaType.WILDCARD_TYPE;
}
}
@@ -187,8 +186,7 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
}
LOG.fine("Converting a malformed media type '" + mType + "' to '" + typeToString(mt) + "'");
return mt;
- } else {
- throw new IllegalArgumentException("Media type separator is missing");
}
+ throw new IllegalArgumentException("Media type separator is missing");
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
index f228737..328d3c8a 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
@@ -174,11 +174,10 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
public Set<K> keySet() {
if (!caseInsensitive) {
return m.keySet();
- } else {
- Set<K> set = new TreeSet<K>(new KeyComparator<K>());
- set.addAll(m.keySet());
- return set;
}
+ Set<K> set = new TreeSet<K>(new KeyComparator<K>());
+ set.addAll(m.keySet());
+ return set;
}
public List<V> put(K key, List<V> value) {
@@ -200,9 +199,8 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
if (caseInsensitive) {
K realKey = getMatchingKey(key);
return m.remove(realKey == null ? key : realKey);
- } else {
- return m.remove(key);
}
+ return m.remove(key);
}
public int size() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java
index 1ecc1b6..db1aeb2 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java
@@ -21,6 +21,7 @@ package org.apache.cxf.jaxrs.impl;
import java.util.Date;
+import javax.ws.rs.core.Cookie;
import javax.ws.rs.core.NewCookie;
import javax.ws.rs.ext.RuntimeDelegate.HeaderDelegate;
@@ -59,7 +60,7 @@ public class NewCookieHeaderProvider implements HeaderDelegate<NewCookie> {
boolean isSecure = false;
Date expires = null;
boolean httpOnly = false;
- int version = NewCookie.DEFAULT_VERSION;
+ int version = Cookie.DEFAULT_VERSION;
String[] tokens = StringUtils.split(c, ";");
for (String token : tokens) {
@@ -153,9 +154,8 @@ public class NewCookieHeaderProvider implements HeaderDelegate<NewCookie> {
}
buff.append('"');
return buff.toString();
- } else {
- return value == null ? "" : value;
}
+ return value == null ? "" : value;
}
static String maybeQuoteAll(String value) {
return maybeQuote(TSPECIALS_ALL, value);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PathSegmentImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PathSegmentImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PathSegmentImpl.java
index e558ec5..08fef01 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PathSegmentImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PathSegmentImpl.java
@@ -58,9 +58,8 @@ public class PathSegmentImpl implements PathSegment {
int index = path.indexOf(';');
if (index == -1) {
return null;
- } else {
- return path.substring(index);
}
+ return path.substring(index);
}
public String toString() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorMBR.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorMBR.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorMBR.java
index fcf890d..d39dffd 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorMBR.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorMBR.java
@@ -56,7 +56,7 @@ public class ReaderInterceptorMBR implements ReaderInterceptor {
})
@Override
public Object aroundReadFrom(ReaderInterceptorContext c) throws IOException, WebApplicationException {
- Class entityCls = (Class)c.getType();
+ Class entityCls = c.getType();
Type entityType = c.getGenericType();
MediaType entityMt = c.getMediaType();
Annotation[] entityAnns = c.getAnnotations();
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
index 49f3dbf..bf797c2 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
@@ -279,9 +279,8 @@ public class ResponseBuilderImpl extends ResponseBuilder implements Cloneable {
public ResponseBuilder allow(Set<String> methods) {
if (methods == null) {
return allow();
- } else {
- return allow(methods.toArray(new String[methods.size()]));
}
+ return allow(methods.toArray(new String[methods.size()]));
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
index ce81189..3f8c541 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
@@ -167,28 +167,26 @@ public final class ResponseImpl extends Response {
private List<String> toListOfStrings(String headerName, List<Object> values) {
if (values == null) {
return null;
- } else {
- List<String> stringValues = new ArrayList<>(values.size());
- HeaderDelegate<Object> hd = HttpUtils.getHeaderDelegate(values.get(0));
- for (Object value : values) {
- String actualValue = hd == null ? value.toString() : hd.toString(value);
- stringValues.add(actualValue);
- }
- return stringValues;
}
+ List<String> stringValues = new ArrayList<>(values.size());
+ HeaderDelegate<Object> hd = HttpUtils.getHeaderDelegate(values.get(0));
+ for (Object value : values) {
+ String actualValue = hd == null ? value.toString() : hd.toString(value);
+ stringValues.add(actualValue);
+ }
+ return stringValues;
}
public Set<String> getAllowedMethods() {
List<Object> methodValues = metadata.get(HttpHeaders.ALLOW);
if (methodValues == null) {
return Collections.emptySet();
- } else {
- Set<String> methods = new HashSet<>();
- for (Object o : methodValues) {
- methods.add(o.toString());
- }
- return methods;
}
+ Set<String> methods = new HashSet<>();
+ for (Object o : methodValues) {
+ methods.add(o.toString());
+ }
+ return methods;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
index 5edc28d..6ef6b1b 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
@@ -308,9 +308,8 @@ public abstract class AbstractJAXBProvider<T> extends AbstractConfigurableProvid
}
if (jaxbElementClassNames.contains(cls.getName())) {
return cls;
- } else {
- return getJaxbElementClass(cls.getSuperclass());
}
+ return getJaxbElementClass(cls.getSuperclass());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index dc129b9..9ceed02 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -703,11 +703,11 @@ public abstract class ProviderFactory {
.getGenericInterfaces()[0]).getActualTypeArguments()[0];
if (type == Object.class) {
theProviderComparator =
- (Comparator<?>)(new ProviderInfoClassComparator((Comparator<Object>)theProviderComparator));
+ new ProviderInfoClassComparator((Comparator<Object>)theProviderComparator);
}
List<T> theProviders = (List<T>)listOfProviders;
Comparator<? super T> theComparator = (Comparator<? super T>)theProviderComparator;
- Collections.sort((List<T>)theProviders, theComparator);
+ Collections.sort(theProviders, theComparator);
}
private void sortContextResolvers() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
index 9e1ac3f..a715500 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
@@ -277,7 +277,7 @@ public class RequestDispatcherProvider extends AbstractConfigurableProvider
private String getPathFromMessageContext() {
if (mc != null) {
- Object resourcePathProp = (String)mc.get(MESSAGE_RESOURCE_PATH_PROPERTY);
+ Object resourcePathProp = mc.get(MESSAGE_RESOURCE_PATH_PROPERTY);
if (resourcePathProp != null) {
StringBuilder sb = new StringBuilder();
if (locationPrefix != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
index 42f18a9..4c286a6 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
@@ -1350,7 +1350,7 @@ public final class JAXRSUtils {
} else {
MessageBodyReader<?> provider = ((ReaderInterceptorMBR)readers.get(0)).getMBR();
@SuppressWarnings("rawtypes")
- Class cls = (Class)targetTypeClass;
+ Class cls = targetTypeClass;
return provider.readFrom(
cls, parameterType, parameterAnnotations, mediaType,
new HttpHeadersImpl(m).getRequestHeaders(), is);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInvoker.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInvoker.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInvoker.java
index 0611351..96ae9c3 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInvoker.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInvoker.java
@@ -53,7 +53,7 @@ public class JAXRSBeanValidationInvoker extends JAXRSInvoker {
if (response instanceof MessageContentsList) {
MessageContentsList list = (MessageContentsList)response;
if (list.size() == 1) {
- Object entity = ((MessageContentsList)list).get(0);
+ Object entity = list.get(0);
if (entity instanceof Response) {
theProvider.validateReturnValue(serviceObject, m, ((Response)entity).getEntity());
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/fortest/jaxb/jaxbelement/ParamJAXBElement.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/fortest/jaxb/jaxbelement/ParamJAXBElement.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/fortest/jaxb/jaxbelement/ParamJAXBElement.java
index b57b111..e1693fb 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/fortest/jaxb/jaxbelement/ParamJAXBElement.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/fortest/jaxb/jaxbelement/ParamJAXBElement.java
@@ -21,22 +21,17 @@ package org.apache.cxf.jaxrs.fortest.jaxb.jaxbelement;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
-@SuppressWarnings({
- "unchecked", "rawtypes"
-})
-//CHECKSTYLE:OFF
public class ParamJAXBElement extends JAXBElement<ParamType> {
- private static final long serialVersionUID = 4994571526736505284L;
protected static final QName NAME = new QName("http://jaxbelement/10", "param");
+ private static final long serialVersionUID = 4994571526736505284L;
public ParamJAXBElement(ParamType value) {
- super(NAME, ((Class) ParamType.class), null, value);
+ super(NAME, ParamType.class, null, value);
}
public ParamJAXBElement() {
- super(NAME, ((Class) ParamType.class), null, null);
+ super(NAME, ParamType.class, null, null);
}
}
-//CHECKSTYLE:ON
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
index 687a8b8..4051c25 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
@@ -39,7 +39,7 @@ public class DataSourceProviderTest extends Assert {
@Test
public void testReadDataHandler() throws Exception {
DataSourceProvider<DataHandler> p = new DataSourceProvider<DataHandler>();
- DataHandler ds = (DataHandler)p.readFrom(DataHandler.class, null, new Annotation[]{},
+ DataHandler ds = p.readFrom(DataHandler.class, null, new Annotation[]{},
MediaType.valueOf("image/png"), new MetadataMap<String, String>(),
new ByteArrayInputStream("image".getBytes()));
@@ -63,7 +63,7 @@ public class DataSourceProviderTest extends Assert {
@Test
public void testReadDataSource() throws Exception {
DataSourceProvider<DataSource> p = new DataSourceProvider<DataSource>();
- DataSource ds = (DataSource)p.readFrom(DataSource.class, null, new Annotation[]{},
+ DataSource ds = p.readFrom(DataSource.class, null, new Annotation[]{},
MediaType.valueOf("image/png"), new MetadataMap<String, String>(),
new ByteArrayInputStream("image".getBytes()));
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
index f0fc738..7fbdd25 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/FormEncodingProviderTest.java
@@ -50,8 +50,8 @@ public class FormEncodingProviderTest extends Assert {
InputStream is = getClass().getResourceAsStream("singleValPostBody.txt");
@SuppressWarnings("unchecked")
MultivaluedMap<String, String> mvMap =
- (MultivaluedMap<String, String>)ferp.readFrom(MultivaluedMap.class, null,
- new Annotation[]{}, MediaType.APPLICATION_FORM_URLENCODED_TYPE, null, is);
+ ferp.readFrom(MultivaluedMap.class, null,
+ new Annotation[]{}, MediaType.APPLICATION_FORM_URLENCODED_TYPE, null, is);
assertEquals("Wrong entry for foo", "bar", mvMap.getFirst("foo"));
assertEquals("Wrong entry for boo", "far", mvMap.getFirst("boo"));
@@ -77,11 +77,10 @@ public class FormEncodingProviderTest extends Assert {
@SuppressWarnings("rawtypes")
FormEncodingProvider<MultivaluedMap> ferp
= new FormEncodingProvider<MultivaluedMap>();
- @SuppressWarnings("rawtypes")
MultivaluedMap<String, String> mvMap =
- (MultivaluedMap<String, String>)ferp.readFrom((Class)MultivaluedMap.class, null,
- new Annotation[]{}, MediaType.APPLICATION_FORM_URLENCODED_TYPE, null,
- new ByteArrayInputStream(values.getBytes()));
+ ferp.readFrom(MultivaluedMap.class, null,
+ new Annotation[]{}, MediaType.APPLICATION_FORM_URLENCODED_TYPE, null,
+ new ByteArrayInputStream(values.getBytes()));
assertEquals("Wrong entry for foo", "1 2", mvMap.getFirst("foo"));
assertEquals("Wrong entry for boo", "1 3", mvMap.getFirst("bar"));
@@ -95,10 +94,10 @@ public class FormEncodingProviderTest extends Assert {
FormEncodingProvider<MultivaluedMap> ferp
= new FormEncodingProvider<MultivaluedMap>();
MultivaluedMap<String, String> mvMap =
- (MultivaluedMap<String, String>)ferp.readFrom(MultivaluedMap.class, null,
- new Annotation[]{CustomMap.class.getAnnotations()[0]},
- MediaType.APPLICATION_FORM_URLENCODED_TYPE, null,
- new ByteArrayInputStream(values.getBytes()));
+ ferp.readFrom(MultivaluedMap.class, null,
+ new Annotation[]{CustomMap.class.getAnnotations()[0]},
+ MediaType.APPLICATION_FORM_URLENCODED_TYPE, null,
+ new ByteArrayInputStream(values.getBytes()));
assertEquals("Wrong entry for foo", "1+2", mvMap.getFirst("foo"));
assertEquals("Wrong entry for boo", "1+3", mvMap.getFirst("bar"));
@@ -231,8 +230,8 @@ public class FormEncodingProviderTest extends Assert {
= new FormEncodingProvider<MultivaluedMap>();
MultivaluedMap<String, String> mvMap =
- (MultivaluedMap<String, String>)ferp.readFrom(MultivaluedMap.class, null,
- new Annotation[]{}, MediaType.APPLICATION_FORM_URLENCODED_TYPE, null, is);
+ ferp.readFrom(MultivaluedMap.class, null,
+ new Annotation[]{}, MediaType.APPLICATION_FORM_URLENCODED_TYPE, null, is);
List<String> vals = mvMap.get("foo");
@@ -258,10 +257,10 @@ public class FormEncodingProviderTest extends Assert {
= new FormEncodingProvider<MultivaluedMap>();
MultivaluedMap<String, String> mvMap =
- (MultivaluedMap<String, String>)ferp.readFrom(MultivaluedMap.class, null,
- new Annotation[]{},
- MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED + ";charset=ISO-8859-1"), null,
- new ByteArrayInputStream(iso88591bytes));
+ ferp.readFrom(MultivaluedMap.class, null,
+ new Annotation[]{},
+ MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED + ";charset=ISO-8859-1"), null,
+ new ByteArrayInputStream(iso88591bytes));
String value = mvMap.getFirst("name");
assertEquals(helloStringISO88591, "name=" + value);
}
@@ -277,10 +276,10 @@ public class FormEncodingProviderTest extends Assert {
= new FormEncodingProvider<MultivaluedMap>();
MultivaluedMap<String, String> mvMap =
- (MultivaluedMap<String, String>)ferp.readFrom(MultivaluedMap.class, null,
- new Annotation[]{},
- MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED + ";charset=UTF-8"), null,
- new ByteArrayInputStream(s.getBytes(StandardCharsets.UTF_8)));
+ ferp.readFrom(MultivaluedMap.class, null,
+ new Annotation[]{},
+ MediaType.valueOf(MediaType.APPLICATION_FORM_URLENCODED + ";charset=UTF-8"), null,
+ new ByteArrayInputStream(s.getBytes(StandardCharsets.UTF_8)));
String value = mvMap.getFirst("name");
assertEquals(s, "name=" + value);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
index 7d3afdd..7e293c8 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java
@@ -204,7 +204,7 @@ public class PrimitiveTextProviderTest extends Assert {
MessageBodyReader<String> p = new PrimitiveTextProvider<String>();
- String value = (String)p.readFrom(String.class, null,
+ String value = p.readFrom(String.class, null,
new Annotation[]{},
MediaType.valueOf(MediaType.APPLICATION_XML + ";charset=UTF-8"), null,
new ByteArrayInputStream(s.getBytes(StandardCharsets.UTF_8)));
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
index f44517b..c4a5d0a 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
@@ -539,7 +539,7 @@ public class ProviderFactoryTest extends Assert {
Message m = new MessageImpl();
Exchange ex = new ExchangeImpl();
m.setExchange(ex);
- m.put(ServerProviderFactory.IGNORE_TYPE_VARIABLES, true);
+ m.put(ProviderFactory.IGNORE_TYPE_VARIABLES, true);
MessageBodyReader<Book> reader =
pf.createMessageBodyReader(Book.class, Book.class, null, MediaType.APPLICATION_JSON_TYPE,
m);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
index 34e0050..2d63d7b 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/SourceProviderTest.java
@@ -146,7 +146,7 @@ public class SourceProviderTest extends Assert {
private <T> T verifyRead(MessageBodyReader<T> p, Class<?> type) throws Exception {
@SuppressWarnings("unchecked")
Class<T> cls = (Class<T>)type;
- return (T)p.readFrom(cls,
+ return p.readFrom(cls,
null, null, null, null,
new ByteArrayInputStream("<test/>".getBytes()));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
index f289681..c3eaec3 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/XPathProviderTest.java
@@ -63,7 +63,7 @@ public class XPathProviderTest extends Assert {
provider.setExpression("/Book");
provider.setClassName(Book.class.getName());
provider.setForceDOM(true);
- Book book = (Book)provider.readFrom(Book.class, null, null, null, null,
+ Book book = provider.readFrom(Book.class, null, null, null, null,
new ByteArrayInputStream(value.getBytes()));
assertNotNull(book);
assertEquals(2L, book.getId());
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java
index 2ac07fd..311974d 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java
@@ -71,7 +71,7 @@ public class EndpointReferenceBuilder {
*/
addressElements.get(0).setTextContent(this.endpoint.getEndpointInfo().getAddress());
}
- return W3CEndpointReference.readFrom(new DOMSource(eprEle));
+ return EndpointReference.readFrom(new DOMSource(eprEle));
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java
index 5281b7e..3564647 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/blueprint/EndpointDefinitionParser.java
@@ -33,6 +33,8 @@ import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.configuration.blueprint.AbstractBPBeanDefinitionParser;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxws.EndpointImpl;
+import org.osgi.service.blueprint.reflect.BeanMetadata;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
class EndpointDefinitionParser extends AbstractBPBeanDefinitionParser {
@@ -76,7 +78,7 @@ class EndpointDefinitionParser extends AbstractBPBeanDefinitionParser {
String pre = node.getPrefix();
String name = node.getLocalName();
if ("createdFromAPI".equals(name) || "abstract".equals(name)) {
- cxfBean.setScope(MutableBeanMetadata.SCOPE_PROTOTYPE);
+ cxfBean.setScope(BeanMetadata.SCOPE_PROTOTYPE);
isAbstract = true;
} else if ("publish".equals(name)) {
publish = Boolean.parseBoolean(val);
@@ -136,7 +138,7 @@ class EndpointDefinitionParser extends AbstractBPBeanDefinitionParser {
cxfBean.setDestroyMethod("stop");
}
// We don't want to delay the registration of our Server
- cxfBean.setActivation(MutableBeanMetadata.ACTIVATION_EAGER);
+ cxfBean.setActivation(ComponentMetadata.ACTIVATION_EAGER);
return cxfBean;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/endpoint/dynamic/JaxWsDynamicClientFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/endpoint/dynamic/JaxWsDynamicClientFactory.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/endpoint/dynamic/JaxWsDynamicClientFactory.java
index 1e37908..a75abdc 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/endpoint/dynamic/JaxWsDynamicClientFactory.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/endpoint/dynamic/JaxWsDynamicClientFactory.java
@@ -20,6 +20,7 @@
package org.apache.cxf.jaxws.endpoint.dynamic;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.endpoint.EndpointImplFactory;
import org.apache.cxf.endpoint.dynamic.DynamicClientFactory;
@@ -68,7 +69,7 @@ public class JaxWsDynamicClientFactory extends DynamicClientFactory {
* @see CXFBusFactory#getDefaultBus()
*/
public static JaxWsDynamicClientFactory newInstance() {
- Bus bus = CXFBusFactory.getThreadDefaultBus();
+ Bus bus = BusFactory.getThreadDefaultBus();
return new JaxWsDynamicClientFactory(bus);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java
index 82ff043..1331ef2 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalHandlerOutInterceptor.java
@@ -35,12 +35,12 @@ import org.w3c.dom.Node;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.interceptor.InterceptorChain;
import org.apache.cxf.jaxws.handler.AbstractJAXWSHandlerInterceptor;
import org.apache.cxf.jaxws.handler.HandlerChainInvoker;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.phase.Phase;
-import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.staxutils.W3CDOMStreamReader;
import org.apache.cxf.staxutils.W3CDOMStreamWriter;
@@ -160,7 +160,7 @@ public class LogicalHandlerOutInterceptor
.getContent(XMLStreamReader.class));
message.getExchange().setInMessage(responseMsg);
- responseMsg.put(PhaseInterceptorChain.STARTING_AT_INTERCEPTOR_ID,
+ responseMsg.put(InterceptorChain.STARTING_AT_INTERCEPTOR_ID,
LogicalHandlerInInterceptor.class.getName());
observer.onMessage(responseMsg);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
----------------------------------------------------------------------
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 340c966..4fd4018 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
@@ -63,7 +63,6 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.phase.Phase;
-import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.ws.addressing.Names;
@@ -202,7 +201,7 @@ public class SOAPHandlerInterceptor extends
XMLStreamReader xmlReader = createXMLStreamReaderFromSOAPMessage(soapMessage);
responseMsg.setContent(XMLStreamReader.class, xmlReader);
}
- responseMsg.put(PhaseInterceptorChain.STARTING_AT_INTERCEPTOR_ID,
+ responseMsg.put(InterceptorChain.STARTING_AT_INTERCEPTOR_ID,
SOAPHandlerInterceptor.class.getName());
observer.onMessage(responseMsg);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
index 3220777..fe6f500 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/SEIWithJAXBAnnoTest.java
@@ -25,7 +25,7 @@ import java.util.List;
import javax.xml.ws.Endpoint;
-import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.jaxws.service.AddNumbers;
@@ -44,7 +44,7 @@ public class SEIWithJAXBAnnoTest extends AbstractJaxWsTest {
Endpoint.publish("local://localhost:9000/Hello", serviceImpl);
JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
- factory.setBus(SpringBusFactory.getDefaultBus());
+ factory.setBus(BusFactory.getDefaultBus());
factory.setServiceClass(AddNumbers.class);
factory.setAddress(address);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java
index b9d5695..b789217 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchOpTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.jaxws.dispatch;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
+import javax.xml.ws.BindingProvider;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
import javax.xml.ws.handler.MessageContext;
@@ -75,7 +76,7 @@ public class DispatchOpTest extends AbstractJaxWsTest {
Dispatch<Source> disp = service.createDispatch(
portName, Source.class, Service.Mode.PAYLOAD);
disp.getRequestContext().put(MessageContext.WSDL_OPERATION, operationName);
- disp.getRequestContext().put(Dispatch.ENDPOINT_ADDRESS_PROPERTY, address);
+ disp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, address);
d.setMessageObserver(new MessageReplayObserver(responseResource));
@@ -102,7 +103,7 @@ public class DispatchOpTest extends AbstractJaxWsTest {
Dispatch<Source> disp = service.createDispatch(
portName, Source.class, Service.Mode.PAYLOAD);
disp.getRequestContext().put(MessageContext.WSDL_OPERATION, operationName);
- disp.getRequestContext().put(Dispatch.ENDPOINT_ADDRESS_PROPERTY, address);
+ disp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, address);
d.setMessageObserver(new MessageReplayObserver(responseResource));
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java
index a50431e..73606d9 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/dispatch/DispatchTest.java
@@ -25,6 +25,7 @@ import javax.xml.bind.JAXBContext;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
+import javax.xml.ws.BindingProvider;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
import javax.xml.ws.http.HTTPBinding;
@@ -100,7 +101,7 @@ public class DispatchTest extends AbstractJaxWsTest {
new ServiceImpl(getBus(), getClass().getResource("/wsdl/hello_world.wsdl"), serviceName, null);
Dispatch<Source> disp = service.createDispatch(portName, Source.class, Service.Mode.MESSAGE);
- disp.getRequestContext().put(Dispatch.ENDPOINT_ADDRESS_PROPERTY, address);
+ disp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, address);
d.setMessageObserver(new MessageReplayObserver("/org/apache/cxf/jaxws/sayHiResponse.xml"));
@@ -176,7 +177,7 @@ public class DispatchTest extends AbstractJaxWsTest {
new ServiceImpl(getBus(), getClass().getResource("/wsdl/hello_world.wsdl"), serviceName, null);
Dispatch<Source> disp = service.createDispatch(portName, Source.class, Service.Mode.MESSAGE);
- disp.getRequestContext().put(Dispatch.ENDPOINT_ADDRESS_PROPERTY, address);
+ disp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, address);
disp.getRequestContext().put("find.dispatch.operation", Boolean.TRUE);
d.setMessageObserver(new MessageReplayObserver("/org/apache/cxf/jaxws/sayHiResponse.xml"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
index a06bf02..c14b4d9 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
@@ -205,8 +205,8 @@ public class HandlerChainInvokerTest extends Assert {
invoker.setProtocolMessageContext(pmc);
continueProcessing = invoker.invokeProtocolHandlers(false, pmc);
- assertFalse((Boolean)pmc.get(SOAPMessageContext.MESSAGE_OUTBOUND_PROPERTY));
- assertFalse((Boolean)lmc.get(LogicalMessageContext.MESSAGE_OUTBOUND_PROPERTY));
+ assertFalse((Boolean)pmc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY));
+ assertFalse((Boolean)lmc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY));
assertTrue(invoker.isInbound());
assertFalse(continueProcessing);
@@ -286,8 +286,8 @@ public class HandlerChainInvokerTest extends Assert {
assertEquals("banzai", e.getMessage());
}
- assertFalse((Boolean)pmc.get(SOAPMessageContext.MESSAGE_OUTBOUND_PROPERTY));
- assertFalse((Boolean)lmc.get(LogicalMessageContext.MESSAGE_OUTBOUND_PROPERTY));
+ assertFalse((Boolean)pmc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY));
+ assertFalse((Boolean)lmc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY));
assertTrue(invoker.isInbound());
//the message is replaced by fault message
@@ -363,8 +363,8 @@ public class HandlerChainInvokerTest extends Assert {
assertEquals("banzai", e.getMessage());
}
- assertFalse((Boolean)pmc.get(SOAPMessageContext.MESSAGE_OUTBOUND_PROPERTY));
- assertFalse((Boolean)lmc.get(LogicalMessageContext.MESSAGE_OUTBOUND_PROPERTY));
+ assertFalse((Boolean)pmc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY));
+ assertFalse((Boolean)lmc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY));
assertTrue(invoker.isInbound());
//assertFalse(continueProcessing);
@@ -466,7 +466,7 @@ public class HandlerChainInvokerTest extends Assert {
assertFalse(continueProcessing);
- assertFalse((Boolean)lmc.get(LogicalMessageContext.MESSAGE_OUTBOUND_PROPERTY));
+ assertFalse((Boolean)lmc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY));
assertEquals(1, logicalHandlers[0].getHandleMessageCount());
assertEquals(1, logicalHandlers[1].getHandleMessageCount());
@@ -567,7 +567,7 @@ public class HandlerChainInvokerTest extends Assert {
//assertTrue(invoker.isClosed());
assertSame(pe, invoker.getFault());
- assertFalse((Boolean)lmc.get(LogicalMessageContext.MESSAGE_OUTBOUND_PROPERTY));
+ assertFalse((Boolean)lmc.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY));
assertEquals(1, logicalHandlers[0].getHandleMessageCount());
assertEquals(1, logicalHandlers[1].getHandleMessageCount());
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
index 277cd13..448e0b8 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
@@ -48,6 +48,7 @@ import javax.xml.XMLConstants;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.util.StreamReaderDelegate;
@@ -73,6 +74,7 @@ import com.sun.tools.xjc.reader.internalizer.InternalizationLogic;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.catalog.OASISCatalogManager;
import org.apache.cxf.catalog.OASISCatalogManagerHelper;
@@ -174,7 +176,7 @@ public class DynamicClientFactory {
* @see CXFBusFactory#getDefaultBus()
*/
public static DynamicClientFactory newInstance() {
- Bus bus = CXFBusFactory.getThreadDefaultBus();
+ Bus bus = BusFactory.getThreadDefaultBus();
return new DynamicClientFactory(bus);
}
@@ -1033,7 +1035,7 @@ public class DynamicClientFactory {
public int next() throws XMLStreamException {
int i = super.next();
- if (i == XMLStreamReader.START_ELEMENT) {
+ if (i == XMLStreamConstants.START_ELEMENT) {
QName qn = super.getName();
isInclude = qn.equals(WSDLConstants.QNAME_SCHEMA_INCLUDE);
isImport = qn.equals(WSDLConstants.QNAME_SCHEMA_IMPORT);
@@ -1051,7 +1053,7 @@ public class DynamicClientFactory {
public int nextTag() throws XMLStreamException {
int i = super.nextTag();
- if (i == XMLStreamReader.START_ELEMENT) {
+ if (i == XMLStreamConstants.START_ELEMENT) {
QName qn = super.getName();
isInclude = qn.equals(WSDLConstants.QNAME_SCHEMA_INCLUDE);
isImport = qn.equals(WSDLConstants.QNAME_SCHEMA_IMPORT);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ServerFactoryBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ServerFactoryBeanDefinitionParser.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ServerFactoryBeanDefinitionParser.java
index a9bb508..ed3714d 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ServerFactoryBeanDefinitionParser.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/blueprint/ServerFactoryBeanDefinitionParser.java
@@ -30,6 +30,7 @@ import org.apache.cxf.configuration.blueprint.SimpleBPBeanDefinitionParser;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
@@ -83,7 +84,7 @@ public class ServerFactoryBeanDefinitionParser extends SimpleBPBeanDefinitionPar
bean.setDestroyMethod("destroy");
// We don't really want to delay the registration of our Server
- bean.setActivation(MutableBeanMetadata.ACTIVATION_EAGER);
+ bean.setActivation(ComponentMetadata.ACTIVATION_EAGER);
return bean;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java b/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java
index ce6a986..3bda49f 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInInterceptor.java
@@ -36,7 +36,7 @@ public class ResponseTimeMessageInInterceptor extends AbstractMessageResponseTim
public void handleMessage(Message message) throws Fault {
Exchange ex = message.getExchange();
//if serviceCounter is disabled , all responseTimeInterceptors will be skipped
- Boolean forceDisabled = Boolean.FALSE.equals((Boolean)ex.get("org.apache.cxf.management.counter.enabled"));
+ Boolean forceDisabled = Boolean.FALSE.equals(ex.get("org.apache.cxf.management.counter.enabled"));
if (!forceDisabled && isServiceCounterEnabled(ex)) {
if (isClient(message)) {
if (!ex.isOneWay()) {
@@ -51,7 +51,7 @@ public class ResponseTimeMessageInInterceptor extends AbstractMessageResponseTim
@Override
public void handleFault(Message message) {
Exchange ex = message.getExchange();
- if (Boolean.TRUE.equals((Boolean)ex.get("org.apache.cxf.management.counter.enabled"))) {
+ if (Boolean.TRUE.equals(ex.get("org.apache.cxf.management.counter.enabled"))) {
FaultMode mode = message.get(FaultMode.class);
if (mode == null) {
mode = FaultMode.UNCHECKED_APPLICATION_FAULT;
[11/12] cxf git commit: Remove unecessary else's and static
references in binding
Posted by dk...@apache.org.
Remove unecessary else's and static references in binding
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4bb53de9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4bb53de9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4bb53de9
Branch: refs/heads/master
Commit: 4bb53de95594c3438ed76dd67728c9d485f8d3c3
Parents: bb5f3b2
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 10:26:29 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 10:40:44 2017 -0400
----------------------------------------------------------------------
.../org/apache/cxf/binding/coloc/ColocUtil.java | 3 +-
.../interceptors/CorbaStreamInInterceptor.java | 3 +-
.../CorbaStreamOutEndingInterceptor.java | 3 +-
.../corba/runtime/CorbaStreamReader.java | 14 +-
.../types/AbstractStartEndEventProducer.java | 4 +-
.../corba/types/CorbaAnyEventProducer.java | 7 +-
.../corba/types/CorbaEnumEventProducer.java | 4 +-
.../corba/types/CorbaFixedEventProducer.java | 4 +-
.../CorbaObjectReferenceEventProducer.java | 23 ++-
.../types/CorbaOctetSequenceEventProducer.java | 8 +-
.../types/CorbaPrimitiveTypeEventProducer.java | 4 +-
.../corba/types/CorbaStructListener.java | 17 +--
.../corba/utils/CorbaObjectReferenceHelper.java | 9 +-
.../cxf/binding/corba/utils/CorbaUtils.java | 147 +++++++++----------
.../binding/soap/SoapBindingConfiguration.java | 3 +-
.../interceptor/AbstractSoapInterceptor.java | 6 +-
.../soap/interceptor/CheckFaultInterceptor.java | 5 +-
.../soap/interceptor/RPCInInterceptor.java | 6 +-
.../soap/interceptor/RPCOutInterceptor.java | 2 +-
.../interceptor/ReadHeadersInterceptor.java | 8 +-
.../interceptor/Soap11FaultInInterceptor.java | 3 +-
.../interceptor/Soap12FaultOutInterceptor.java | 3 +-
.../soap/interceptor/StartBodyInterceptor.java | 5 +-
.../cxf/binding/soap/model/SoapBindingInfo.java | 3 +-
.../binding/soap/saaj/SAAJOutInterceptor.java | 5 +-
.../cxf/binding/soap/saaj/SAAJStreamWriter.java | 5 +-
.../binding/soap/SoapOutInterceptorTest.java | 9 +-
.../cxf/binding/soap/saaj/ParseBodyTest.java | 3 +-
.../interceptor/XMLMessageInInterceptor.java | 13 +-
29 files changed, 159 insertions(+), 170 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocUtil.java
----------------------------------------------------------------------
diff --git a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocUtil.java b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocUtil.java
index a764bd1..4f12c71 100644
--- a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocUtil.java
+++ b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocUtil.java
@@ -299,8 +299,7 @@ public final class ColocUtil {
OperationInfo oi = message.getExchange().getBindingOperationInfo().getOperationInfo();
if (MessageUtils.isOutbound(message)) {
return oi.getOutput();
- } else {
- return oi.getInput();
}
+ return oi.getInput();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
index f5a24db..a9b7818 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
@@ -336,8 +336,7 @@ public class CorbaStreamInInterceptor extends AbstractPhaseInterceptor<Message>
MessagePartInfo part = msgInfo.getMessageParts().get(0);
if (part.isElement()) {
return part.getElementQName().getNamespaceURI();
- } else {
- return part.getName().getNamespaceURI();
}
+ return part.getName().getNamespaceURI();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
index 0de7dc0..2493b70 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
@@ -227,9 +227,8 @@ public class CorbaStreamOutEndingInterceptor extends AbstractPhaseInterceptor<Me
MessagePartInfo part = msgInfo.getMessageParts().get(0);
if (part.isElement()) {
return part.getElementQName().getNamespaceURI();
- } else {
- return part.getName().getNamespaceURI();
}
+ return part.getName().getNamespaceURI();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java
index 27c98cf..7a9c6aa 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java
@@ -38,7 +38,7 @@ public class CorbaStreamReader implements XMLStreamReader {
public CorbaStreamReader(CorbaTypeEventProducer evProducer) {
eventProducer = evProducer;
- currentState = XMLStreamReader.START_DOCUMENT;
+ currentState = XMLStreamConstants.START_DOCUMENT;
}
public QName getName() {
@@ -62,25 +62,25 @@ public class CorbaStreamReader implements XMLStreamReader {
}
public boolean hasNext() throws XMLStreamException {
- if (currentState == XMLStreamReader.START_DOCUMENT) {
+ if (currentState == XMLStreamConstants.START_DOCUMENT) {
return true;
}
boolean hasNextEvent = eventProducer.hasNext();
- if (!hasNextEvent && currentState != XMLStreamReader.END_DOCUMENT) {
- currentState = XMLStreamReader.END_DOCUMENT;
+ if (!hasNextEvent && currentState != XMLStreamConstants.END_DOCUMENT) {
+ currentState = XMLStreamConstants.END_DOCUMENT;
hasNextEvent = true;
}
return hasNextEvent;
}
public int next() throws XMLStreamException {
- if (currentState == XMLStreamReader.START_DOCUMENT) {
+ if (currentState == XMLStreamConstants.START_DOCUMENT) {
currentState = 0;
- return XMLStreamReader.START_DOCUMENT;
+ return XMLStreamConstants.START_DOCUMENT;
}
// ensure we catch end_document state
hasNext();
- if (currentState != XMLStreamReader.END_DOCUMENT) {
+ if (currentState != XMLStreamConstants.END_DOCUMENT) {
currentState = eventProducer.next();
}
return currentState;
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java
index 686f954..e68ed3c 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java
@@ -22,7 +22,7 @@ import java.util.Iterator;
import java.util.List;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
@@ -34,7 +34,7 @@ public abstract class AbstractStartEndEventProducer implements
CorbaTypeEventProducer {
protected int state;
- protected final int[] states = {XMLStreamReader.START_ELEMENT, 0, XMLStreamReader.END_ELEMENT};
+ protected final int[] states = {XMLStreamConstants.START_ELEMENT, 0, XMLStreamConstants.END_ELEMENT};
protected CorbaTypeEventProducer currentEventProducer;
protected QName name;
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java
index b947ea3..50a0694 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java
@@ -24,7 +24,7 @@ import java.util.List;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLEventFactory;
-import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
@@ -94,9 +94,8 @@ public class CorbaAnyEventProducer extends AbstractStartEndEventProducer {
// contained type and we CAN'T have the anys attributes used (It causes big problems)
if (currentEventProducer == null) {
return attributes;
- } else {
- return null;
}
+ return null;
}
public List<Namespace> getNamespaces() {
@@ -145,7 +144,7 @@ public class CorbaAnyEventProducer extends AbstractStartEndEventProducer {
class CorbaSimpleAnyContainedTypeEventProducer implements CorbaTypeEventProducer {
int state;
- int[] states = {XMLStreamReader.CHARACTERS};
+ int[] states = {XMLStreamConstants.CHARACTERS};
String value;
CorbaSimpleAnyContainedTypeEventProducer(String text) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumEventProducer.java
index 1a5c5c1..af19354 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumEventProducer.java
@@ -21,14 +21,14 @@ package org.apache.cxf.binding.corba.types;
import java.util.List;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
public class CorbaEnumEventProducer implements CorbaTypeEventProducer {
int state;
- int[] states = {XMLStreamReader.START_ELEMENT, XMLStreamReader.CHARACTERS, XMLStreamReader.END_ELEMENT};
+ int[] states = {XMLStreamConstants.START_ELEMENT, XMLStreamConstants.CHARACTERS, XMLStreamConstants.END_ELEMENT};
final CorbaEnumHandler handler;
final QName name;
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedEventProducer.java
index f0d8810..ea2b175 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedEventProducer.java
@@ -21,7 +21,7 @@ package org.apache.cxf.binding.corba.types;
import java.util.List;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
@@ -29,7 +29,7 @@ import javax.xml.stream.events.Namespace;
public class CorbaFixedEventProducer implements CorbaTypeEventProducer {
int state;
- int[] states = {XMLStreamReader.START_ELEMENT, XMLStreamReader.CHARACTERS, XMLStreamReader.END_ELEMENT};
+ int[] states = {XMLStreamConstants.START_ELEMENT, XMLStreamConstants.CHARACTERS, XMLStreamConstants.END_ELEMENT};
final CorbaFixedHandler handler;
final QName name;
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java
index 8b042aa..53f7c60 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java
@@ -28,7 +28,7 @@ import javax.wsdl.Binding;
import javax.wsdl.Definition;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLEventFactory;
-import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
@@ -164,9 +164,9 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
class CorbaAddressEventProducer implements CorbaTypeEventProducer {
int state;
- int[] states = {XMLStreamReader.START_ELEMENT,
- XMLStreamReader.CHARACTERS,
- XMLStreamReader.END_ELEMENT};
+ int[] states = {XMLStreamConstants.START_ELEMENT,
+ XMLStreamConstants.CHARACTERS,
+ XMLStreamConstants.END_ELEMENT};
final String address;
CorbaAddressEventProducer(String value) {
@@ -240,9 +240,8 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
public List<Attribute> getAttributes() {
if (currentEventProducer != null) {
return currentEventProducer.getAttributes();
- } else {
- return metaAttrs;
}
+ return metaAttrs;
}
}
@@ -250,9 +249,9 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
// An event producer to handle the production of the ServiceName XML data.
class CorbaServiceNameEventProducer implements CorbaTypeEventProducer {
int state;
- int[] states = {XMLStreamReader.START_ELEMENT,
- XMLStreamReader.CHARACTERS,
- XMLStreamReader.END_ELEMENT};
+ int[] states = {XMLStreamConstants.START_ELEMENT,
+ XMLStreamConstants.CHARACTERS,
+ XMLStreamConstants.END_ELEMENT};
QName serviceName;
QName name;
@@ -306,9 +305,9 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
// An event producer to handle the production of the InterfaceName XML data.
class CorbaInterfaceNameEventProducer implements CorbaTypeEventProducer {
int state;
- int[] states = {XMLStreamReader.START_ELEMENT,
- XMLStreamReader.CHARACTERS,
- XMLStreamReader.END_ELEMENT};
+ int[] states = {XMLStreamConstants.START_ELEMENT,
+ XMLStreamConstants.CHARACTERS,
+ XMLStreamConstants.END_ELEMENT};
QName interfaceName;
QName name;
List<Namespace> namespaces;
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceEventProducer.java
index 501ff49..da3deb4 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceEventProducer.java
@@ -21,16 +21,16 @@ package org.apache.cxf.binding.corba.types;
import java.util.List;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
public class CorbaOctetSequenceEventProducer implements CorbaTypeEventProducer {
int state;
- final int[] states = {XMLStreamReader.START_ELEMENT,
- XMLStreamReader.CHARACTERS,
- XMLStreamReader.END_ELEMENT};
+ final int[] states = {XMLStreamConstants.START_ELEMENT,
+ XMLStreamConstants.CHARACTERS,
+ XMLStreamConstants.END_ELEMENT};
final CorbaOctetSequenceHandler seqHandler;
final QName name;
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java
index 7cb0d46..55d01f0 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java
@@ -21,14 +21,14 @@ package org.apache.cxf.binding.corba.types;
import java.util.List;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
public class CorbaPrimitiveTypeEventProducer implements CorbaTypeEventProducer {
int state;
- int[] states = {XMLStreamReader.START_ELEMENT, XMLStreamReader.CHARACTERS, XMLStreamReader.END_ELEMENT};
+ int[] states = {XMLStreamConstants.START_ELEMENT, XMLStreamConstants.CHARACTERS, XMLStreamConstants.END_ELEMENT};
final CorbaPrimitiveHandler handler;
final QName name;
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java
index 28cd7a0..d661dcb 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java
@@ -67,16 +67,15 @@ public class CorbaStructListener extends AbstractCorbaTypeListener {
if (member.getName().equals(name.getLocalPart())
|| (member.isSetAnonschematype() && member.isAnonschematype())) {
break;
- } else {
- currentTypeListener =
- CorbaHandlerUtils.getTypeListener(elName,
- member.getIdltype(),
- typeMap,
- orb,
- serviceInfo);
- currentTypeListener.setNamespaceContext(ctx);
- ((CorbaStructHandler)handler).addMember(currentTypeListener.getCorbaObject());
}
+ currentTypeListener =
+ CorbaHandlerUtils.getTypeListener(elName,
+ member.getIdltype(),
+ typeMap,
+ orb,
+ serviceInfo);
+ currentTypeListener.setNamespaceContext(ctx);
+ ((CorbaStructHandler)handler).addMember(currentTypeListener.getCorbaObject());
}
boolean anonType = false;
if (member.isSetAnonschematype() && member.isAnonschematype()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
index fc1cbd5..ddf6d00 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
@@ -175,12 +175,11 @@ public final class CorbaObjectReferenceHelper {
| ((data[index + 1] << 16) & 0x00ff0000);
return partial | ((data[index + 2] << 8) & 0x0000ff00)
| ((data[index + 3]) & 0x000000ff);
- } else {
- int partial = ((data[index]) & 0x000000ff)
- | ((data[index + 1] << 8) & 0x0000ff00);
- return partial | ((data[index + 2] << 16) & 0x00ff0000)
- | ((data[index + 3] << 24) & 0xff000000);
}
+ int partial = ((data[index]) & 0x000000ff)
+ | ((data[index + 1] << 8) & 0x0000ff00);
+ return partial | ((data[index + 2] << 16) & 0x00ff0000)
+ | ((data[index + 3] << 24) & 0xff000000);
}
public static void populateEprInfo(EprMetaData info) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
index 7b1e229..77b52f3 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaUtils.java
@@ -303,86 +303,85 @@ public final class CorbaUtils {
if (seenTypes.contains(new QName(unionType.getName()))) {
return orb.create_recursive_tc(unionType.getRepositoryID());
- } else {
- seenTypes.push(new QName(unionType.getName()));
-
- TypeCode discTC = getTypeCode(orb, unionType.getDiscriminator(), typeMap, seenTypes);
- Map<String, UnionMember> members = new LinkedHashMap<String, UnionMember>();
- List<Unionbranch> branches = unionType.getUnionbranch();
- for (Iterator<Unionbranch> branchIter = branches.iterator(); branchIter.hasNext();) {
- Unionbranch branch = branchIter.next();
- List<CaseType> cases = branch.getCase();
- for (Iterator<CaseType> caseIter = cases.iterator(); caseIter.hasNext();) {
- CaseType cs = caseIter.next();
- if (!members.containsKey(cs.getLabel())) {
- UnionMember member = new UnionMember();
- member.name = branch.getName();
- member.type = getTypeCode(orb, branch.getIdltype(), typeMap, seenTypes);
- member.label = orb.create_any();
- // We need to insert the labels in a way that depends on the type of the
- // discriminator. According to the CORBA specification, the following types
- // are permissable as discriminator types:
- // * signed & unsigned short
- // * signed & unsigned long
- // * signed & unsigned long long
- // * char
- // * boolean
- // * enum
- switch (discTC.kind().value()) {
- case TCKind._tk_short:
- member.label.insert_short(Short.parseShort(cs.getLabel()));
- break;
- case TCKind._tk_ushort:
- member.label.insert_ushort(Short.parseShort(cs.getLabel()));
- break;
- case TCKind._tk_long:
- member.label.insert_long(Integer.parseInt(cs.getLabel()));
- break;
- case TCKind._tk_ulong:
- member.label.insert_ulong(Integer.parseInt(cs.getLabel()));
- break;
- case TCKind._tk_longlong:
- member.label.insert_longlong(Long.parseLong(cs.getLabel()));
- break;
- case TCKind._tk_ulonglong:
- member.label.insert_ulonglong(Long.parseLong(cs.getLabel()));
- break;
- case TCKind._tk_char:
- member.label.insert_char(cs.getLabel().charAt(0));
- break;
- case TCKind._tk_boolean:
- member.label.insert_boolean(Boolean.parseBoolean(cs.getLabel()));
- break;
- case TCKind._tk_enum:
- org.omg.CORBA.portable.OutputStream out =
- member.label.create_output_stream();
- Enum enumVal = (Enum)getCorbaType(unionType.getDiscriminator(), typeMap);
- List<Enumerator> enumerators = enumVal.getEnumerator();
- for (int i = 0; i < enumerators.size(); ++i) {
- Enumerator e = enumerators.get(i);
- if (e.getValue().equals(cs.getLabel())) {
- out.write_long(i);
- }
+ }
+ seenTypes.push(new QName(unionType.getName()));
+
+ TypeCode discTC = getTypeCode(orb, unionType.getDiscriminator(), typeMap, seenTypes);
+ Map<String, UnionMember> members = new LinkedHashMap<String, UnionMember>();
+ List<Unionbranch> branches = unionType.getUnionbranch();
+ for (Iterator<Unionbranch> branchIter = branches.iterator(); branchIter.hasNext();) {
+ Unionbranch branch = branchIter.next();
+ List<CaseType> cases = branch.getCase();
+ for (Iterator<CaseType> caseIter = cases.iterator(); caseIter.hasNext();) {
+ CaseType cs = caseIter.next();
+ if (!members.containsKey(cs.getLabel())) {
+ UnionMember member = new UnionMember();
+ member.name = branch.getName();
+ member.type = getTypeCode(orb, branch.getIdltype(), typeMap, seenTypes);
+ member.label = orb.create_any();
+ // We need to insert the labels in a way that depends on the type of the
+ // discriminator. According to the CORBA specification, the following types
+ // are permissable as discriminator types:
+ // * signed & unsigned short
+ // * signed & unsigned long
+ // * signed & unsigned long long
+ // * char
+ // * boolean
+ // * enum
+ switch (discTC.kind().value()) {
+ case TCKind._tk_short:
+ member.label.insert_short(Short.parseShort(cs.getLabel()));
+ break;
+ case TCKind._tk_ushort:
+ member.label.insert_ushort(Short.parseShort(cs.getLabel()));
+ break;
+ case TCKind._tk_long:
+ member.label.insert_long(Integer.parseInt(cs.getLabel()));
+ break;
+ case TCKind._tk_ulong:
+ member.label.insert_ulong(Integer.parseInt(cs.getLabel()));
+ break;
+ case TCKind._tk_longlong:
+ member.label.insert_longlong(Long.parseLong(cs.getLabel()));
+ break;
+ case TCKind._tk_ulonglong:
+ member.label.insert_ulonglong(Long.parseLong(cs.getLabel()));
+ break;
+ case TCKind._tk_char:
+ member.label.insert_char(cs.getLabel().charAt(0));
+ break;
+ case TCKind._tk_boolean:
+ member.label.insert_boolean(Boolean.parseBoolean(cs.getLabel()));
+ break;
+ case TCKind._tk_enum:
+ org.omg.CORBA.portable.OutputStream out =
+ member.label.create_output_stream();
+ Enum enumVal = (Enum)getCorbaType(unionType.getDiscriminator(), typeMap);
+ List<Enumerator> enumerators = enumVal.getEnumerator();
+ for (int i = 0; i < enumerators.size(); ++i) {
+ Enumerator e = enumerators.get(i);
+ if (e.getValue().equals(cs.getLabel())) {
+ out.write_long(i);
}
- member.label.read_value(out.create_input_stream(), discTC);
- break;
- default:
- throw new CorbaBindingException("Unsupported discriminator type");
}
- // Some orbs are strict on how the case labels are stored for
- // each member. So we can't
- // simply insert the labels as strings
- members.put(cs.getLabel(), member);
+ member.label.read_value(out.create_input_stream(), discTC);
+ break;
+ default:
+ throw new CorbaBindingException("Unsupported discriminator type");
}
+ // Some orbs are strict on how the case labels are stored for
+ // each member. So we can't
+ // simply insert the labels as strings
+ members.put(cs.getLabel(), member);
}
}
- seenTypes.pop();
- return orb.create_union_tc(unionType.getRepositoryID(),
- getTypeCodeName(unionType.getName()),
- discTC,
- members.values().toArray(
- new UnionMember[members.size()]));
}
+ seenTypes.pop();
+ return orb.create_union_tc(unionType.getRepositoryID(),
+ getTypeCodeName(unionType.getName()),
+ discTC,
+ members.values().toArray(
+ new UnionMember[members.size()]));
}
public static String getTypeCodeName(String name) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java
index 6a6f857..bb4729a 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java
@@ -57,9 +57,8 @@ public class SoapBindingConfiguration extends BindingConfiguration {
String action = (String)op.getProperty("action");
if (action == null) {
return defaultSoapAction;
- } else {
- return action;
}
+ return action;
}
public String getTransportURI() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
index 8bf2fc8..94778ad 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
@@ -127,15 +127,13 @@ public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<S
if (config && fault.getCause() != null
&& fault.getCause().getMessage() != null && !fault.getMessage().equals(fault.getCause().getMessage())) {
return fault.getMessage() + " Caused by: " + fault.getCause().getMessage();
- } else {
- return fault.getMessage();
}
+ return fault.getMessage();
} else if (config && fault.getCause() != null) {
if (fault.getCause().getMessage() != null) {
return fault.getCause().getMessage();
- } else {
- return fault.getCause().toString();
}
+ return fault.getCause().toString();
} else {
return "Fault occurred while processing.";
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
index 75f57c2..dfe6262 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
@@ -21,6 +21,7 @@ package org.apache.cxf.binding.soap.interceptor;
import java.util.logging.Logger;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -49,8 +50,8 @@ public class CheckFaultInterceptor extends AbstractSoapInterceptor {
try {
// advance to first tag.
int x = xmlReader.getEventType();
- while (x != XMLStreamReader.START_ELEMENT
- && x != XMLStreamReader.END_ELEMENT
+ while (x != XMLStreamConstants.START_ELEMENT
+ && x != XMLStreamConstants.END_ELEMENT
&& xmlReader.hasNext()) {
x = xmlReader.next();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
index d36f196..78a7f29 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.logging.Logger;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -107,9 +108,8 @@ public class RPCInInterceptor extends AbstractInDatabindingInterceptor {
// it's doc-lit-bare
new BareInInterceptor().handleMessage(message);
return;
- } else {
- setMessage(message, operation);
}
+ setMessage(message, operation);
} else {
operation = message.getExchange().getBindingOperationInfo();
}
@@ -140,7 +140,7 @@ public class RPCInInterceptor extends AbstractInDatabindingInterceptor {
if (qn.equals(SOAP12_RESULT)) {
//just ignore this. The parts should work correctly.
try {
- while (xmlReader.getEventType() != XMLStreamReader.END_ELEMENT) {
+ while (xmlReader.getEventType() != XMLStreamConstants.END_ELEMENT) {
xmlReader.next();
}
xmlReader.next();
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
index 703d1ed..288a5b6 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
@@ -53,7 +53,7 @@ public class RPCOutInterceptor extends AbstractOutDatabindingInterceptor {
NSStack nsStack = new NSStack();
nsStack.push();
- BindingOperationInfo operation = (BindingOperationInfo) message.getExchange().getBindingOperationInfo();
+ BindingOperationInfo operation = message.getExchange().getBindingOperationInfo();
assert operation.getName() != null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
index bce0bf7..b4d27c8 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
@@ -87,7 +87,7 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
if (xmlReader != null) {
try {
while (xmlReader.hasNext()) {
- if (xmlReader.next() == XMLStreamReader.END_DOCUMENT) {
+ if (xmlReader.next() == XMLStreamConstants.END_DOCUMENT) {
return;
}
}
@@ -460,17 +460,15 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
public List<XMLEvent> getBodyAttributeAndNamespaceEvents() {
if (bodyEvents == null) {
return Collections.emptyList();
- } else {
- return Collections.unmodifiableList(bodyEvents);
}
+ return Collections.unmodifiableList(bodyEvents);
}
public List<XMLEvent> getEnvAttributeAndNamespaceEvents() {
if (envEvents == null) {
return Collections.emptyList();
- } else {
- return Collections.unmodifiableList(envEvents);
}
+ return Collections.unmodifiableList(envEvents);
}
public String getEnvelopePrefix() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
index 164e065..7b7cb7b 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
@@ -22,6 +22,7 @@ package org.apache.cxf.binding.soap.interceptor;
import java.util.logging.Logger;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -60,7 +61,7 @@ public class Soap11FaultInInterceptor extends AbstractSoapInterceptor {
Element detail = null;
String lang = null;
try {
- while (reader.nextTag() == XMLStreamReader.START_ELEMENT) {
+ while (reader.nextTag() == XMLStreamConstants.START_ELEMENT) {
if (reader.getLocalName().equals("faultcode")) {
faultCode = StaxUtils.readQName(reader);
} else if (reader.getLocalName().equals("faultstring")) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
index b68a27c..ef4bd78 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
@@ -36,6 +36,7 @@ import org.apache.cxf.binding.soap.interceptor.Soap11FaultOutInterceptor.Soap11F
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.staxutils.StaxUtils;
@@ -62,7 +63,7 @@ public class Soap12FaultOutInterceptor extends AbstractSoapInterceptor {
super(Phase.MARSHAL);
}
public void handleMessage(SoapMessage message) throws Fault {
- LOG.info(getClass() + (String) message.get(SoapMessage.CONTENT_TYPE));
+ LOG.info(getClass() + (String) message.get(Message.CONTENT_TYPE));
XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
Fault f = (Fault)message.getContent(Exception.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java
index 346c5e7..8b25c7b 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java
@@ -21,6 +21,7 @@ package org.apache.cxf.binding.soap.interceptor;
import java.util.logging.Logger;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -57,8 +58,8 @@ public class StartBodyInterceptor extends AbstractSoapInterceptor {
//important to keep for ws-security signature digests and stuff
try {
int i = xmlReader.next();
- while (i == XMLStreamReader.NAMESPACE
- || i == XMLStreamReader.ATTRIBUTE) {
+ while (i == XMLStreamConstants.NAMESPACE
+ || i == XMLStreamConstants.ATTRIBUTE) {
i = xmlReader.next();
}
} catch (XMLStreamException e) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
index 84ce8a7..bb0bb50 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
@@ -77,9 +77,8 @@ public class SoapBindingInfo extends BindingInfo {
SoapOperationInfo opInfo = getOperation(operation.getName()).getExtensor(SoapOperationInfo.class);
if (opInfo != null) {
return opInfo.getStyle();
- } else {
- return style;
}
+ return style;
}
public OperationInfo getOperationByAction(String action) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
index 7328832..60bf875 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
@@ -219,10 +219,9 @@ public class SAAJOutInterceptor extends AbstractSoapInterceptor {
if (e.getCause() instanceof ConnectException) {
throw new SoapFault(e.getCause().getMessage(), e,
message.getVersion().getSender());
- } else {
- throw new SoapFault(new Message("SOAPEXCEPTION", BUNDLE, e.getMessage()), e,
- message.getVersion().getSender());
}
+ throw new SoapFault(new Message("SOAPEXCEPTION", BUNDLE, e.getMessage()), e,
+ message.getVersion().getSender());
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
index 281e34e..64fe247 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
@@ -83,9 +83,8 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
Iterator<String> it = new W3CNamespaceContext((Element)nd).getPrefixes(nsuri);
if (it.hasNext()) {
return it.next();
- } else {
- nd = null;
}
+ nd = null;
} else {
nd = nd.getNextSibling();
}
@@ -219,7 +218,7 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
el = ((SOAPElement)cur).addChildElement(local, "", "");
} else {
el = ((SOAPElement)cur).addChildElement(local, pfx == null ? "" : pfx, ns);
- adjustPrefix((SOAPElement)el, pfx);
+ adjustPrefix(el, pfx);
}
cur.removeChild(el);
return el;
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
index f56dc0d..d21a237 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
@@ -25,6 +25,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -102,19 +103,19 @@ public class SoapOutInterceptorTest extends TestBase {
}
private void assertInputStream(XMLStreamReader xmlReader, SoapVersion version) throws Exception {
- assertEquals(XMLStreamReader.START_ELEMENT, xmlReader.nextTag());
+ assertEquals(XMLStreamConstants.START_ELEMENT, xmlReader.nextTag());
assertEquals(version.getEnvelope(), xmlReader.getName());
- assertEquals(XMLStreamReader.START_ELEMENT, xmlReader.nextTag());
+ assertEquals(XMLStreamConstants.START_ELEMENT, xmlReader.nextTag());
assertEquals(version.getHeader(), xmlReader.getName());
- assertEquals(XMLStreamReader.START_ELEMENT, xmlReader.nextTag());
+ assertEquals(XMLStreamConstants.START_ELEMENT, xmlReader.nextTag());
assertEquals("reservation", xmlReader.getLocalName());
assertEquals(version.getAttrValueMustUnderstand(true),
xmlReader.getAttributeValue(version.getNamespace(),
version.getAttrNameMustUnderstand()));
- assertEquals(XMLStreamReader.START_ELEMENT, xmlReader.nextTag());
+ assertEquals(XMLStreamConstants.START_ELEMENT, xmlReader.nextTag());
assertEquals("reference", xmlReader.getLocalName());
// I don't think we're writing the body yet...
//
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index a41239e..f424a4d 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -28,6 +28,7 @@ import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.dom.DOMSource;
@@ -63,7 +64,7 @@ public class ParseBodyTest extends Assert {
xmlReader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(data.getBytes("utf-8")));
//reader should be on the start element for the
- assertEquals(XMLStreamReader.START_ELEMENT, xmlReader.next());
+ assertEquals(XMLStreamConstants.START_ELEMENT, xmlReader.next());
assertEquals("Body", xmlReader.getLocalName());
factory = MessageFactory.newInstance();
http://git-wip-us.apache.org/repos/asf/cxf/blob/4bb53de9/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java
index 85b967f..fa1ea49 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java
@@ -125,13 +125,12 @@ public class XMLMessageInInterceptor extends AbstractInDatabindingInterceptor {
throw new Fault(new org.apache.cxf.common.i18n.Message("STAX_READ_EXC", LOG));
}
return boi;
- } else {
- Collection<MessagePartInfo> bodyParts = bmi.getMessageParts();
- if (bodyParts.size() == 1) {
- MessagePartInfo p = bodyParts.iterator().next();
- if (p.getConcreteName().equals(startQName)) {
- return boi;
- }
+ }
+ Collection<MessagePartInfo> bodyParts = bmi.getMessageParts();
+ if (bodyParts.size() == 1) {
+ MessagePartInfo p = bodyParts.iterator().next();
+ if (p.getConcreteName().equals(startQName)) {
+ return boi;
}
}
}
[04/12] cxf git commit: Fix a BUNCH more warnings
Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
index 0169852..808e10d 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/clientauth/ClientAuthTest.java
@@ -31,6 +31,7 @@ import javax.net.ssl.SSLSession;
import javax.net.ssl.TrustManagerFactory;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -68,8 +69,8 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
URL busFile = ClientAuthTest.class.getResource("client-auth.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -92,8 +93,8 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
URL busFile = ClientAuthTest.class.getResource("client-auth-invalid.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -121,8 +122,8 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
URL busFile = ClientAuthTest.class.getResource("client-no-auth.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -150,8 +151,8 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
URL busFile = ClientAuthTest.class.getResource("client-auth-chain.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -174,8 +175,8 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
URL busFile = ClientAuthTest.class.getResource("client-auth-invalid2.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -203,8 +204,8 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
URL busFile = ClientAuthTest.class.getResource("client-auth-invalid2.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -232,8 +233,8 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
URL busFile = ClientAuthTest.class.getResource("client-auth-invalid.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
index 3777d4a..8ec9f15 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/hostname/HostnameVerificationTest.java
@@ -24,6 +24,7 @@ import java.net.URL;
import javax.xml.ws.BindingProvider;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.hello_world.Greeter;
@@ -67,8 +68,8 @@ public class HostnameVerificationTest extends AbstractBusClientServerTestBase {
URL busFile = HostnameVerificationTest.class.getResource("hostname-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -96,8 +97,8 @@ public class HostnameVerificationTest extends AbstractBusClientServerTestBase {
URL busFile = HostnameVerificationTest.class.getResource("hostname-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -135,8 +136,8 @@ public class HostnameVerificationTest extends AbstractBusClientServerTestBase {
URL busFile = HostnameVerificationTest.class.getResource("hostname-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -164,8 +165,8 @@ public class HostnameVerificationTest extends AbstractBusClientServerTestBase {
URL busFile = HostnameVerificationTest.class.getResource("hostname-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
index cc5ba7d..447c5ea 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/trust/TrustManagerTest.java
@@ -34,6 +34,7 @@ import javax.net.ssl.TrustManagerFactory;
import javax.net.ssl.X509TrustManager;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
@@ -82,8 +83,8 @@ public class TrustManagerTest extends AbstractBusClientServerTestBase {
URL busFile = TrustManagerTest.class.getResource("client-trust.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -117,8 +118,8 @@ public class TrustManagerTest extends AbstractBusClientServerTestBase {
URL busFile = TrustManagerTest.class.getResource("client-trust.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -156,8 +157,8 @@ public class TrustManagerTest extends AbstractBusClientServerTestBase {
URL busFile = TrustManagerTest.class.getResource("client-trust.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -193,8 +194,8 @@ public class TrustManagerTest extends AbstractBusClientServerTestBase {
URL busFile = TrustManagerTest.class.getResource("client-trust.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -235,8 +236,8 @@ public class TrustManagerTest extends AbstractBusClientServerTestBase {
URL busFile = TrustManagerTest.class.getResource("client-trust.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
index b8640b3..392c9d9 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/bus/BusShutdownTest.java
@@ -27,6 +27,7 @@ import javax.xml.ws.BindingProvider;
import javax.xml.ws.Endpoint;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
@@ -72,7 +73,7 @@ public class BusShutdownTest extends Assert {
private void makeTwoWayCallOnNewBus(URL wsdlUrl, String address) {
SpringBusFactory bf = new SpringBusFactory();
Bus bus = bf.createBus();
- SpringBusFactory.setDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
Endpoint ep = createService(address);
doWork(wsdlUrl, address);
// this should revert the JVM to its original state pending gc
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java
index 8d50e26..7c46b1e 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/MessageCallbackOnewayTest.java
@@ -391,7 +391,7 @@ public class MessageCallbackOnewayTest extends AbstractBusClientServerTestBase {
} catch (InterruptedException e) { /* ignored */ }
}
try {
- callbacks.wait((long)delay);
+ callbacks.wait(delay);
} catch (InterruptedException e) { /* ignored */ }
if (callbacks.size() > count) {
fail("Expected " + count + " callbacks, got " + callbacks.size());
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
index 2f9ecc4..685f954 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
@@ -28,12 +28,12 @@ import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.wssec.examples.common.SecurityTestUtil;
import org.apache.cxf.systest.wssec.examples.common.TestParam;
import org.apache.cxf.systest.wssec.examples.sts.STSServer;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.ws.security.trust.STSClient;
import org.example.contract.doubleit.DoubleItPortType;
import org.junit.BeforeClass;
@@ -109,8 +109,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
URL busFile = SamlTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -139,8 +139,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
URL busFile = SamlTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -173,8 +173,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
URL busFile = SamlTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -207,8 +207,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
URL busFile = SamlTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -233,8 +233,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
URL busFile = SamlTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -264,8 +264,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
URL busFile = SamlTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -294,8 +294,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
URL busFile = SamlTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -328,8 +328,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
URL busFile = SamlTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -362,8 +362,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
URL busFile = SamlTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -395,8 +395,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
URL busFile = SamlTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SamlTokenTest.class.getResource("DoubleItSaml.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -420,7 +420,8 @@ public class SamlTokenTest extends AbstractBusClientServerTestBase {
}
private static void updateSTSPort(BindingProvider p, String port) {
- STSClient stsClient = (STSClient)p.getRequestContext().get(SecurityConstants.STS_CLIENT);
+ STSClient stsClient = (STSClient)p.getRequestContext()
+ .get(org.apache.cxf.rt.security.SecurityConstants.STS_CLIENT);
if (stsClient != null) {
String location = stsClient.getWsdlLocation();
if (location.contains("8080")) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java
index ed51b66..5cd5619 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java
@@ -27,6 +27,7 @@ import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.wssec.examples.common.SecurityTestUtil;
import org.apache.cxf.systest.wssec.examples.common.TestParam;
@@ -97,8 +98,8 @@ public class SecureConversationTest extends AbstractBusClientServerTestBase {
URL busFile = SecureConversationTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SecureConversationTest.class.getResource("DoubleItSecConv.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java
index e98c5f5..c5da974 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java
@@ -27,6 +27,7 @@ import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.wssec.examples.common.SecurityTestUtil;
import org.apache.cxf.systest.wssec.examples.common.TestParam;
@@ -98,8 +99,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenTest.class.getResource("DoubleItUt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -128,8 +129,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenTest.class.getResource("DoubleItUt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -158,8 +159,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenTest.class.getResource("DoubleItUt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -188,8 +189,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenTest.class.getResource("DoubleItUt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -222,8 +223,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenTest.class.getResource("DoubleItUt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -252,8 +253,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenTest.class.getResource("DoubleItUt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -282,8 +283,8 @@ public class UsernameTokenTest extends AbstractBusClientServerTestBase {
URL busFile = UsernameTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = UsernameTokenTest.class.getResource("DoubleItUt.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java
index 09f65f0c..22e9b61 100644
--- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java
+++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java
@@ -27,6 +27,7 @@ import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.wssec.examples.common.SecurityTestUtil;
import org.apache.cxf.systest.wssec.examples.common.TestParam;
@@ -96,8 +97,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
URL busFile = X509TokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -126,8 +127,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
URL busFile = X509TokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -156,8 +157,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
URL busFile = X509TokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -186,8 +187,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
URL busFile = X509TokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/HelloService.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/HelloService.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/HelloService.java
index 59de2cf..f326f8e 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/HelloService.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/HelloService.java
@@ -37,7 +37,7 @@ public class HelloService extends Service {
@WebEndpoint(name = "HelloPort")
public Hello getHelloPort() {
- return (Hello)super.getPort(HELLO_PORT, Hello.class);
+ return super.getPort(HELLO_PORT, Hello.class);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/Server.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/Server.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/Server.java
index ca492f4..f7706da 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/Server.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/Server.java
@@ -38,7 +38,6 @@ import javax.xml.ws.WebServiceProvider;
import javax.xml.ws.soap.Addressing;
import javax.xml.xpath.XPathConstants;
-import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.BusFactory;
@@ -107,7 +106,7 @@ public class Server extends AbstractBusTestServerBase {
//CHECK the incoming
Element el;
try {
- el = ((Document)StaxUtils.read(obj)).getDocumentElement();
+ el = StaxUtils.read(obj).getDocumentElement();
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -140,7 +139,7 @@ public class Server extends AbstractBusTestServerBase {
Element el;
try {
- el = ((Document)StaxUtils.read(obj)).getDocumentElement();
+ el = StaxUtils.read(obj).getDocumentElement();
} catch (Exception e) {
throw new RuntimeException(e);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
index 8a2bbe8..63639ca 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/AbstractGreeterImpl.java
@@ -125,7 +125,7 @@ public abstract class AbstractGreeterImpl implements Greeter {
String property = ADDRESSING_PROPERTIES_INBOUND;
AddressingProperties maps = (AddressingProperties)
context.getMessageContext().get(property);
- verificationCache.put(MAPTest.verifyMAPs(maps, this));
+ verificationCache.put(MAPTestBase.verifyMAPs(maps, this));
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java
index a8a9335..224266d 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/HeaderVerifier.java
@@ -47,7 +47,7 @@ import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.addressing.AttributedURIType;
import org.apache.cxf.ws.addressing.ContextUtils;
import org.apache.cxf.ws.addressing.Names;
-import org.apache.cxf.ws.addressing.soap.VersionTransformer;
+import org.apache.cxf.ws.addressing.VersionTransformer.Names200408;
import org.apache.cxf.ws.addressing.v200408.AttributedURI;
import static org.apache.cxf.ws.addressing.JAXWSAConstants.ADDRESSING_PROPERTIES_INBOUND;
@@ -135,14 +135,14 @@ public class HeaderVerifier extends AbstractSoapInterceptor {
Names.WSA_NAMESPACE_NAME);
recordWSAHeaders(headers,
wsaHeaders,
- VersionTransformer.Names200408.WSA_NAMESPACE_NAME);
+ Names200408.WSA_NAMESPACE_NAME);
recordWSAHeaders(headers,
wsaHeaders,
MAPTestBase.CUSTOMER_NAME.getNamespaceURI());
}
boolean partialResponse = isIncomingPartialResponse(message)
|| outgoingPartialResponse;
- verificationCache.put(MAPTest.verifyHeaders(wsaHeaders,
+ verificationCache.put(MAPTestBase.verifyHeaders(wsaHeaders,
partialResponse,
isRequestLeg(message),
false));
@@ -214,7 +214,7 @@ public class HeaderVerifier extends AbstractSoapInterceptor {
private Marshaller getMarshaller() throws JAXBException {
JAXBContext jaxbContext =
- VersionTransformer.getExposedJAXBContext(currentNamespaceURI);
+ org.apache.cxf.ws.addressing.VersionTransformer.getExposedJAXBContext(currentNamespaceURI);
Marshaller marshaller = jaxbContext.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
return marshaller;
@@ -231,12 +231,12 @@ public class HeaderVerifier extends AbstractSoapInterceptor {
AttributedURIType.class,
value),
header);
- } else if (VersionTransformer.Names200408.WSA_NAMESPACE_NAME.equals(
+ } else if (Names200408.WSA_NAMESPACE_NAME.equals(
currentNamespaceURI)) {
AttributedURI value =
- VersionTransformer.Names200408.WSA_OBJECT_FACTORY.createAttributedURI();
+ Names200408.WSA_OBJECT_FACTORY.createAttributedURI();
value.setValue(from);
- QName qname = new QName(VersionTransformer.Names200408.WSA_NAMESPACE_NAME,
+ QName qname = new QName(Names200408.WSA_NAMESPACE_NAME,
Names.WSA_FROM_NAME);
marshaller.marshal(
new JAXBElement<AttributedURI>(qname,
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
index bb2b326..b26a333 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPTestBase.java
@@ -47,7 +47,7 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
import org.apache.cxf.ws.addressing.Names;
import org.apache.cxf.ws.addressing.ReferenceParametersType;
-import org.apache.cxf.ws.addressing.soap.VersionTransformer;
+import org.apache.cxf.ws.addressing.VersionTransformer.Names200408;
import org.apache.hello_world_soap_http.BadRecordLitFault;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
@@ -277,8 +277,8 @@ public abstract class MAPTestBase extends AbstractClientServerTestBase implement
try {
// expect two MAPs instances versioned with 200408, i.e. for both
// the partial and full responses
- mapVerifier.expectedExposedAs.add(VersionTransformer.Names200408.WSA_NAMESPACE_NAME);
- mapVerifier.expectedExposedAs.add(VersionTransformer.Names200408.WSA_NAMESPACE_NAME);
+ mapVerifier.expectedExposedAs.add(Names200408.WSA_NAMESPACE_NAME);
+ mapVerifier.expectedExposedAs.add(Names200408.WSA_NAMESPACE_NAME);
String greeting = greeter.greetMe("versioning1");
assertEquals("unexpected response received from service",
"Hello versioning1",
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
index 84fd947..e5bebe4 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addressing/MAPVerifier.java
@@ -47,8 +47,8 @@ public class MAPVerifier extends AbstractPhaseInterceptor<Message> {
public MAPVerifier() {
super(Phase.POST_LOGICAL);
mapProperties = new HashMap<>();
- mapProperties.put(MAPTest.INBOUND_KEY, ADDRESSING_PROPERTIES_INBOUND);
- mapProperties.put(MAPTest.OUTBOUND_KEY, ADDRESSING_PROPERTIES_OUTBOUND);
+ mapProperties.put(MAPTestBase.INBOUND_KEY, ADDRESSING_PROPERTIES_INBOUND);
+ mapProperties.put(MAPTestBase.OUTBOUND_KEY, ADDRESSING_PROPERTIES_OUTBOUND);
}
public void handleMessage(Message message) {
@@ -63,8 +63,8 @@ public class MAPVerifier extends AbstractPhaseInterceptor<Message> {
boolean isOutbound = ContextUtils.isOutbound(message);
String mapProperty =
(String)mapProperties.get(isOutbound
- ? MAPTest.OUTBOUND_KEY
- : MAPTest.INBOUND_KEY);
+ ? MAPTestBase.OUTBOUND_KEY
+ : MAPTestBase.INBOUND_KEY);
AddressingProperties maps =
(AddressingProperties)message.get(mapProperty);
if (maps == null) {
@@ -89,7 +89,7 @@ public class MAPVerifier extends AbstractPhaseInterceptor<Message> {
exposeAs = null;
}
}
- verificationCache.put(MAPTest.verifyMAPs(maps, this));
+ verificationCache.put(MAPTestBase.verifyMAPs(maps, this));
}
private String getExpectedExposeAs(boolean remove) {
[12/12] cxf git commit: Fix unnecessary else's and static refs in
databindings
Posted by dk...@apache.org.
Fix unnecessary else's and static refs in databindings
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2a6144f5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2a6144f5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2a6144f5
Branch: refs/heads/master
Commit: 2a6144f5600160e285d6dda35b1355a8995f388a
Parents: 4bb53de
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 10:30:05 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 10:40:44 2017 -0400
----------------------------------------------------------------------
.../java/org/apache/cxf/aegis/AegisContext.java | 6 +--
.../apache/cxf/aegis/DatabindingException.java | 7 ++-
.../cxf/aegis/databinding/AegisDatabinding.java | 3 +-
.../aegis/databinding/XMLStreamDataReader.java | 5 +-
.../org/apache/cxf/aegis/type/TypeUtil.java | 21 ++++----
.../apache/cxf/aegis/type/XMLTypeCreator.java | 12 ++---
.../apache/cxf/aegis/type/basic/BeanType.java | 3 +-
.../cxf/aegis/type/basic/BeanTypeInfo.java | 3 +-
.../type/basic/InterfaceInvocationHandler.java | 8 ++-
.../apache/cxf/aegis/type/basic/ObjectType.java | 5 +-
.../cxf/aegis/type/java5/AnnotatedTypeInfo.java | 6 +--
.../apache/cxf/aegis/type/java5/EnumType.java | 2 +-
.../cxf/aegis/type/java5/Java5TypeCreator.java | 55 +++++++++-----------
.../apache/cxf/aegis/util/NamespaceHelper.java | 9 ++--
.../aegis/util/stax/JDOMNamespaceContext.java | 3 +-
.../aegis/util/stax/W3CNamespaceContext.java | 3 +-
.../cxf/aegis/xml/stax/ElementReader.java | 7 +--
.../cxf/aegis/xml/stax/ElementWriter.java | 7 ++-
.../aegis/inheritance/InheritanceService.java | 4 +-
.../cxf/aegis/inheritance/ws1/impl/WS1Impl.java | 3 +-
.../aegis/type/encoded/SoapArrayTypeTest.java | 8 +--
.../apache/cxf/aegis/xml/stax/ReaderTest.java | 3 +-
.../apache/cxf/jaxb/JAXBContextInitializer.java | 3 +-
.../org/apache/cxf/jaxb/JAXBEncoderDecoder.java | 21 +++-----
.../apache/cxf/jaxb/JAXBSchemaInitializer.java | 6 +--
.../org/apache/cxf/jaxb/JAXBWrapperHelper.java | 3 +-
.../apache/cxf/jaxb/WrapperHelperCompiler.java | 3 +-
.../attachment/JAXBAttachmentMarshaller.java | 6 +--
.../org/apache/cxf/jaxb/io/DataReaderImpl.java | 23 ++++----
.../org/apache/cxf/jaxb/io/DataWriterImpl.java | 6 +--
30 files changed, 106 insertions(+), 148 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
index 4f9711f..d942881 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
@@ -179,9 +179,8 @@ public class AegisContext {
public AegisType getRootType(Class<?> clazz) {
if (rootClasses.contains(clazz)) {
return typeMapping.getType(clazz);
- } else {
- return null;
}
+ return null;
}
/**
@@ -193,9 +192,8 @@ public class AegisContext {
public AegisType getRootType(QName schemaTypeName) {
if (rootTypeQNames.contains(schemaTypeName)) {
return typeMapping.getType(schemaTypeName);
- } else {
- return null;
}
+ return null;
}
private Set<Class<?>> rootMappableClasses() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java
index 0ec0a2b..f4d95ba 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java
@@ -70,11 +70,10 @@ public class DatabindingException extends RuntimeException {
public String getMessage() {
if (getCause() == null || getCause() == this) {
return getActualMessage();
- } else {
- return getActualMessage() + ". Nested exception is "
- + getCause().getClass().getName() + ": "
- + getCause().getMessage();
}
+ return getActualMessage() + ". Nested exception is "
+ + getCause().getClass().getName() + ": "
+ + getCause().getMessage();
}
public String getActualMessage() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
index ba6b3d0..27a801a 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
@@ -486,9 +486,8 @@ public class AegisDatabinding extends AbstractDataBinding {
String message = ex.getMessage();
if (expected.equals(message)) {
continue;
- } else {
- throw ex;
}
+ throw ex;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataReader.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataReader.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataReader.java
index e75136a..f37ac9c 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataReader.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataReader.java
@@ -49,10 +49,9 @@ public class XMLStreamDataReader implements DataReader<XMLStreamReader> {
if (type == null) {
type = databinding.getType(part);
return reader.read(input, type);
- } else {
- ArrayType arrayType = (ArrayType) type;
- return reader.readFlatArray(input, arrayType, part.getConcreteName());
}
+ ArrayType arrayType = (ArrayType) type;
+ return reader.readFlatArray(input, arrayType, part.getConcreteName());
} catch (Exception e) {
throw new Fault(e);
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
index 69df9b9..47842fb 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
@@ -79,18 +79,16 @@ public final class TypeUtil {
+ "\" was specified, but no corresponding AegisType was registered; defaulting to "
+ baseType.getSchemaType());
return baseType;
- } else {
- LOG.warning("xsi:type=\"" + overrideName
- + "\" was specified, but no corresponding AegisType was registered; no default.");
- return null;
}
- } else {
- if (baseType == null) {
- LOG.warning("xsi:type absent, and no type available for "
- + xsr.getName());
- }
- return baseType;
+ LOG.warning("xsi:type=\"" + overrideName
+ + "\" was specified, but no corresponding AegisType was registered; no default.");
+ return null;
}
+ if (baseType == null) {
+ LOG.warning("xsi:type absent, and no type available for "
+ + xsr.getName());
+ }
+ return baseType;
}
/**
@@ -174,9 +172,8 @@ public final class TypeUtil {
java.lang.reflect.Type reflectType) {
if (reflectType == null) {
return getWriteTypeStandalone(globalContext, value, (AegisType)null);
- } else {
- return globalContext.getTypeMapping().getTypeCreator().createType(reflectType);
}
+ return globalContext.getTypeMapping().getTypeCreator().createType(reflectType);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
index 5b6812f..e304bf4 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
@@ -233,9 +233,8 @@ public class XMLTypeCreator extends AbstractTypeCreator {
Element mapping = findMapping(javaType);
if (mapping != null) {
return super.isEnum(javaType);
- } else {
- return nextCreator.isEnum(javaType);
}
+ return nextCreator.isEnum(javaType);
}
@Override
@@ -243,9 +242,8 @@ public class XMLTypeCreator extends AbstractTypeCreator {
Element mapping = findMapping(info.getType());
if (mapping != null) {
return super.createEnumType(info);
- } else {
- return nextCreator.createEnumType(info);
}
+ return nextCreator.createEnumType(info);
}
@Override
@@ -406,9 +404,8 @@ public class XMLTypeCreator extends AbstractTypeCreator {
type.setTypeMapping(getTypeMapping());
return type;
- } else {
- return nextCreator.createDefaultType(info);
}
+ return nextCreator.createDefaultType(info);
}
@Override
@@ -640,9 +637,8 @@ public class XMLTypeCreator extends AbstractTypeCreator {
}
return loadComponentClass(className);
- } else {
- return loadComponentClass(componentType);
}
+ return loadComponentClass(componentType);
}
private Class<?> loadComponentClass(String componentType) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
index f5090f7..e37cbc9 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
@@ -611,9 +611,8 @@ public class BeanType extends AegisType {
this.info.setExtension(true);
}
return superType;
- } else {
- return null;
}
+ return null;
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java
index f1ccc63..8215095 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java
@@ -237,9 +237,8 @@ public class BeanTypeInfo {
protected QName createMappedName(PropertyDescriptor desc, boolean qualified) {
if (qualified) {
return new QName(getDefaultNamespace(), desc.getName());
- } else {
- return new QName(null, desc.getName());
}
+ return new QName(null, desc.getName());
}
public void mapAttribute(String property, QName mappedName) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java
index 0874942..69de06f 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java
@@ -145,13 +145,11 @@ class InterfaceInvocationHandler implements InvocationHandler {
if (!Character.isUpperCase(methodName.charAt(firstCharacter + 1))) {
return Character.toLowerCase(methodName.charAt(firstCharacter))
+ methodName.substring(firstCharacter + 1);
- } else {
- return methodName.substring(3);
}
- } else {
- return Character.toLowerCase(methodName.charAt(firstCharacter))
- + methodName.substring(firstCharacter + 1);
+ return methodName.substring(3);
}
+ return Character.toLowerCase(methodName.charAt(firstCharacter))
+ + methodName.substring(firstCharacter + 1);
}
protected Integer proxyHashCode(Object proxy) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
index 0eefc78..bedc5cb 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
@@ -130,10 +130,9 @@ public class ObjectType extends AegisType {
if (-1 == colon) {
return new QName(reader.getNamespace(), typeName);
- } else {
- return new QName(reader.getNamespaceForPrefix(typeName.substring(0, colon)), typeName
- .substring(colon + 1));
}
+ return new QName(reader.getNamespaceForPrefix(typeName.substring(0, colon)), typeName
+ .substring(colon + 1));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java
index a978bee..b92a485 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java
@@ -88,9 +88,8 @@ public class AnnotatedTypeInfo extends BeanTypeInfo {
QName name = createQName(desc);
if (!qualify) {
return new QName(null, name.getLocalPart());
- } else {
- return name;
}
+ return name;
}
protected QName createQName(PropertyDescriptor desc) {
@@ -157,9 +156,8 @@ public class AnnotatedTypeInfo extends BeanTypeInfo {
PropertyDescriptor desc = getPropertyDescriptorFromMappedName(name);
if (annotationReader.isElement(desc.getReadMethod())) {
return annotationReader.isNillable(desc.getReadMethod());
- } else {
- return super.isNillable(name);
}
+ return super.isNillable(name);
}
public int getMinOccurs(QName name) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java
index 91a4eb2..6d32f45 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java
@@ -43,7 +43,7 @@ public class EnumType extends AegisType {
@Override
public void writeObject(Object object, MessageWriter writer, Context context) {
// match the reader.
- writer.writeValue(getValue((Enum<?>)object));
+ writer.writeValue(getValue(object));
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
index 3c74b87..26a5c69 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
@@ -62,9 +62,8 @@ public class Java5TypeCreator extends AbstractTypeCreator {
}
if (AegisType.class.isAssignableFrom(c)) {
return c.asSubclass(AegisType.class);
- } else {
- throw new DatabindingException("Invalid Aegis type annotation to non-type class" + c);
}
+ throw new DatabindingException("Invalid Aegis type annotation to non-type class" + c);
}
@Override
@@ -90,32 +89,31 @@ public class Java5TypeCreator extends AbstractTypeCreator {
annotationReader.getParamNamespace(m, index)));
}
return info;
+ }
+ Type genericReturnType = m.getGenericReturnType();
+ TypeClassInfo info;
+ if (genericReturnType instanceof Class) {
+ info = nextCreator.createClassInfo(m, index);
} else {
- Type genericReturnType = m.getGenericReturnType();
- TypeClassInfo info;
- if (genericReturnType instanceof Class) {
- info = nextCreator.createClassInfo(m, index);
- } else {
- info = new TypeClassInfo();
- info.setDescription("method " + m.getName() + " parameter " + index);
- info.setType(genericReturnType);
- }
+ info = new TypeClassInfo();
+ info.setDescription("method " + m.getName() + " parameter " + index);
+ info.setType(genericReturnType);
+ }
- if (m.getParameterAnnotations() != null && m.getAnnotations().length > 0) {
- info.setAnnotations(m.getAnnotations());
- }
+ if (m.getParameterAnnotations() != null && m.getAnnotations().length > 0) {
+ info.setAnnotations(m.getAnnotations());
+ }
- info.setAegisTypeClass(castToAegisTypeClass(annotationReader.getReturnType(m)));
- String returnName = annotationReader.getReturnTypeName(m);
- if (returnName != null) {
- info.setTypeName(createQName(m.getReturnType(),
- genericReturnType,
- returnName,
- annotationReader.getReturnNamespace(m)));
+ info.setAegisTypeClass(castToAegisTypeClass(annotationReader.getReturnType(m)));
+ String returnName = annotationReader.getReturnTypeName(m);
+ if (returnName != null) {
+ info.setTypeName(createQName(m.getReturnType(),
+ genericReturnType,
+ returnName,
+ annotationReader.getReturnNamespace(m)));
- }
- return info;
}
+ return info;
}
/*
@@ -140,9 +138,8 @@ public class Java5TypeCreator extends AbstractTypeCreator {
if (componentType != null) {
return createCollectionTypeFromGeneric(info);
- } else {
- return nextCreator.createCollectionType(info);
}
+ return nextCreator.createCollectionType(info);
}
// should be called 'collection'
@@ -216,12 +213,10 @@ public class Java5TypeCreator extends AbstractTypeCreator {
// we really aren't prepared to deal with multiple upper bounds,
// so we just look at the first one.
return wildcardType.getUpperBounds()[0];
- } else {
- return paramType; // take our chances.
}
- } else {
- return null;
+ return paramType; // take our chances.
}
+ return null;
}
protected Type getComponentTypeForMap(Type genericType, Map<String, Type> pm, boolean key) {
@@ -254,7 +249,7 @@ public class Java5TypeCreator extends AbstractTypeCreator {
if (Map.class.equals(pt.getRawType())) {
return types[key ? 0 : 1];
}
- return findMapGenericTypes((Class<?>)pt.getRawType(), pm, key);
+ return findMapGenericTypes(pt.getRawType(), pm, key);
} else if (cls instanceof Class) {
Class<?> c = (Class<?>)cls;
if (Map.class.isAssignableFrom(c)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java
index 31bc3b1..d873b7e 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java
@@ -318,12 +318,11 @@ public final class NamespaceHelper {
int index = value.indexOf(':');
if (index == -1) {
return new QName(nc.getNamespaceURI(""), value, "");
- } else {
- String prefix = value.substring(0, index);
- String localName = value.substring(index + 1);
- String ns = nc.getNamespaceURI(prefix);
- return new QName(ns, localName, prefix);
}
+ String prefix = value.substring(0, index);
+ String localName = value.substring(index + 1);
+ String ns = nc.getNamespaceURI(prefix);
+ return new QName(ns, localName, prefix);
}
public static QName createQName(Element e, String value, String defaultNamespace) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java
index ac903b9..a97712e 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java
@@ -74,9 +74,8 @@ public class JDOMNamespaceContext implements NamespaceContext {
if (element.getParentElement() != null) {
return rawGetPrefix(element.getParentElement(), namespaceURI);
- } else {
- return null;
}
+ return null;
}
static void rawGetPrefixes(Element element, String namespaceURI, List<String> prefixes) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/W3CNamespaceContext.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/W3CNamespaceContext.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/W3CNamespaceContext.java
index 369504f..37a0dea 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/W3CNamespaceContext.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/W3CNamespaceContext.java
@@ -75,9 +75,8 @@ public class W3CNamespaceContext implements NamespaceContext {
String name = a.getNodeName();
if ("xmlns".equals(name)) {
return "";
- } else {
- return name.substring(6);
}
+ return name.substring(6);
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
index a19d7ae..133cb4c 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
@@ -24,6 +24,7 @@ import java.util.regex.Pattern;
import javax.xml.namespace.NamespaceContext;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -151,7 +152,7 @@ public class ElementReader extends AbstractMessageReader {
int event = root.getEventType();
while (root.hasNext()) {
switch (event) {
- case XMLStreamReader.START_ELEMENT:
+ case XMLStreamConstants.START_ELEMENT:
if (root.getDepth() > depth) {
hasCheckedChildren = true;
hasChildren = true;
@@ -159,7 +160,7 @@ public class ElementReader extends AbstractMessageReader {
return true;
}
break;
- case XMLStreamReader.END_ELEMENT:
+ case XMLStreamConstants.END_ELEMENT:
if (root.getDepth() < depth) {
hasCheckedChildren = true;
hasChildren = false;
@@ -170,7 +171,7 @@ public class ElementReader extends AbstractMessageReader {
return false;
}
break;
- case XMLStreamReader.END_DOCUMENT:
+ case XMLStreamConstants.END_DOCUMENT:
// We should never get here...
hasCheckedChildren = true;
hasChildren = false;
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java
index 3574ae3..ef0150b 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java
@@ -154,11 +154,10 @@ public class ElementWriter extends AbstractMessageWriter {
*/
if ("".equals(qname.getPrefix())) {
return new ElementWriter(writer, qname.getLocalPart(), qname.getNamespaceURI());
- } else {
- return new ElementWriter(writer, qname.getLocalPart(),
- qname.getNamespaceURI(),
- qname.getPrefix());
}
+ return new ElementWriter(writer, qname.getLocalPart(),
+ qname.getNamespaceURI(),
+ qname.getPrefix());
}
public String getNamespace() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritanceService.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritanceService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritanceService.java
index 129e28f..1bc780d 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritanceService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritanceService.java
@@ -21,6 +21,8 @@
*/
package org.apache.cxf.aegis.inheritance;
+import org.junit.Assert;
+
public class InheritanceService {
public AbstractUser getEmployee() {
Employee e = new Employee();
@@ -31,6 +33,6 @@ public class InheritanceService {
}
public void receiveUser(AbstractUser user) {
- InheritancePOJOTest.assertTrue(user instanceof Employee);
+ Assert.assertTrue(user instanceof Employee);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/impl/WS1Impl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/impl/WS1Impl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/impl/WS1Impl.java
index 803fd31..8a1d2f5 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/impl/WS1Impl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/impl/WS1Impl.java
@@ -112,9 +112,8 @@ public class WS1Impl implements WS1 {
throw new WS1ExtendedException("WS1 extended exception",
20, 30,
new SimpleBean());
- } else {
- throw new WS1Exception("WS1 base exception", 10);
}
+ throw new WS1Exception("WS1 base exception", 10);
}
public Map<?, ?> echoRawMap(Map<?, ?> rawMap) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
index f39ffff..f332d50 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
@@ -175,13 +175,13 @@ public class SoapArrayTypeTest extends AbstractEncodedTest {
ElementReader reader = new ElementReader(getClass().getResourceAsStream("arrayStructs.xml"));
Address[] addresses = (Address[]) createArrayType(Address[].class).readObject(reader, context);
reader.getXMLStreamReader().close();
- StructTypeTest.validateShippingAddress(addresses[0]);
- StructTypeTest.validateBillingAddress(addresses[1]);
+ AbstractEncodedTest.validateShippingAddress(addresses[0]);
+ AbstractEncodedTest.validateBillingAddress(addresses[1]);
// round trip tests
addresses = readWriteReadRef("arrayStructs.xml", Address[].class);
- StructTypeTest.validateShippingAddress(addresses[0]);
- StructTypeTest.validateBillingAddress(addresses[1]);
+ AbstractEncodedTest.validateShippingAddress(addresses[0]);
+ AbstractEncodedTest.validateBillingAddress(addresses[1]);
}
@Test
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
index 8e228a4..95132a8 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
@@ -19,6 +19,7 @@
package org.apache.cxf.aegis.xml.stax;
import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -47,7 +48,7 @@ public class ReaderTest extends AbstractCXFTest {
*/
XMLStreamReader reader = StaxUtils.createXMLStreamReader(getResourceAsStream(resource), null);
- while (reader.getEventType() != XMLStreamReader.START_ELEMENT) {
+ while (reader.getEventType() != XMLStreamConstants.START_ELEMENT) {
reader.next();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
index a727bf4..3fb0041 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
@@ -449,9 +449,8 @@ class JAXBContextInitializer extends ServiceModelVisitor {
if (accessType == XmlAccessType.NONE
|| accessType == XmlAccessType.PROPERTY) {
return checkJaxbAnnotation(field.getAnnotations());
- } else {
- return true;
}
+ return true;
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
index 7770526..f39b18d 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
@@ -266,9 +266,8 @@ public final class JAXBEncoderDecoder {
Message faultMessage = new Message("MARSHAL_ERROR", LOG, marshalEx.getLinkedException()
.getMessage());
throw new Fault(faultMessage, ex);
- } else {
- throw new Fault(new Message("MARSHAL_ERROR", LOG, ex.getMessage()), ex);
}
+ throw new Fault(new Message("MARSHAL_ERROR", LOG, ex.getMessage()), ex);
}
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -312,9 +311,8 @@ public final class JAXBEncoderDecoder {
Message faultMessage = new Message("MARSHAL_ERROR", LOG, marshalEx.getLinkedException()
.getMessage());
throw new Fault(faultMessage, ex);
- } else {
- throw new Fault(new Message("MARSHAL_ERROR", LOG, ex.getMessage()), ex);
}
+ throw new Fault(new Message("MARSHAL_ERROR", LOG, ex.getMessage()), ex);
}
}
@@ -346,9 +344,8 @@ public final class JAXBEncoderDecoder {
Message faultMessage = new Message("MARSHAL_ERROR", LOG, marshalEx.getLinkedException()
.getMessage());
throw new Fault(faultMessage, ex);
- } else {
- throw new Fault(new Message("MARSHAL_ERROR", LOG, ex.getMessage()), ex);
}
+ throw new Fault(new Message("MARSHAL_ERROR", LOG, ex.getMessage()), ex);
}
}
@@ -526,7 +523,7 @@ public final class JAXBEncoderDecoder {
XmlAccessType accessType = Utils.getXmlAccessType(cls);
reader.nextTag();
- while (reader.getEventType() == XMLStreamReader.START_ELEMENT) {
+ while (reader.getEventType() == XMLStreamConstants.START_ELEMENT) {
QName q = reader.getName();
String fieldName = q.getLocalPart();
Field f = Utils.getField(cls, accessType, fieldName);
@@ -598,7 +595,7 @@ public final class JAXBEncoderDecoder {
}
}
}
- if (reader.getEventType() == XMLStreamReader.END_ELEMENT && q.equals(reader.getName())) {
+ if (reader.getEventType() == XMLStreamConstants.END_ELEMENT && q.equals(reader.getName())) {
reader.next();
}
}
@@ -906,10 +903,9 @@ public final class JAXBEncoderDecoder {
if (unmarshalEx.getLinkedException() != null) {
throw new Fault(new Message("UNMARSHAL_ERROR", LOG,
unmarshalEx.getLinkedException().getMessage()), ex);
- } else {
- throw new Fault(new Message("UNMARSHAL_ERROR", LOG,
- unmarshalEx.getMessage()), ex);
}
+ throw new Fault(new Message("UNMARSHAL_ERROR", LOG,
+ unmarshalEx.getMessage()), ex);
}
throw new Fault(new Message("UNMARSHAL_ERROR", LOG, ex.getMessage()), ex);
}
@@ -1092,9 +1088,8 @@ public final class JAXBEncoderDecoder {
javax.xml.bind.UnmarshalException unmarshalEx = (javax.xml.bind.UnmarshalException)ex;
throw new Fault(new Message("UNMARSHAL_ERROR", LOG, unmarshalEx.getLinkedException()
.getMessage()), ex);
- } else {
- throw new Fault(new Message("UNMARSHAL_ERROR", LOG, ex.getMessage()), ex);
}
+ throw new Fault(new Message("UNMARSHAL_ERROR", LOG, ex.getMessage()), ex);
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
index 97ca0e7..c82520d 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
@@ -98,9 +98,8 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
if (cls instanceof Class) {
if (((Class<?>)cls).isArray()) {
return ((Class<?>)cls).getComponentType();
- } else {
- return (Class<?>)cls;
}
+ return (Class<?>)cls;
} else if (cls instanceof ParameterizedType) {
for (Type t2 : ((ParameterizedType)cls).getActualTypeArguments()) {
return getArrayComponentType(t2);
@@ -117,9 +116,8 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
if (cls instanceof Class) {
if (((Class<?>)cls).isArray()) {
return getBeanInfo(((Class<?>)cls).getComponentType());
- } else {
- return getBeanInfo((Class<?>)cls);
}
+ return getBeanInfo((Class<?>)cls);
} else if (cls instanceof ParameterizedType) {
for (Type t2 : ((ParameterizedType)cls).getActualTypeArguments()) {
return getBeanInfo(t2);
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBWrapperHelper.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBWrapperHelper.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBWrapperHelper.java
index 7546355..7ac8de3 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBWrapperHelper.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBWrapperHelper.java
@@ -57,9 +57,8 @@ public class JAXBWrapperHelper extends AbstractWrapperHelper {
if ("javax.xml.bind.JAXBElement".equals(method.getReturnType().getCanonicalName())) {
JAXBElement<?> je = (JAXBElement<?>)method.invoke(in);
return je == null ? je : je.getValue();
- } else {
- return method.invoke(in);
}
+ return method.invoke(in);
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
index 70613a2..ed9f64f 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
@@ -237,9 +237,8 @@ final class WrapperHelperCompiler extends ASMHelper {
&& fields[x] == null) {
// null placeholder
continue;
- } else {
- return false;
}
+ return false;
}
Class<?> tp = getMethods[x].getReturnType();
mv.visitVarInsn(Opcodes.ALOAD, 2);
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentMarshaller.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentMarshaller.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentMarshaller.java
index 40c6156..cdbab79 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentMarshaller.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentMarshaller.java
@@ -59,9 +59,8 @@ public class JAXBAttachmentMarshaller extends AttachmentMarshaller {
atts.add(att);
lastElementName = new QName(elementNS, elementLocalName);
return "cid:" + att.getId();
- } else {
- return null;
}
+ return null;
}
public String addMtomAttachment(DataHandler handler, String elementNS, String elementLocalName) {
@@ -71,9 +70,8 @@ public class JAXBAttachmentMarshaller extends AttachmentMarshaller {
atts.add(att);
lastElementName = new QName(elementNS, elementLocalName);
return "cid:" + att.getId();
- } else {
- return null;
}
+ return null;
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
index 38e9174..e218de4 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
@@ -73,16 +73,15 @@ public class DataReaderImpl<T> extends JAXBDataBase implements DataReader<T> {
// to do anything, otherwise if not yet handled, then do this 'hack'
if (origHandler != null && origHandler.handleEvent(event)) {
return true;
- } else {
- // hack for CXF-3453
- String msg = event.getMessage();
- return msg != null
- && msg.contains(":Id")
- && (msg.startsWith("cvc-type.3.1.1")
- || msg.startsWith("cvc-type.3.2.2")
- || msg.startsWith("cvc-complex-type.3.1.1")
- || msg.startsWith("cvc-complex-type.3.2.2"));
}
+ // hack for CXF-3453
+ String msg = event.getMessage();
+ return msg != null
+ && msg.contains(":Id")
+ && (msg.startsWith("cvc-type.3.1.1")
+ || msg.startsWith("cvc-type.3.2.2")
+ || msg.startsWith("cvc-complex-type.3.1.1")
+ || msg.startsWith("cvc-complex-type.3.2.2"));
}
}
@@ -139,9 +138,8 @@ public class DataReaderImpl<T> extends JAXBDataBase implements DataReader<T> {
javax.xml.bind.UnmarshalException unmarshalEx = (javax.xml.bind.UnmarshalException)ex;
throw new Fault(new Message("UNMARSHAL_ERROR", LOG, unmarshalEx.getLinkedException()
.getMessage()), ex);
- } else {
- throw new Fault(new Message("UNMARSHAL_ERROR", LOG, ex.getMessage()), ex);
}
+ throw new Fault(new Message("UNMARSHAL_ERROR", LOG, ex.getMessage()), ex);
}
}
@@ -205,9 +203,8 @@ public class DataReaderImpl<T> extends JAXBDataBase implements DataReader<T> {
if (e.getLinkedException() != null) {
throw new Fault(new Message("UNMARSHAL_ERROR", LOG,
e.getLinkedException().getMessage()), e);
- } else {
- throw new Fault(new Message("UNMARSHAL_ERROR", LOG, e.getMessage()), e);
}
+ throw new Fault(new Message("UNMARSHAL_ERROR", LOG, e.getMessage()), e);
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/2a6144f5/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
index 37555e5..5ca0a36 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
@@ -179,9 +179,8 @@ public class DataWriterImpl<T> extends JAXBDataBase implements DataWriter<T> {
Message faultMessage = new Message("MARSHAL_ERROR", LOG, marshalEx.getLinkedException()
.getMessage());
throw new Fault(faultMessage, ex);
- } else {
- throw new Fault(new Message("MARSHAL_ERROR", LOG, ex.getMessage()), ex);
}
+ throw new Fault(new Message("MARSHAL_ERROR", LOG, ex.getMessage()), ex);
}
for (XmlAdapter<?, ?> adapter : databinding.getConfiguredXmlAdapters()) {
marshaller.setAdapter(adapter);
@@ -307,9 +306,8 @@ public class DataWriterImpl<T> extends JAXBDataBase implements DataWriter<T> {
if (e.getLinkedException() != null) {
throw new Fault(new Message("MARSHAL_ERROR", LOG,
e.getLinkedException().getMessage()), e);
- } else {
- throw new Fault(new Message("MARSHAL_ERROR", LOG, e.getMessage()), e);
}
+ throw new Fault(new Message("MARSHAL_ERROR", LOG, e.getMessage()), e);
}
}
}
[02/12] cxf git commit: Fix static refences and unnecessary elses in
tracing/brave
Posted by dk...@apache.org.
Fix static refences and unnecessary elses in tracing/brave
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d111a1d7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d111a1d7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d111a1d7
Branch: refs/heads/master
Commit: d111a1d71cf74588c28711b4db62178a736c8d84
Parents: 6d35b60
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 10:19:24 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 10:40:43 2017 -0400
----------------------------------------------------------------------
.../org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java | 6 ++----
.../java/org/apache/cxf/tracing/brave/BraveTracerContext.java | 3 +--
.../org/apache/cxf/tracing/brave/HttpClientSpanParser.java | 3 +--
.../org/apache/cxf/tracing/brave/HttpServerSpanParser.java | 3 +--
4 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d111a1d7/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
index 58b67f8..91d54ed 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
@@ -72,9 +72,8 @@ public abstract class AbstractBraveInterceptor extends AbstractBraveProvider imp
String query = safeGet(Message.QUERY_STRING);
if (query != null) {
return uri + "?" + query;
- } else {
- return uri;
}
+ return uri;
}
URI getUri() {
@@ -91,9 +90,8 @@ public abstract class AbstractBraveInterceptor extends AbstractBraveProvider imp
boolean isOutbound = MessageUtils.isOutbound(message);
if (isRequestor) {
return isOutbound ? message : message.getExchange().getOutMessage();
- } else {
- return isOutbound ? message.getExchange().getInMessage() : message;
}
+ return isOutbound ? message.getExchange().getInMessage() : message;
}
Map<String, List<String>> getHeaders() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/d111a1d7/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
index 96160f5..5fc7553 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
@@ -104,8 +104,7 @@ public class BraveTracerContext implements TracerContext {
private TraceScope newOrChildSpan(final String description, final Span parent) {
if (parent == null) {
return new TraceScope(brave, tracer.newTrace().name(description).start());
- } else {
- return new TraceScope(brave, tracer.newChild(parent.context()).name(description).start());
}
+ return new TraceScope(brave, tracer.newChild(parent.context()).name(description).start());
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d111a1d7/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpClientSpanParser.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpClientSpanParser.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpClientSpanParser.java
index a139e06..978cbdd 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpClientSpanParser.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpClientSpanParser.java
@@ -32,8 +32,7 @@ public class HttpClientSpanParser extends HttpClientParser {
private String buildSpanDescription(final String path, final String method) {
if (StringUtils.isEmpty(method)) {
return path;
- } else {
- return method + " " + path;
}
+ return method + " " + path;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d111a1d7/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpServerSpanParser.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpServerSpanParser.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpServerSpanParser.java
index dbd477e..95c4d77 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpServerSpanParser.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/HttpServerSpanParser.java
@@ -32,8 +32,7 @@ public class HttpServerSpanParser extends HttpServerParser {
private String buildSpanDescription(final String path, final String method) {
if (StringUtils.isEmpty(method)) {
return path;
- } else {
- return method + " " + path;
}
+ return method + " " + path;
}
}
[06/12] cxf git commit: Fix a BUNCH more warnings
Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptor.java b/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptor.java
index 3ab7f16..3292c78 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptor.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageInvokerInterceptor.java
@@ -40,7 +40,7 @@ public class ResponseTimeMessageInvokerInterceptor extends AbstractMessageRespon
public void handleMessage(Message message) throws Fault {
Exchange ex = message.getExchange();
- Boolean forceDisabled = Boolean.FALSE.equals((Boolean)ex.get("org.apache.cxf.management.counter.enabled"));
+ Boolean forceDisabled = Boolean.FALSE.equals(ex.get("org.apache.cxf.management.counter.enabled"));
if (!forceDisabled && isServiceCounterEnabled(ex)) {
message.getInterceptorChain().add(new ResponseTimeMessageInvokerEndingInteceptor());
}
@@ -50,7 +50,7 @@ public class ResponseTimeMessageInvokerInterceptor extends AbstractMessageRespon
@Override
public void handleFault(Message message) {
Exchange ex = message.getExchange();
- Boolean forceDisabled = Boolean.FALSE.equals((Boolean)ex.get("org.apache.cxf.management.counter.enabled"));
+ Boolean forceDisabled = Boolean.FALSE.equals(ex.get("org.apache.cxf.management.counter.enabled"));
if (isServiceCounterEnabled(ex) && !forceDisabled) {
ex.put(FaultMode.class, message.get(FaultMode.class));
if (ex.isOneWay() && !isClient(message)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptor.java b/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptor.java
index 8ed344b..f3d09cb 100644
--- a/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptor.java
+++ b/rt/management/src/main/java/org/apache/cxf/management/interceptor/ResponseTimeMessageOutInterceptor.java
@@ -36,7 +36,7 @@ public class ResponseTimeMessageOutInterceptor extends AbstractMessageResponseTi
public void handleMessage(Message message) throws Fault {
Exchange ex = message.getExchange();
- Boolean forceDisabled = Boolean.FALSE.equals((Boolean)ex.get("org.apache.cxf.management.counter.enabled"));
+ Boolean forceDisabled = Boolean.FALSE.equals(ex.get("org.apache.cxf.management.counter.enabled"));
if (!forceDisabled && isServiceCounterEnabled(ex)) {
if (ex.get(Exception.class) != null) {
endHandlingMessage(ex);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java
----------------------------------------------------------------------
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java
index f21b57a..ff251ce 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProviderFactory.java
@@ -71,7 +71,7 @@ public final class ClientProviderFactory extends ProviderFactory {
@Override
protected void setProviders(boolean custom, boolean busGlobal, Object... providers) {
List<ProviderInfo<? extends Object>> theProviders =
- prepareProviders(custom, busGlobal, (Object[])providers, null);
+ prepareProviders(custom, busGlobal, providers, null);
super.setCommonProviders(theProviders);
for (ProviderInfo<? extends Object> provider : theProviders) {
Class<?> providerCls = ClassHelper.getRealClass(getBus(), provider.getProvider());
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JaxrsClientCallback.java
----------------------------------------------------------------------
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JaxrsClientCallback.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JaxrsClientCallback.java
index 12e8af7..98443c5 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JaxrsClientCallback.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/JaxrsClientCallback.java
@@ -118,7 +118,7 @@ public class JaxrsClientCallback<T> extends ClientCallback {
return getObject(callback.get()[0]);
} catch (InterruptedException ex) {
if (callback.handler != null) {
- callback.handler.failed((InterruptedException)ex);
+ callback.handler.failed(ex);
}
throw ex;
}
@@ -129,7 +129,7 @@ public class JaxrsClientCallback<T> extends ClientCallback {
return getObject(callback.get(timeout, unit)[0]);
} catch (InterruptedException ex) {
if (callback.handler != null) {
- callback.handler.failed((InterruptedException)ex);
+ callback.handler.failed(ex);
}
throw ex;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/cache/CacheControlClientReaderInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/cache/CacheControlClientReaderInterceptor.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/cache/CacheControlClientReaderInterceptor.java
index 3b83979..3be9402 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/cache/CacheControlClientReaderInterceptor.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/cache/CacheControlClientReaderInterceptor.java
@@ -94,7 +94,7 @@ public class CacheControlClientReaderInterceptor implements ReaderInterceptor {
final boolean validCacheControl = isCacheControlValid(context, cacheControl);
if (validCacheControl && cacheResponseInputStream) {
// if Cache-Control is set and the stream needs to be cached then do it
- cachedBytes = IOUtils.readBytesFromStream((InputStream)context.getInputStream());
+ cachedBytes = IOUtils.readBytesFromStream(context.getInputStream());
context.setInputStream(new ByteArrayInputStream(cachedBytes));
}
// Read the stream and get the actual entity
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseContextImpl.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseContextImpl.java
index df5d9cb..317ab21 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseContextImpl.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientResponseContextImpl.java
@@ -42,7 +42,7 @@ public class ClientResponseContextImpl extends AbstractResponseContextImpl
public InputStream getEntityStream() {
InputStream is = m.getContent(InputStream.class);
if (is == null) {
- is = ((ResponseImpl)r).convertEntityToStreamIfPossible();
+ is = r.convertEntityToStreamIfPossible();
}
return is;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
----------------------------------------------------------------------
diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 8a17ecf..821f32e 100644
--- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -1274,7 +1274,7 @@ public class WadlGenerator implements ContainerRequestFilter {
TransformerFactory transformerFactory = TransformerFactory.newInstance();
transformerFactory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true);
Transformer t = transformerFactory.newTemplates(new StreamSource(is)).newTransformer();
- t.setParameter("base.path", (String)m.get("http.base.path"));
+ t.setParameter("base.path", m.get("http.base.path"));
StringWriter stringWriter = new StringWriter();
t.transform(source, new StreamResult(stringWriter));
return stringWriter.toString();
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/SimpleTypeJsonProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/SimpleTypeJsonProvider.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/SimpleTypeJsonProvider.java
index dfeaaa5..9abc650 100644
--- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/SimpleTypeJsonProvider.java
+++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/SimpleTypeJsonProvider.java
@@ -105,7 +105,7 @@ public class SimpleTypeJsonProvider<T> extends AbstractConfigurableProvider
throws IOException, WebApplicationException {
if (!supportSimpleTypesOnly && !InjectionUtils.isPrimitive(type)) {
MessageBodyReader<T> next =
- (MessageBodyReader<T>)providers.getMessageBodyReader(type, genericType, annotations, mediaType);
+ providers.getMessageBodyReader(type, genericType, annotations, mediaType);
JAXRSUtils.getCurrentMessage().put(ProviderFactory.ACTIVE_JAXRS_PROVIDER_KEY, this);
try {
return next.readFrom(type, genericType, annotations, mediaType, headers, is);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/provider/ObservableReader.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/provider/ObservableReader.java b/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/provider/ObservableReader.java
index 1b76d2f..c4423ae 100644
--- a/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/provider/ObservableReader.java
+++ b/rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx/provider/ObservableReader.java
@@ -52,7 +52,7 @@ public class ObservableReader<T> implements MessageBodyReader<Observable<T>> {
@SuppressWarnings("unchecked")
Class<T> actualCls = (Class<T>)InjectionUtils.getActualType(t);
final MessageBodyReader<T> mbr =
- (MessageBodyReader<T>)providers.getMessageBodyReader(actualCls, actualCls, anns, mt);
+ providers.getMessageBodyReader(actualCls, actualCls, anns, mt);
if (mbr == null) {
throw new ProcessingException("MBR is null");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractor.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractor.java b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractor.java
index 99a32bc..fa697ac 100644
--- a/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractor.java
+++ b/rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/tika/TikaContentExtractor.java
@@ -34,6 +34,7 @@ import org.apache.cxf.jaxrs.ext.search.SearchBean;
import org.apache.tika.detect.DefaultDetector;
import org.apache.tika.detect.Detector;
import org.apache.tika.exception.TikaException;
+import org.apache.tika.metadata.HttpHeaders;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.AutoDetectParser;
@@ -178,7 +179,7 @@ public class TikaContentExtractor {
mediaType = detector.detect(in, metadata);
}
if (mediaType != null) {
- metadata.set(Metadata.CONTENT_TYPE, mediaType.toString());
+ metadata.set(HttpHeaders.CONTENT_TYPE, mediaType.toString());
}
Parser parser = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorFiqlTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorFiqlTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorFiqlTest.java
index 7a6ad77..3e91a64 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorFiqlTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorFiqlTest.java
@@ -207,7 +207,7 @@ public class JPATypedQueryVisitorFiqlTest extends AbstractJPATypedQueryVisitorTe
assertEquals(1, books.size());
Object[] info = books.get(0);
assertEquals(10, ((Integer)info[0]).intValue());
- assertEquals("num10", (String)info[1]);
+ assertEquals("num10", info[1]);
}
@Test
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
index affab8f..09cb75d 100644
--- a/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
+++ b/rt/rs/extensions/search/src/test/java/org/apache/cxf/jaxrs/ext/search/jpa/JPATypedQueryVisitorODataTest.java
@@ -170,7 +170,7 @@ public class JPATypedQueryVisitorODataTest extends AbstractJPATypedQueryVisitorT
assertEquals(1, books.size());
Object[] info = books.get(0);
assertEquals(10, ((Integer)info[0]).intValue());
- assertEquals("num10", (String)info[1]);
+ assertEquals("num10", info[1]);
}
@Test
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/KeyManagementUtils.java
----------------------------------------------------------------------
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 2b020df..04e3a9a 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
@@ -361,7 +361,7 @@ public final class KeyManagementUtils {
// Initial chain validation, to be enhanced as needed
try {
X509CertSelector certSelect = new X509CertSelector();
- certSelect.setCertificate((X509Certificate) inCerts.get(0));
+ certSelect.setCertificate(inCerts.get(0));
PKIXBuilderParameters pbParams = new PKIXBuilderParameters(ks, certSelect);
pbParams.addCertStore(CertStore.getInstance("Collection",
new CollectionCertStoreParameters(inCerts)));
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesGcmContentEncryptionAlgorithm.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesGcmContentEncryptionAlgorithm.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesGcmContentEncryptionAlgorithm.java
index 20e35c9..96c4b2c 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesGcmContentEncryptionAlgorithm.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AesGcmContentEncryptionAlgorithm.java
@@ -34,10 +34,10 @@ public class AesGcmContentEncryptionAlgorithm extends AbstractContentEncryptionA
super(checkAlgorithm(algo), generateCekOnce);
}
public AesGcmContentEncryptionAlgorithm(String encodedCek, String encodedIv, ContentAlgorithm algo) {
- this((byte[])CryptoUtils.decodeSequence(encodedCek), CryptoUtils.decodeSequence(encodedIv), algo);
+ this(CryptoUtils.decodeSequence(encodedCek), CryptoUtils.decodeSequence(encodedIv), algo);
}
public AesGcmContentEncryptionAlgorithm(String encodedCek, ContentAlgorithm algo) {
- this((byte[])CryptoUtils.decodeSequence(encodedCek), null, algo);
+ this(CryptoUtils.decodeSequence(encodedCek), null, algo);
}
public AesGcmContentEncryptionAlgorithm(SecretKey key, ContentAlgorithm algo) {
this(key, (byte[])null, algo);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java
index 9702582..c77ce8b 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jws/JwsJsonConsumerTest.java
@@ -76,13 +76,13 @@ public class JwsJsonConsumerTest extends Assert {
List<JwsJsonSignatureEntry> sigEntries = consumer.getSignatureEntries();
assertEquals(2, sigEntries.size());
// 1st signature
- String firstKid = (String)sigEntries.get(0).getKeyId();
+ String firstKid = sigEntries.get(0).getKeyId();
assertEquals(KID_OF_THE_FIRST_SIGNER, firstKid);
JsonWebKey rsaKey = jwks.getKey(firstKid);
assertNotNull(rsaKey);
assertTrue(sigEntries.get(0).verifySignatureWith(rsaKey));
// 2nd signature
- String secondKid = (String)sigEntries.get(1).getKeyId();
+ String secondKid = sigEntries.get(1).getKeyId();
assertEquals(KID_OF_THE_SECOND_SIGNER, secondKid);
JsonWebKey ecKey = jwks.getKey(secondKid);
assertNotNull(ecKey);
@@ -96,7 +96,7 @@ public class JwsJsonConsumerTest extends Assert {
List<JwsJsonSignatureEntry> sigEntries = consumer.getSignatureEntries();
assertEquals(2, sigEntries.size());
// 1st signature
- String firstKid = (String)sigEntries.get(0).getKeyId();
+ String firstKid = sigEntries.get(0).getKeyId();
assertEquals(KID_OF_THE_FIRST_SIGNER, firstKid);
JsonWebKey rsaKey = jwks.getKey(firstKid);
assertNotNull(rsaKey);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
index f428a4c..e12c515 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEHCacheOAuthDataProvider.java
@@ -174,7 +174,7 @@ public class DefaultEHCacheOAuthDataProvider extends AbstractOAuthDataProvider {
protected static void putCacheValue(Ehcache cache, String key, Object value, long ttl) {
Element element = new Element(key, value);
int parsedTTL = (int)ttl;
- if (ttl != (long)parsedTTL) {
+ if (ttl != parsedTTL) {
throw new OAuthServiceException("Requested time to live can not be supported");
}
element.setTimeToLive(parsedTTL);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthServerJoseJwtProducer.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthServerJoseJwtProducer.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthServerJoseJwtProducer.java
index 4e38d73..2cdadbd 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthServerJoseJwtProducer.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/OAuthServerJoseJwtProducer.java
@@ -19,8 +19,6 @@
package org.apache.cxf.rs.security.oauth2.provider;
import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPublicKey;
-
import org.apache.cxf.rs.security.jose.jwa.ContentAlgorithm;
import org.apache.cxf.rs.security.jose.jwa.KeyAlgorithm;
import org.apache.cxf.rs.security.jose.jwe.JweEncryptionProvider;
@@ -44,7 +42,7 @@ public class OAuthServerJoseJwtProducer extends OAuthJoseJwtProducer {
if (encryptWithClientCertificates && c != null && !c.getApplicationCertificates().isEmpty()) {
X509Certificate cert =
(X509Certificate)CryptoUtils.decodeCertificate(c.getApplicationCertificates().get(0));
- theEncryptionProvider = JweUtils.createJweEncryptionProvider((RSAPublicKey)cert.getPublicKey(),
+ theEncryptionProvider = JweUtils.createJweEncryptionProvider(cert.getPublicKey(),
KeyAlgorithm.RSA_OAEP,
ContentAlgorithm.A128GCM,
null);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenService.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenService.java
index 1fa88d58..41e608b 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenService.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenService.java
@@ -175,7 +175,7 @@ public class AccessTokenService extends AbstractTokenService {
if (super.getDataProvider() instanceof AuthorizationCodeDataProvider) {
AuthorizationCodeGrantHandler handler = new AuthorizationCodeGrantHandler();
if (handler.getSupportedGrantTypes().contains(grantType)) {
- handler.setDataProvider((AuthorizationCodeDataProvider)super.getDataProvider());
+ handler.setDataProvider(super.getDataProvider());
return handler;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
index b8dfe7b..0245a34 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
@@ -111,7 +111,7 @@ public class AuthorizationCodeGrantService extends RedirectionBasedGrantService
bean.setAuthorizationCode(grantCode);
bean.setUserId(userSubject.getLogin());
bean.setExpiresIn(grant.getExpiresIn());
- return deliverOOBResponse((OOBAuthorizationResponse)bean);
+ return deliverOOBResponse(bean);
} else if (isFormResponse(state)) {
FormAuthorizationResponse bean = new FormAuthorizationResponse();
bean.setAuthorizationCode(grantCode);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/EHCacheUtil.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/EHCacheUtil.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/EHCacheUtil.java
index 73de08c..e0f275f 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/EHCacheUtil.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/EHCacheUtil.java
@@ -73,7 +73,7 @@ public final class EHCacheUtil {
if (cc == null) {
cc = new CacheConfiguration();
} else {
- cc = (CacheConfiguration)cc.clone();
+ cc = cc.clone();
}
cc.setName(key);
return cc;
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/FormIdTokenResponse.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/FormIdTokenResponse.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/FormIdTokenResponse.java
index 41f28ff..8ea26a5 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/FormIdTokenResponse.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/FormIdTokenResponse.java
@@ -23,7 +23,7 @@ import org.apache.cxf.rs.security.oidc.utils.OidcUtils;
public class FormIdTokenResponse extends AbstractFormImplicitResponse {
public String getIdToken() {
- return (String)getParameters().get(OidcUtils.ID_TOKEN);
+ return getParameters().get(OidcUtils.ID_TOKEN);
}
public void setIdToken(String idToken) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java
index 98c80fc..7fe746b 100644
--- a/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java
+++ b/rt/rs/security/sso/oidc/src/test/java/org/apache/cxf/rs/security/oidc/utils/OidcUtilsTest.java
@@ -20,7 +20,7 @@ package org.apache.cxf.rs.security.oidc.utils;
import java.util.List;
-import org.apache.cxf.rs.security.oidc.common.UserInfo;
+import org.apache.cxf.rs.security.oidc.common.AbstractUserInfo;
import org.junit.Assert;
import org.junit.Test;
@@ -39,7 +39,7 @@ public class OidcUtilsTest extends Assert {
List<String> claims = OidcUtils.getScopeClaims(OidcUtils.PHONE_SCOPE);
assertNotNull(claims);
assertEquals(1, claims.size());
- assertEquals(UserInfo.PHONE_CLAIM, claims.get(0));
+ assertEquals(AbstractUserInfo.PHONE_CLAIM, claims.get(0));
}
@Test
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
index 18cc51f..7486c39 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheTokenReplayCache.java
@@ -137,10 +137,10 @@ public class EHCacheTokenReplayCache implements TokenReplayCache<String> {
}
int parsedTTL = (int)timeToLive;
- if (timeToLive != (long)parsedTTL || parsedTTL < 0 || parsedTTL > MAX_TTL) {
+ if (timeToLive != parsedTTL || parsedTTL < 0 || parsedTTL > MAX_TTL) {
// Default to configured value
parsedTTL = (int)ttl;
- if (ttl != (long)parsedTTL) {
+ if (ttl != parsedTTL) {
// Fall back to 60 minutes if the default TTL is set incorrectly
parsedTTL = 3600;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtil.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtil.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtil.java
index 9ebb37d..73c31bd 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtil.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/EHCacheUtil.java
@@ -64,7 +64,7 @@ public final class EHCacheUtil {
if (cc == null) {
cc = new CacheConfiguration();
} else {
- cc = (CacheConfiguration)cc.clone();
+ cc = cc.clone();
}
cc.setName(key);
return cc;
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java
index 32ec218..0d7a1b6 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SamlPostBindingFilter.java
@@ -167,7 +167,7 @@ public class SamlPostBindingFilter extends AbstractServiceProviderFilter {
"Error generating KeyInfo from signing credential", ex);
}
- SignableSAMLObject signableObject = (SignableSAMLObject) authnRequest;
+ SignableSAMLObject signableObject = authnRequest;
signableObject.setSignature(signature);
signableObject.releaseDOM();
signableObject.releaseChildrenDOM(true);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java
index 795bdde..d500865 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/state/EHCacheSPStateManager.java
@@ -152,7 +152,7 @@ public class EHCacheSPStateManager implements SPStateManager {
}
int parsedTTL = (int)ttl;
- if (ttl != (long)parsedTTL) {
+ if (ttl != parsedTTL) {
// Fall back to 5 minutes if the default TTL is set incorrectly
parsedTTL = 60 * 5;
}
@@ -169,7 +169,7 @@ public class EHCacheSPStateManager implements SPStateManager {
}
int parsedTTL = (int)ttl;
- if (ttl != (long)parsedTTL) {
+ if (ttl != parsedTTL) {
// Fall back to 60 minutes if the default TTL is set incorrectly
parsedTTL = 3600;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/AbstractSAMLCallbackHandler.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/AbstractSAMLCallbackHandler.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/AbstractSAMLCallbackHandler.java
index 4e465b1..f5f051c 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/AbstractSAMLCallbackHandler.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/AbstractSAMLCallbackHandler.java
@@ -29,6 +29,8 @@ import javax.xml.parsers.DocumentBuilderFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+
+import org.apache.wss4j.common.WSS4JConstants;
import org.apache.wss4j.common.saml.SAMLCallback;
import org.apache.wss4j.common.saml.bean.ActionBean;
import org.apache.wss4j.common.saml.bean.AttributeBean;
@@ -217,10 +219,10 @@ public abstract class AbstractSAMLCallbackHandler implements CallbackHandler {
// Append the EncryptedKey to a KeyInfo element
Element keyInfoElement =
doc.createElementNS(
- WSConstants.SIG_NS, WSConstants.SIG_PREFIX + ":" + WSConstants.KEYINFO_LN
+ WSS4JConstants.SIG_NS, WSS4JConstants.SIG_PREFIX + ":" + WSS4JConstants.KEYINFO_LN
);
keyInfoElement.setAttributeNS(
- WSConstants.XMLNS_NS, "xmlns:" + WSConstants.SIG_PREFIX, WSConstants.SIG_NS
+ WSS4JConstants.XMLNS_NS, "xmlns:" + WSS4JConstants.SIG_PREFIX, WSS4JConstants.SIG_NS
);
keyInfoElement.appendChild(encryptedKeyElement);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java
index c8046b0..1cb6061 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/CombinedValidatorTest.java
@@ -28,6 +28,7 @@ import java.util.Collections;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.helpers.DOMUtils;
+import org.apache.wss4j.common.WSS4JConstants;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoType;
import org.apache.wss4j.common.crypto.Merlin;
@@ -41,7 +42,6 @@ import org.apache.wss4j.common.saml.bean.ConditionsBean;
import org.apache.wss4j.common.saml.bean.SubjectConfirmationDataBean;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
import org.apache.wss4j.common.util.Loader;
-import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.engine.WSSConfig;
import org.joda.time.DateTime;
import org.opensaml.saml.common.SignableSAMLObject;
@@ -125,7 +125,7 @@ public class CombinedValidatorTest extends org.junit.Assert {
Element clonedAssertion = (Element)assertionElement.cloneNode(true);
clonedAssertion.setAttributeNS(null, "ID", "_12345623562");
Element sigElement =
- (Element)clonedAssertion.getElementsByTagNameNS(WSConstants.SIG_NS, "Signature").item(0);
+ (Element)clonedAssertion.getElementsByTagNameNS(WSS4JConstants.SIG_NS, "Signature").item(0);
clonedAssertion.removeChild(sigElement);
Element subjElement =
@@ -366,7 +366,7 @@ public class CombinedValidatorTest extends org.junit.Assert {
}
// add the signature to the assertion
- SignableSAMLObject signableObject = (SignableSAMLObject) response;
+ SignableSAMLObject signableObject = response;
signableObject.setSignature(signature);
signableObject.releaseDOM();
signableObject.releaseChildrenDOM(true);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java
index 85f42c1..ef4c6ba 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLResponseValidatorTest.java
@@ -807,7 +807,7 @@ public class SAMLResponseValidatorTest extends org.junit.Assert {
}
// add the signature to the assertion
- SignableSAMLObject signableObject = (SignableSAMLObject) response;
+ SignableSAMLObject signableObject = response;
signableObject.setSignature(signature);
signableObject.releaseDOM();
signableObject.releaseChildrenDOM(true);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java
index f9beed9..77da0df 100644
--- a/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java
+++ b/rt/rs/security/sso/saml/src/test/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidatorTest.java
@@ -721,7 +721,7 @@ public class SAMLSSOResponseValidatorTest extends org.junit.Assert {
}
// add the signature to the assertion
- SignableSAMLObject signableObject = (SignableSAMLObject) response;
+ SignableSAMLObject signableObject = response;
signableObject.setSignature(signature);
signableObject.releaseDOM();
signableObject.releaseChildrenDOM(true);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/RSSecurityUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/RSSecurityUtils.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/RSSecurityUtils.java
index 5642fdd..fa549a2 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/RSSecurityUtils.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/RSSecurityUtils.java
@@ -63,7 +63,7 @@ public final class RSSecurityUtils {
Object signatureProperties =
SecurityUtils.getSecurityPropertyValue(SecurityConstants.SIGNATURE_PROPERTIES, m);
- return "POST".equals((String)requestMessage.get(Message.HTTP_REQUEST_METHOD))
+ return "POST".equals(requestMessage.get(Message.HTTP_REQUEST_METHOD))
&& encryptionProperties != null && signatureProperties != null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SAMLUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SAMLUtils.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SAMLUtils.java
index c19b1aa..52c8dd0 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SAMLUtils.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/saml/SAMLUtils.java
@@ -87,7 +87,7 @@ public final class SAMLUtils {
}
private static org.opensaml.saml.saml1.core.Subject getSaml1Subject(SamlAssertionWrapper assertionW) {
- for (Statement stmt : ((org.opensaml.saml.saml1.core.Assertion)assertionW.getSaml1()).getStatements()) {
+ for (Statement stmt : assertionW.getSaml1().getStatements()) {
org.opensaml.saml.saml1.core.Subject samlSubject = null;
if (stmt instanceof AttributeStatement) {
AttributeStatement attrStmt = (AttributeStatement) stmt;
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java
----------------------------------------------------------------------
diff --git a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java
index 00a6227..b3ccbfd 100644
--- a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java
+++ b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/interceptor/WSS4JBasicAuthValidator.java
@@ -35,10 +35,10 @@ import org.apache.cxf.rt.security.saml.claims.SAMLSecurityContext;
import org.apache.cxf.rt.security.saml.utils.SAMLUtils;
import org.apache.cxf.rt.security.utils.SecurityUtils;
import org.apache.cxf.security.SecurityContext;
+import org.apache.wss4j.common.WSS4JConstants;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.principal.WSUsernameTokenPrincipalImpl;
import org.apache.wss4j.common.saml.SamlAssertionWrapper;
-import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.message.token.UsernameToken;
import org.apache.wss4j.dom.validate.Credential;
@@ -98,7 +98,7 @@ public abstract class WSS4JBasicAuthValidator {
Document doc = DOMUtils.createDocument();
UsernameToken token = new UsernameToken(false, doc,
- WSConstants.PASSWORD_TEXT);
+ WSS4JConstants.PASSWORD_TEXT);
token.setName(policy.getUserName());
token.setPassword(policy.getPassword());
return token;
@@ -130,7 +130,7 @@ public abstract class WSS4JBasicAuthValidator {
}
ClaimCollection claims =
- SAMLUtils.getClaims((SamlAssertionWrapper)samlAssertion);
+ SAMLUtils.getClaims(samlAssertion);
Set<Principal> roles =
SAMLUtils.parseRolesFromClaims(claims, roleAttributeName, null);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 5bbfdcf..2427a94 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -809,7 +809,7 @@ public class JettyHTTPServerEngine implements ServerEngine {
}
private ThreadPool getThreadPool() {
- ThreadPool pool = (ThreadPool)server.getThreadPool();
+ ThreadPool pool = server.getThreadPool();
if (pool == null) {
pool = new QueuedThreadPool();
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
index bb664b5..ea5ea42 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
@@ -74,8 +74,8 @@ public class JettyHTTPServerEngineFactoryHolder {
Element element = StaxUtils.read(new StringReader(parsedElement)).getDocumentElement();
JettyHTTPServerEngineFactoryConfigType config
- = (JettyHTTPServerEngineFactoryConfigType) getJaxbObject(element,
- JettyHTTPServerEngineFactoryConfigType.class);
+ = getJaxbObject(element,
+ JettyHTTPServerEngineFactoryConfigType.class);
factory = new JettyHTTPServerEngineFactory();
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
index 4b3ed0c..052afd7 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
@@ -772,10 +772,10 @@ public class JettyHTTPDestinationTest extends Assert {
bus, threadDefaultBus);
assertNotNull("unexpected null message", inMessage);
assertSame("unexpected HTTP request",
- inMessage.get(JettyHTTPDestination.HTTP_REQUEST),
+ inMessage.get(AbstractHTTPDestination.HTTP_REQUEST),
request);
assertSame("unexpected HTTP response",
- inMessage.get(JettyHTTPDestination.HTTP_RESPONSE),
+ inMessage.get(AbstractHTTPDestination.HTTP_RESPONSE),
response);
assertEquals("unexpected method",
inMessage.get(Message.HTTP_REQUEST_METHOD),
@@ -879,10 +879,10 @@ public class JettyHTTPDestinationTest extends Assert {
if (oneway) {
assertNull("unexpected HTTP response",
- outMsg.get(JettyHTTPDestination.HTTP_RESPONSE));
+ outMsg.get(AbstractHTTPDestination.HTTP_RESPONSE));
} else {
assertNotNull("expected HTTP response",
- outMsg.get(JettyHTTPDestination.HTTP_RESPONSE));
+ outMsg.get(AbstractHTTPDestination.HTTP_RESPONSE));
responseOS.close();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
index 8a0a679..06ec717 100644
--- a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
+++ b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
@@ -190,7 +190,7 @@ public class NettyHttpConduit extends URLConnectionHTTPConduit implements BusLif
entity.createRequest(out.getOutBuffer());
// TODO need to check how to set the Chunked feature
//request.getRequest().setChunked(true);
- entity.getRequest().headers().set(Message.CONTENT_TYPE, (String)message.get(Message.CONTENT_TYPE));
+ entity.getRequest().headers().set(Message.CONTENT_TYPE, message.get(Message.CONTENT_TYPE));
return out;
}
return super.createOutputStream(message, needToCacheRequest, isChunking, chunkThreshold);
@@ -352,7 +352,7 @@ public class NettyHttpConduit extends URLConnectionHTTPConduit implements BusLif
session = sslHandler.engine().getSession();
}
} else {
- setException((Exception) future.cause());
+ setException(future.cause());
}
}
};
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
index 3483847..b76e15a 100644
--- a/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
+++ b/rt/transports/http-netty/netty-server/src/test/java/org/apache/cxf/transport/http/netty/server/NettyHttpDestinationTest.java
@@ -768,10 +768,10 @@ public class NettyHttpDestinationTest extends Assert {
bus, threadDefaultBus);
assertNotNull("unexpected null message", inMessage);
assertSame("unexpected HTTP request",
- inMessage.get(NettyHttpDestination.HTTP_REQUEST),
+ inMessage.get(AbstractHTTPDestination.HTTP_REQUEST),
request);
assertSame("unexpected HTTP response",
- inMessage.get(NettyHttpDestination.HTTP_RESPONSE),
+ inMessage.get(AbstractHTTPDestination.HTTP_RESPONSE),
response);
assertEquals("unexpected method",
inMessage.get(Message.HTTP_REQUEST_METHOD),
@@ -873,10 +873,10 @@ public class NettyHttpDestinationTest extends Assert {
if (oneway) {
assertNull("unexpected HTTP response",
- outMsg.get(NettyHttpDestination.HTTP_RESPONSE));
+ outMsg.get(AbstractHTTPDestination.HTTP_RESPONSE));
} else {
assertNotNull("expected HTTP response",
- outMsg.get(NettyHttpDestination.HTTP_RESPONSE));
+ outMsg.get(AbstractHTTPDestination.HTTP_RESPONSE));
responseOS.close();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java
index a31a991..7a6f0c6 100644
--- a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java
+++ b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/blueprint/UndertowHTTPServerEngineFactoryHolder.java
@@ -73,8 +73,8 @@ public class UndertowHTTPServerEngineFactoryHolder {
Element element = StaxUtils.read(new StringReader(parsedElement)).getDocumentElement();
UndertowHTTPServerEngineFactoryConfigType config
- = (UndertowHTTPServerEngineFactoryConfigType) getJaxbObject(element,
- UndertowHTTPServerEngineFactoryConfigType.class);
+ = getJaxbObject(element,
+ UndertowHTTPServerEngineFactoryConfigType.class);
factory = new UndertowHTTPServerEngineFactory();
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/osgi/HTTPUndertowTransportActivator.java
----------------------------------------------------------------------
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 1d917ca..2a54ce2 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
@@ -66,7 +66,7 @@ public class HTTPUndertowTransportActivator
UndertowHTTPServerEngineFactory factory = new UndertowHTTPServerEngineFactory() {
public MBeanServer getMBeanServer() {
- return (MBeanServer)mbeanServerTracker.getService();
+ return mbeanServerTracker.getService();
}
};
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
index 18a87f0..22f6108 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/UndertowHTTPDestinationTest.java
@@ -773,10 +773,10 @@ public class UndertowHTTPDestinationTest extends Assert {
bus, threadDefaultBus);
assertNotNull("unexpected null message", inMessage);
assertSame("unexpected HTTP request",
- inMessage.get(UndertowHTTPDestination.HTTP_REQUEST),
+ inMessage.get(AbstractHTTPDestination.HTTP_REQUEST),
request);
assertSame("unexpected HTTP response",
- inMessage.get(UndertowHTTPDestination.HTTP_RESPONSE),
+ inMessage.get(AbstractHTTPDestination.HTTP_RESPONSE),
response);
assertEquals("unexpected method",
inMessage.get(Message.HTTP_REQUEST_METHOD),
@@ -862,10 +862,10 @@ public class UndertowHTTPDestinationTest extends Assert {
if (oneway) {
assertNull("unexpected HTTP response",
- outMsg.get(UndertowHTTPDestination.HTTP_RESPONSE));
+ outMsg.get(AbstractHTTPDestination.HTTP_RESPONSE));
} else {
assertNotNull("expected HTTP response",
- outMsg.get(UndertowHTTPDestination.HTTP_RESPONSE));
+ outMsg.get(AbstractHTTPDestination.HTTP_RESPONSE));
responseOS.close();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/AbstractSpnegoAuthSupplier.java
----------------------------------------------------------------------
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 3f8f839..bb5abaf 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
@@ -140,7 +140,7 @@ public abstract class AbstractSpnegoAuthSupplier {
}
try {
- return (byte[])Subject.doAs(subject, new CreateServiceTicketAction(context, token));
+ return Subject.doAs(subject, new CreateServiceTicketAction(context, token));
} catch (PrivilegedActionException e) {
if (e.getCause() instanceof GSSException) {
throw (GSSException) e.getCause();
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpConduitBPBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpConduitBPBeanDefinitionParser.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpConduitBPBeanDefinitionParser.java
index 0546141..b855c60 100755
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpConduitBPBeanDefinitionParser.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpConduitBPBeanDefinitionParser.java
@@ -42,6 +42,7 @@ import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transport.http.MessageTrustDecider;
import org.apache.cxf.transport.http.auth.HttpAuthSupplier;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
+import org.osgi.service.blueprint.reflect.BeanMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
public class HttpConduitBPBeanDefinitionParser extends AbstractBPBeanDefinitionParser {
@@ -56,7 +57,7 @@ public class HttpConduitBPBeanDefinitionParser extends AbstractBPBeanDefinitionP
parseAttributes(element, context, bean);
parseChildElements(element, context, bean);
- bean.setScope(MutableBeanMetadata.SCOPE_PROTOTYPE);
+ bean.setScope(BeanMetadata.SCOPE_PROTOTYPE);
return bean;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpDestinationBPBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpDestinationBPBeanDefinitionParser.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpDestinationBPBeanDefinitionParser.java
index 0bc7cf4..406ca02 100755
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpDestinationBPBeanDefinitionParser.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpDestinationBPBeanDefinitionParser.java
@@ -29,6 +29,7 @@ import org.apache.aries.blueprint.mutable.MutableBeanMetadata;
import org.apache.cxf.configuration.blueprint.AbstractBPBeanDefinitionParser;
import org.apache.cxf.transport.http.AbstractHTTPDestination;
import org.apache.cxf.transports.http.configuration.HTTPServerPolicy;
+import org.osgi.service.blueprint.reflect.BeanMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
public class HttpDestinationBPBeanDefinitionParser extends AbstractBPBeanDefinitionParser {
@@ -51,7 +52,7 @@ public class HttpDestinationBPBeanDefinitionParser extends AbstractBPBeanDefinit
parseAttributes(element, context, bean);
parseChildElements(element, context, bean);
- bean.setScope(MutableBeanMetadata.SCOPE_PROTOTYPE);
+ bean.setScope(BeanMetadata.SCOPE_PROTOTYPE);
return bean;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
index a78b5ea..15bd03c 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
@@ -77,7 +77,7 @@ public class CXFServlet extends CXFNonSpringServlet
String busParam = servletConfig.getInitParameter(BUS_PARAMETER);
String busName = busParam == null ? "cxf" : busParam.trim();
- setBus((Bus)wac.getBean(busName, Bus.class));
+ setBus(wac.getBean(busName, Bus.class));
} else {
busCreated = true;
setBus(BusFactory.newInstance().createBus());
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java
index d92a8b8..955fd89 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSHeaderTypeTest.java
@@ -43,7 +43,7 @@ public class JMSHeaderTypeTest {
JMSMessageHeadersType messageHeaders = JMSMessageHeadersType.from(message);
Set<String> keys = messageHeaders.getPropertyKeys();
Assert.assertEquals(1, keys.size());
- assertEquals(TEST_VALUE, (String)messageHeaders.getProperty(org.apache.cxf.message.Message.RESPONSE_CODE));
+ assertEquals(TEST_VALUE, messageHeaders.getProperty(org.apache.cxf.message.Message.RESPONSE_CODE));
}
@Test
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java
index 0810c49..866276c 100644
--- a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java
+++ b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java
@@ -128,7 +128,7 @@ public class UDPConduit extends AbstractConduit {
}
} else {
IoSessionInputStream ins = message.getExchange().getInMessage().get(IoSessionInputStream.class);
- ins.setBuffer((IoBuffer)buf);
+ ins.setBuffer(buf);
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
index 41d758f..c1b22ba 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
@@ -397,7 +397,7 @@ public class AhcWebSocketConduit extends URLConnectionHTTPConduit {
entity = ((String)data).substring(pos);
} else if (data instanceof byte[]) {
entity = new byte[((byte[])data).length - pos];
- System.arraycopy((byte[])data, pos, (byte[])entity, 0, ((byte[])entity).length);
+ System.arraycopy(data, pos, entity, 0, ((byte[])entity).length);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
index d0d8410..2cf4f6e 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
@@ -226,7 +226,7 @@ public class MAPCodec extends AbstractSoapInterceptor {
discardMAPs(header, maps);
JAXBContext jaxbContext =
- VersionTransformer.getExposedJAXBContext(
+ org.apache.cxf.ws.addressing.VersionTransformer.getExposedJAXBContext(
maps.getNamespaceURI());
QName duplicate = maps.getDuplicate();
encodeAsExposed(maps,
@@ -359,7 +359,7 @@ public class MAPCodec extends AbstractSoapInterceptor {
return maps.getReplyTo() != null
&& maps.getReplyTo().getAddress() != null
&& maps.getReplyTo().getAddress().getValue() != null
- && !(VersionTransformer.Names200408.WSA_NAMESPACE_NAME.equals(maps.getNamespaceURI())
+ && !(Names200408.WSA_NAMESPACE_NAME.equals(maps.getNamespaceURI())
&& maps.getReplyTo().getAddress().getValue()
.equals(ContextUtils.getNoneEndpointReference().getAddress().getValue()));
}
@@ -505,10 +505,10 @@ public class MAPCodec extends AbstractSoapInterceptor {
// Need to check the uri before getting unmarshaller else
// would get wrong unmarshaller and fail to process required
// headers.
- if (VersionTransformer.isSupported(headerURI)) {
+ if (org.apache.cxf.ws.addressing.VersionTransformer.isSupported(headerURI)) {
if (unmarshaller == null) {
JAXBContext jaxbContext =
- VersionTransformer.getExposedJAXBContext(headerURI);
+ org.apache.cxf.ws.addressing.VersionTransformer.getExposedJAXBContext(headerURI);
unmarshaller =
jaxbContext.createUnmarshaller();
unmarshaller.setEventHandler(null);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/VersionTransformer.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/VersionTransformer.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/VersionTransformer.java
index 5425386..faa0c9a 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/VersionTransformer.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/VersionTransformer.java
@@ -90,7 +90,8 @@ public class VersionTransformer extends org.apache.cxf.ws.addressing.VersionTran
if (NATIVE_VERSION.equals(exposeAs)) {
codec.encodeMAP(message, value, new QName(exposeAs, localName), clz,
marshaller, mustUnderstand);
- } else if (Names200408.WSA_NAMESPACE_NAME.equals(exposeAs)) {
+ } else if (org.apache.cxf.ws.addressing.VersionTransformer.Names200408
+ .WSA_NAMESPACE_NAME.equals(exposeAs)) {
if (AttributedURIType.class.equals(clz)) {
codec.encodeMAP(message,
convert((AttributedURIType)value), new QName(exposeAs, localName),
@@ -98,13 +99,15 @@ public class VersionTransformer extends org.apache.cxf.ws.addressing.VersionTran
} else if (EndpointReferenceType.class.equals(clz)) {
codec.encodeMAP(message,
convert((EndpointReferenceType)value), new QName(exposeAs, localName),
- Names200408.EPR_TYPE, marshaller, mustUnderstand);
+ org.apache.cxf.ws.addressing.VersionTransformer.Names200408.EPR_TYPE,
+ marshaller, mustUnderstand);
} else if (RelatesToType.class.equals(clz)) {
codec.encodeMAP(message,
convert((RelatesToType)value), new QName(exposeAs, localName),
Relationship.class, marshaller, mustUnderstand);
}
- } else if (Names200403.WSA_NAMESPACE_NAME.equals(exposeAs)) {
+ } else if (org.apache.cxf.ws.addressing.VersionTransformer.Names200403
+ .WSA_NAMESPACE_NAME.equals(exposeAs)) {
if (AttributedURIType.class.equals(clz)) {
codec.encodeMAP(message,
convertTo200403((AttributedURIType)value),
@@ -115,7 +118,8 @@ public class VersionTransformer extends org.apache.cxf.ws.addressing.VersionTran
codec.encodeMAP(message,
convertTo200403((EndpointReferenceType)value), new QName(exposeAs,
localName),
- Names200403.EPR_TYPE, marshaller, mustUnderstand);
+ org.apache.cxf.ws.addressing.VersionTransformer.Names200403.EPR_TYPE,
+ marshaller, mustUnderstand);
} else if (RelatesToType.class.equals(clz)) {
codec.encodeMAP(message,
convertTo200403((RelatesToType)value), new QName(exposeAs, localName),
@@ -149,17 +153,19 @@ public class VersionTransformer extends org.apache.cxf.ws.addressing.VersionTran
if (AttributedURIType.class.equals(clz)) {
ret = clz.cast(convert(codec.decodeMAP(AttributedURI.class, headerElement, unmarshaller)));
} else if (EndpointReferenceType.class.equals(clz)) {
- ret = clz.cast(convert(codec.decodeMAP(Names200408.EPR_TYPE, headerElement, unmarshaller)));
+ ret = clz.cast(convert(codec.decodeMAP(Names200408.EPR_TYPE,
+ headerElement, unmarshaller)));
} else if (RelatesToType.class.equals(clz)) {
ret = clz.cast(convert(codec.decodeMAP(Relationship.class, headerElement, unmarshaller)));
}
- } else if (Names200403.WSA_NAMESPACE_NAME.equals(encodedAs)) {
+ } else if (org.apache.cxf.ws.addressing.VersionTransformer.Names200403.WSA_NAMESPACE_NAME.equals(encodedAs)) {
if (AttributedURIType.class.equals(clz)) {
ret = clz.cast(convert(codec
.decodeMAP(org.apache.cxf.ws.addressing.v200403.AttributedURI.class, headerElement,
unmarshaller)));
} else if (EndpointReferenceType.class.equals(clz)) {
- ret = clz.cast(convert(codec.decodeMAP(Names200403.EPR_TYPE, headerElement, unmarshaller)));
+ ret = clz.cast(convert(codec.decodeMAP(Names200403.EPR_TYPE,
+ headerElement, unmarshaller)));
} else if (RelatesToType.class.equals(clz)) {
ret = clz.cast(convert(codec
.decodeMAP(org.apache.cxf.ws.addressing.v200403.Relationship.class, headerElement,
@@ -175,59 +181,22 @@ public class VersionTransformer extends org.apache.cxf.ws.addressing.VersionTran
static {
Set<QName> headers = new HashSet<>();
headers.addAll(Names.HEADERS);
- Names200408.addHeaders(headers);
- Names200403.addHeaders(headers);
- HEADERS = Collections.unmodifiableSet(headers);
- }
-
- /**
- * Holder for 2004/08 Names
- */
- public static final class Names200408
- extends org.apache.cxf.ws.addressing.VersionTransformer.Names200408 {
-
- protected Names200408() {
- }
-
- /**
- * Adds 2004/08 headers to set.
- *
- * @param headers set of headers
- */
- private static void addHeaders(Set<QName> headers) {
- headers.add(new QName(WSA_NAMESPACE_NAME, Names.WSA_FROM_NAME));
- headers.add(new QName(WSA_NAMESPACE_NAME, Names.WSA_TO_NAME));
- headers.add(new QName(WSA_NAMESPACE_NAME, Names.WSA_REPLYTO_NAME));
- headers.add(new QName(WSA_NAMESPACE_NAME, Names.WSA_FAULTTO_NAME));
- headers.add(new QName(WSA_NAMESPACE_NAME, Names.WSA_ACTION_NAME));
- headers.add(new QName(WSA_NAMESPACE_NAME, Names.WSA_MESSAGEID_NAME));
- }
- }
-
- /**
- * Adds 2004/03 headers to set.
- *
- * @param headers set of headers
- */
- public static final class Names200403
- extends org.apache.cxf.ws.addressing.VersionTransformer.Names200403 {
-
- protected Names200403() {
- }
+
+ headers.add(new QName(Names200408.WSA_NAMESPACE_NAME, Names.WSA_FROM_NAME));
+ headers.add(new QName(Names200408.WSA_NAMESPACE_NAME, Names.WSA_TO_NAME));
+ headers.add(new QName(Names200408.WSA_NAMESPACE_NAME, Names.WSA_REPLYTO_NAME));
+ headers.add(new QName(Names200408.WSA_NAMESPACE_NAME, Names.WSA_FAULTTO_NAME));
+ headers.add(new QName(Names200408.WSA_NAMESPACE_NAME, Names.WSA_ACTION_NAME));
+ headers.add(new QName(Names200408.WSA_NAMESPACE_NAME, Names.WSA_MESSAGEID_NAME));
+
+ headers.add(new QName(Names200403.WSA_NAMESPACE_NAME, Names.WSA_FROM_NAME));
+ headers.add(new QName(Names200403.WSA_NAMESPACE_NAME, Names.WSA_TO_NAME));
+ headers.add(new QName(Names200403.WSA_NAMESPACE_NAME, Names.WSA_REPLYTO_NAME));
+ headers.add(new QName(Names200403.WSA_NAMESPACE_NAME, Names.WSA_FAULTTO_NAME));
+ headers.add(new QName(Names200403.WSA_NAMESPACE_NAME, Names.WSA_ACTION_NAME));
+ headers.add(new QName(Names200403.WSA_NAMESPACE_NAME, Names.WSA_MESSAGEID_NAME));
- /**
- * Adds 2004/08 headers to set.
- *
- * @param headers set of headers
- */
- private static void addHeaders(Set<QName> headers) {
- headers.add(new QName(WSA_NAMESPACE_NAME, Names.WSA_FROM_NAME));
- headers.add(new QName(WSA_NAMESPACE_NAME, Names.WSA_TO_NAME));
- headers.add(new QName(WSA_NAMESPACE_NAME, Names.WSA_REPLYTO_NAME));
- headers.add(new QName(WSA_NAMESPACE_NAME, Names.WSA_FAULTTO_NAME));
- headers.add(new QName(WSA_NAMESPACE_NAME, Names.WSA_ACTION_NAME));
- headers.add(new QName(WSA_NAMESPACE_NAME, Names.WSA_MESSAGEID_NAME));
- }
+ HEADERS = Collections.unmodifiableSet(headers);
}
}
[09/12] cxf git commit: Fix warnings in tools
Posted by dk...@apache.org.
Fix warnings in tools
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aaa4010e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aaa4010e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aaa4010e
Branch: refs/heads/master
Commit: aaa4010efe517954f67280062ec76bff27899694
Parents: 2a6144f
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 10:38:55 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 10:40:44 2017 -0400
----------------------------------------------------------------------
.../cxf/tools/common/ProcessorTestBase.java | 3 +-
.../apache/cxf/tools/common/ToolContext.java | 19 +++---
.../cxf/tools/common/model/JavaMethod.java | 7 +--
.../apache/cxf/tools/common/model/JavaType.java | 9 ++-
.../cxf/tools/common/toolspec/ToolSpec.java | 6 +-
.../toolspec/parser/CommandLineParser.java | 15 +++--
.../cxf/tools/common/toolspec/parser/Form.java | 3 +-
.../tools/common/toolspec/parser/Option.java | 12 ++--
.../common/toolspec/parser/OptionGroup.java | 3 +-
.../apache/cxf/tools/util/AnnotationUtil.java | 3 +-
.../apache/cxf/tools/util/ToolsStaxUtils.java | 13 ++--
.../tools/corba/processors/idl/IDLLexer.java | 25 +++++---
.../corba/common/ProcessorEnvironment.java | 6 +-
.../cxf/tools/corba/common/SchemaFactory.java | 5 +-
.../tools/corba/common/WSDLCorbaFactory.java | 5 +-
.../idlpreprocessor/IdlPreprocessorReader.java | 3 +-
.../corba/processors/idl/IDLProcessor.java | 3 +-
.../processors/idl/IDLToWSDLProcessor.java | 12 ++--
.../corba/processors/idl/ModuleToNSMapper.java | 50 ++++++++-------
.../processors/idl/ObjectReferenceVisitor.java | 3 +-
.../corba/processors/idl/OperationVisitor.java | 23 ++++---
.../cxf/tools/corba/processors/idl/Scope.java | 11 ++--
.../corba/processors/wsdl/WSDLParameter.java | 26 ++++----
.../processors/wsdl/WSDLToCorbaBinding.java | 65 ++++++++++----------
.../processors/wsdl/WSDLToCorbaHelper.java | 42 ++++++-------
.../corba/processors/wsdl/WSDLToIDLAction.java | 46 +++++++-------
.../java2js/processor/JavaToJSProcessor.java | 3 +-
.../cxf/tools/java2ws/util/JavaFirstUtil.java | 3 +-
.../generator/wsdl11/FaultBeanGenerator.java | 3 +-
.../processor/JavaToWSDLProcessor.java | 3 +-
.../internal/jaxws/JAXWSFrontEndProcessor.java | 3 +-
.../internal/MIMEBindingValidator.java | 19 +++---
.../internal/UniqueBodyPartsValidator.java | 3 +-
.../validator/internal/WSIBPValidator.java | 3 +-
.../tools/wadlto/jaxb/CustomizationParser.java | 3 +-
.../cxf/tools/wadlto/jaxrs/JAXRSContainer.java | 6 +-
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 31 ++++------
.../tools/wsdlto/core/AbstractGenerator.java | 2 +-
.../databinding/jaxb/JAXBDataBinding.java | 13 ++--
.../jaxws/customization/JAXWSBindingParser.java | 6 +-
.../processor/internal/PortTypeProcessor.java | 3 +-
.../jaxws/processor/internal/ProcessorUtil.java | 18 ++----
.../processor/internal/ServiceProcessor.java | 26 ++++----
.../jaxws/validator/UniqueBodyValidator.java | 15 +++--
.../WrapperStyleNameCollisionValidator.java | 6 +-
.../jaxws/wsdl11/CustomizedWSDLLocator.java | 5 +-
46 files changed, 258 insertions(+), 334 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java b/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
index c7cf43a..d1db5a1 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ProcessorTestBase.java
@@ -192,9 +192,8 @@ public class ProcessorTestBase extends Assert {
if (tok1.equals(tok2)) {
break;
- } else {
- unmatched.add(tok2);
}
+ unmatched.add(tok2);
}
assertEquals("Compare failed " + location1.getAbsolutePath()
+ " != " + location2.getAbsolutePath(), tok1, tok2);
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
index d89c822..3f0b755 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolContext.java
@@ -109,9 +109,8 @@ public class ToolContext {
public Object get(String key, Object defaultValue) {
if (!optionSet(key)) {
return defaultValue;
- } else {
- return get(key);
}
+ return get(key);
}
/**
@@ -163,9 +162,8 @@ public class ToolContext {
String verboseProperty = get(ToolConstants.CFG_VERBOSE, String.class);
if (verboseProperty == null) {
return false;
- } else {
- return ToolConstants.CFG_VERBOSE.equals(verboseProperty) || Boolean.parseBoolean(verboseProperty);
}
+ return ToolConstants.CFG_VERBOSE.equals(verboseProperty) || Boolean.parseBoolean(verboseProperty);
}
// REVIST: Prefer using optionSet, to keep the context clean
@@ -224,13 +222,11 @@ public class ToolContext {
}
if (hasNamespace(ns)) {
return mapNamespaceToPackageName(ns);
- } else {
- if (getPackageName() != null) {
- return getPackageName();
- }
- return URIParserUtil.parsePackageName(ns, null);
-
}
+ if (getPackageName() != null) {
+ return getPackageName();
+ }
+ return URIParserUtil.parsePackageName(ns, null);
}
public String getCustomizedNS(String ns) {
@@ -270,9 +266,8 @@ public class ToolContext {
String ns = pns.substring(0, pos);
localname = pns.substring(pos + 1);
return new QName(ns, localname);
- } else {
- return new QName(defaultNamespace, localname);
}
+ return new QName(defaultNamespace, localname);
}
return null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
index 76e37b3..4bb2878 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaMethod.java
@@ -174,11 +174,10 @@ public class JavaMethod implements JavaAnnotatable {
//removeParameter(paramInList);
replaceParameter(paramInList, param);
return;
- } else {
- Message message = new Message("PARAMETER_ALREADY_EXIST", LOG, param.getName(),
- getName(), paramInList.getType(), param.getType());
- throw new ToolException(message);
}
+ Message message = new Message("PARAMETER_ALREADY_EXIST", LOG, param.getName(),
+ getName(), paramInList.getType(), param.getType());
+ throw new ToolException(message);
}
if (param.getType() == null && param.getClassName() == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java
index 311656a..728189f 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/model/JavaType.java
@@ -146,11 +146,10 @@ public class JavaType {
Constructor<?>[] cons = clz.getConstructors();
if (cons.length == 0) {
return false;
- } else {
- for (int i = 0; i < cons.length; i++) {
- if (cons[i].getParameterTypes().length == 0) {
- return true;
- }
+ }
+ for (int i = 0; i < cons.length; i++) {
+ if (cons[i].getParameterTypes().length == 0) {
+ return true;
}
}
return false;
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java
index d244592..8c7c56d 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/ToolSpec.java
@@ -169,9 +169,8 @@ public class ToolSpec {
"streams");
if (!elemList.isEmpty()) {
return elemList.get(0);
- } else {
- return null;
}
+ return null;
}
public List<String> getInstreamIds() {
@@ -225,9 +224,8 @@ public class ToolSpec {
"pipeline");
if (!elemList.isEmpty()) {
return elemList.get(0);
- } else {
- return null;
}
+ return null;
}
public List<Element> getUsageForms() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
index a1f0b06..aacb11a 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
@@ -132,16 +132,15 @@ public class CommandLineParser {
if (form.accept(tokens, commandEl, errors)) {
commandEl.setAttribute("form", form.getName());
break;
- } else {
- // if no more left then return null;
- tokens.setPosition(pos);
+ }
+ // if no more left then return null;
+ tokens.setPosition(pos);
- if (elem.getNextSibling() == null) {
- if (LOG.isLoggable(Level.INFO)) {
- LOG.info("No more forms left to try, returning null");
- }
- throwUsage(errors);
+ if (elem.getNextSibling() == null) {
+ if (LOG.isLoggable(Level.INFO)) {
+ LOG.info("No more forms left to try, returning null");
}
+ throwUsage(errors);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Form.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Form.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Form.java
index e50551e..ba62fe5 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Form.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Form.java
@@ -188,9 +188,8 @@ public class Form implements TokenConsumer {
public String getName() {
if (element.hasAttribute("value")) {
return element.getAttribute("value");
- } else {
- return "default";
}
+ return "default";
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java
index c8b531e..d5857b1 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/Option.java
@@ -211,10 +211,9 @@ public class Option implements TokenConsumer {
for (int i = 0; i < value.length(); i++) {
if (value.charAt(i) == '.') {
continue;
- } else {
- if (!Character.isJavaIdentifierPart(value.charAt(i))) {
- return false;
- }
+ }
+ if (!Character.isJavaIdentifierPart(value.charAt(i))) {
+ return false;
}
}
return true;
@@ -223,10 +222,9 @@ public class Option implements TokenConsumer {
private boolean isNamingSpacePackageString(String value) {
if (value.indexOf("=") < 0) {
return isIdentifyString(value);
- } else {
- String packageName = value.substring(value.indexOf("=") + 1, value.length());
- return isIdentifyString(packageName);
}
+ String packageName = value.substring(value.indexOf("=") + 1, value.length());
+ return isIdentifyString(packageName);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java
index 666a89c..d666a6b 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/OptionGroup.java
@@ -94,8 +94,7 @@ public class OptionGroup implements TokenConsumer {
public String toString() {
if (element.hasAttribute("id")) {
return getId();
- } else {
- return super.toString();
}
+ return super.toString();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java b/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java
index e589385..fbfa990 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/util/AnnotationUtil.java
@@ -125,9 +125,8 @@ public final class AnnotationUtil {
Annotation ann = method.getAnnotation(WebResult.class);
if (ann == null) {
return null;
- } else {
- return (WebResult)ann;
}
+ return (WebResult)ann;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/common/src/main/java/org/apache/cxf/tools/util/ToolsStaxUtils.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/util/ToolsStaxUtils.java b/tools/common/src/main/java/org/apache/cxf/tools/util/ToolsStaxUtils.java
index db9ae71..b54317e 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/util/ToolsStaxUtils.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/util/ToolsStaxUtils.java
@@ -31,6 +31,7 @@ import java.util.Set;
import java.util.Stack;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
import org.apache.cxf.staxutils.StaxUtils;
@@ -60,7 +61,7 @@ public final class ToolsStaxUtils {
count++;
}
- if (event == XMLStreamReader.START_ELEMENT) {
+ if (event == XMLStreamConstants.START_ELEMENT) {
newTag = new Tag();
newTag.setName(reader.getName());
@@ -74,11 +75,11 @@ public final class ToolsStaxUtils {
}
stack.push(newTag);
}
- if (event == XMLStreamReader.CHARACTERS) {
+ if (event == XMLStreamConstants.CHARACTERS) {
newTag.setText(reader.getText());
}
- if (event == XMLStreamReader.END_ELEMENT) {
+ if (event == XMLStreamConstants.END_ELEMENT) {
Tag startTag = stack.pop();
if (checkingPoint != null && checkingPoint.equals(reader.getName())) {
@@ -129,7 +130,7 @@ public final class ToolsStaxUtils {
while (reader.hasNext()) {
int event = reader.next();
- if (event == XMLStreamReader.START_ELEMENT) {
+ if (event == XMLStreamConstants.START_ELEMENT) {
newTag = new Tag();
newTag.setName(reader.getName());
if (!ignoreAttr.isEmpty()) {
@@ -162,11 +163,11 @@ public final class ToolsStaxUtils {
currentTag.getTags().add(newTag);
currentTag = newTag;
}
- if (event == XMLStreamReader.CHARACTERS) {
+ if (event == XMLStreamConstants.CHARACTERS) {
newTag.setText(reader.getText());
}
- if (event == XMLStreamReader.END_ELEMENT) {
+ if (event == XMLStreamConstants.END_ELEMENT) {
currentTag = currentTag.getParent();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java b/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java
index 216f6ec..c38b58d 100644
--- a/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java
+++ b/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java
@@ -359,9 +359,7 @@ tryAgain:
if ( cse instanceof CharStreamIOException ) {
throw new TokenStreamIOException(((CharStreamIOException)cse).io);
}
- else {
- throw new TokenStreamException(cse.getMessage());
- }
+ throw new TokenStreamException(cse.getMessage());
}
}
}
@@ -839,7 +837,8 @@ tryAgain:
match('*');
}
else {
- if ( _cnt332>=1 ) { break _loop332; } else {throw new NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+ if ( _cnt332>=1 ) { break _loop332; }
+ throw new NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());
}
_cnt332++;
@@ -1278,7 +1277,8 @@ tryAgain:
mHEXDIGIT(false);
}
else {
- if ( _cnt361>=1 ) { break _loop361; } else {throw new NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+ if ( _cnt361>=1 ) { break _loop361; }
+ throw new NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());
}
_cnt361++;
@@ -1381,7 +1381,8 @@ tryAgain:
mDIGIT(false);
}
else {
- if ( _cnt373>=1 ) { break _loop373; } else {throw new NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+ if ( _cnt373>=1 ) { break _loop373; }
+ throw new NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());
}
_cnt373++;
@@ -1474,7 +1475,8 @@ tryAgain:
mDIGIT(false);
}
else {
- if ( _cnt378>=1 ) { break _loop378; } else {throw new NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+ if ( _cnt378>=1 ) { break _loop378; }
+ throw new NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());
}
_cnt378++;
@@ -1538,7 +1540,8 @@ tryAgain:
mDIGIT(false);
}
else {
- if ( _cnt383>=1 ) { break _loop383; } else {throw new NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+ if ( _cnt383>=1 ) { break _loop383; }
+ throw new NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());
}
_cnt383++;
@@ -1602,7 +1605,8 @@ tryAgain:
mDIGIT(false);
}
else {
- if ( _cnt387>=1 ) { break _loop387; } else {throw new NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+ if ( _cnt387>=1 ) { break _loop387; }
+ throw new NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());
}
_cnt387++;
@@ -1662,7 +1666,8 @@ tryAgain:
mDIGIT(false);
}
else {
- if ( _cnt392>=1 ) { break _loop392; } else {throw new NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+ if ( _cnt392>=1 ) { break _loop392; }
+ throw new NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());
}
_cnt392++;
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/ProcessorEnvironment.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/ProcessorEnvironment.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/ProcessorEnvironment.java
index 55c6483..049b60e 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/ProcessorEnvironment.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/ProcessorEnvironment.java
@@ -79,9 +79,8 @@ public class ProcessorEnvironment {
public Object get(String key, Object defaultValue) {
if (!optionSet(key)) {
return defaultValue;
- } else {
- return get(key);
}
+ return get(key);
}
public boolean getBooleanValue(String key, String defaultValue) {
@@ -145,9 +144,8 @@ public class ProcessorEnvironment {
public String mapPackageName(String ns) {
if (hasNamespace(ns)) {
return mapNamespaceToPackageName(ns);
- } else {
- return getPackageName();
}
+ return getPackageName();
}
public String getCustomizedNS(String ns) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/SchemaFactory.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/SchemaFactory.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/SchemaFactory.java
index 68f10e5..8dc9769 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/SchemaFactory.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/SchemaFactory.java
@@ -89,10 +89,9 @@ public abstract class SchemaFactory {
throw new WSDLException(WSDLException.CONFIGURATION_ERROR, "Problem instantiating factory "
+ "implementation.", e);
}
- } else {
- throw new WSDLException(WSDLException.CONFIGURATION_ERROR, "Unable to find name of factory "
- + "implementation.");
}
+ throw new WSDLException(WSDLException.CONFIGURATION_ERROR, "Unable to find name of factory "
+ + "implementation.");
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/WSDLCorbaFactory.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/WSDLCorbaFactory.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/WSDLCorbaFactory.java
index b70fd97..43c5c6c 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/WSDLCorbaFactory.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/WSDLCorbaFactory.java
@@ -91,10 +91,9 @@ public abstract class WSDLCorbaFactory {
throw new WSDLException(WSDLException.CONFIGURATION_ERROR, "Problem instantiating factory "
+ "implementation.", e);
}
- } else {
- throw new WSDLException(WSDLException.CONFIGURATION_ERROR, "Unable to find name of factory "
- + "implementation.");
}
+ throw new WSDLException(WSDLException.CONFIGURATION_ERROR, "Unable to find name of factory "
+ + "implementation.");
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReader.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReader.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReader.java
index f13a421..8096657 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReader.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/idlpreprocessor/IdlPreprocessorReader.java
@@ -143,9 +143,8 @@ public final class IdlPreprocessorReader extends Reader {
if (buf.length() == 0) {
return -1;
- } else {
- return buf.charAt(readPos++);
}
+ return buf.charAt(readPos++);
}
private void fillBuffer() throws IOException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLProcessor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLProcessor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLProcessor.java
index 3e0fdcd..3fa6cd0 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLProcessor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLProcessor.java
@@ -77,9 +77,8 @@ public class IDLProcessor implements Processor {
public AST getIDLTree() {
if (parser != null) {
return parser.getAST();
- } else {
- return null;
}
+ return null;
}
private DefaultIncludeResolver getDefaultIncludeResolver(File currentDir) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
index c795bcf..9892e8b 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/IDLToWSDLProcessor.java
@@ -386,12 +386,10 @@ public class IDLToWSDLProcessor extends IDLProcessor {
if (token.countTokens() == 1) {
if (env.get(ToolConstants.CFG_OUTPUTDIR) != null) {
return new File(outputDir + separator + ifile);
- } else {
- return new File(ifile);
}
- } else {
return new File(ifile);
}
+ return new File(ifile);
}
public Writer getOutputWriter(String filename, String outputDirectory) throws Exception {
@@ -401,19 +399,17 @@ public class IDLToWSDLProcessor extends IDLProcessor {
String encoding = env.get(ToolCorbaConstants.CFG_WSDL_ENCODING).toString();
return new FileWriterUtil()
.getWriter(new File(outputDirectory, filename), encoding);
- } else {
- FileWriterUtil fw = new FileWriterUtil(outputDirectory, null);
- return fw.getWriter("", filename);
}
+ FileWriterUtil fw = new FileWriterUtil(outputDirectory, null);
+ return fw.getWriter("", filename);
}
public Writer getOutputWriter(File file) throws Exception {
if (env.optionSet(ToolCorbaConstants.CFG_WSDL_ENCODING)) {
String encoding = env.get(ToolCorbaConstants.CFG_WSDL_ENCODING).toString();
return new FileWriterUtil().getWriter(file, encoding);
- } else {
- return new FileWriterUtil().getWriter(file, StandardCharsets.UTF_8.name());
}
+ return new FileWriterUtil().getWriter(file, StandardCharsets.UTF_8.name());
}
public String getBaseFilename(String ifile) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleToNSMapper.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleToNSMapper.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleToNSMapper.java
index 042a959..2470105 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleToNSMapper.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ModuleToNSMapper.java
@@ -85,43 +85,41 @@ public class ModuleToNSMapper {
public String map(Scope scope, String separator) {
if (defaultMapping) {
return null;
- } else {
- String uri = userMap.get(scope.toString(separator));
- if (uri == null) {
- //try the parent scope for mapping
- Scope currentScope = scope;
- String parentURI = null;
- uri = "";
- while (parentURI == null && !currentScope.toString().equals("")
- && currentScope != currentScope.getParent()) {
- parentURI = userMap.get(currentScope.toString(separator));
- if (parentURI == null) {
- if (!"".equals(uri)) {
- uri = "/" + uri;
- }
- uri = currentScope.tail() + uri;
+ }
+ String uri = userMap.get(scope.toString(separator));
+ if (uri == null) {
+ //try the parent scope for mapping
+ Scope currentScope = scope;
+ String parentURI = null;
+ uri = "";
+ while (parentURI == null && !currentScope.toString().equals("")
+ && currentScope != currentScope.getParent()) {
+ parentURI = userMap.get(currentScope.toString(separator));
+ if (parentURI == null) {
+ if (!"".equals(uri)) {
+ uri = "/" + uri;
}
- currentScope = currentScope.getParent();
+ uri = currentScope.tail() + uri;
}
- if (parentURI != null) {
- if (!parentURI.endsWith("/")) {
- parentURI = parentURI + "/";
- }
- uri = parentURI + uri;
- } else {
- uri = "urn:" + uri;
+ currentScope = currentScope.getParent();
+ }
+ if (parentURI != null) {
+ if (!parentURI.endsWith("/")) {
+ parentURI = parentURI + "/";
}
+ uri = parentURI + uri;
+ } else {
+ uri = "urn:" + uri;
}
- return uri;
}
+ return uri;
}
public String mapToQName(Scope scope) {
if (defaultMapping) {
return scope.toString();
- } else {
- return scope.tail();
}
+ return scope.tail();
}
public String mapNSToPrefix(String nsURI) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java
index 5f2bcf7..e7ac251 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/ObjectReferenceVisitor.java
@@ -386,9 +386,8 @@ public class ObjectReferenceVisitor extends VisitorBase {
"InferFromTypeId",
b.getQName().getPrefix());
- } else {
- return b.getQName();
}
+ return b.getQName();
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java
index ce4b46a..da5ce7f 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/OperationVisitor.java
@@ -366,21 +366,20 @@ public class OperationVisitor extends VisitorBase {
if (node.getType() == IDLTokenTypes.LITERAL_void) {
// nothing to do here, move along
return;
- } else {
- ParamTypeSpecVisitor visitor = new ParamTypeSpecVisitor(getScope(),
- definition,
- schema,
- wsdlVisitor);
+ }
+ ParamTypeSpecVisitor visitor = new ParamTypeSpecVisitor(getScope(),
+ definition,
+ schema,
+ wsdlVisitor);
- visitor.visit(node);
+ visitor.visit(node);
- XmlSchemaType schemaType = visitor.getSchemaType();
- CorbaTypeImpl corbaType = visitor.getCorbaType();
- Scope fqName = visitor.getFullyQualifiedName();
+ XmlSchemaType schemaType = visitor.getSchemaType();
+ CorbaTypeImpl corbaType = visitor.getCorbaType();
+ Scope fqName = visitor.getFullyQualifiedName();
- addElement(outputWrappingSequence, schemaType, fqName, RETURN_PARAMETER);
- addCorbaReturn(corbaType, fqName, RETURN_PARAMETER);
- }
+ addElement(outputWrappingSequence, schemaType, fqName, RETURN_PARAMETER);
+ addCorbaReturn(corbaType, fqName, RETURN_PARAMETER);
}
private void addCorbaReturn(CorbaTypeImpl corbaType, Scope fqName, String partName) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java
index 63e1c0b..f35b738 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/Scope.java
@@ -88,9 +88,8 @@ public final class Scope implements Comparable<Object> {
int size = scope.size();
if (size > 0) {
return scope.get(size - 1);
- } else {
- return "";
}
+ return "";
}
public Scope getParent() {
@@ -127,9 +126,8 @@ public final class Scope implements Comparable<Object> {
public boolean equals(Object otherScope) {
if (otherScope instanceof Scope) {
return toString().equals(((Scope)otherScope).toString());
- } else {
- return false;
}
+ return false;
}
public int hashCode() {
@@ -142,10 +140,9 @@ public final class Scope implements Comparable<Object> {
}
if (otherScope instanceof Scope) {
return toString().compareTo(otherScope.toString());
- } else {
- throw new ClassCastException("Scope class expected but found "
- + otherScope.getClass().getName());
}
+ throw new ClassCastException("Scope class expected but found "
+ + otherScope.getClass().getName());
}
public void setPrefix(String prefix) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java
index a770242..4637533 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLParameter.java
@@ -420,13 +420,12 @@ public final class WSDLParameter {
}
if (schemaElement != null) {
return schemaElement;
- } else {
- for (XmlSchemaExternal ext : xmlSchema.getExternals()) {
- if (!(ext instanceof XmlSchemaImport)) {
- schemaElement = findElement(ext.getSchema(), elName);
- if (schemaElement != null) {
- return schemaElement;
- }
+ }
+ for (XmlSchemaExternal ext : xmlSchema.getExternals()) {
+ if (!(ext instanceof XmlSchemaImport)) {
+ schemaElement = findElement(ext.getSchema(), elName);
+ if (schemaElement != null) {
+ return schemaElement;
}
}
}
@@ -493,14 +492,13 @@ public final class WSDLParameter {
annotation, false);
if (corbaTypeImpl == null) {
throw new Exception("Couldn't convert schema type to corba type : " + typeName);
+ }
+ if (nill) {
+ QName qname = corbaTypeImpl.getQName();
+ idltype = wsdlToCorbaBinding.getHelper().createQNameCorbaNamespace(qname.getLocalPart()
+ + "_nil");
} else {
- if (nill) {
- QName qname = corbaTypeImpl.getQName();
- idltype = wsdlToCorbaBinding.getHelper().createQNameCorbaNamespace(qname.getLocalPart()
- + "_nil");
- } else {
- idltype = corbaTypeImpl.getQName();
- }
+ idltype = corbaTypeImpl.getQName();
}
return idltype;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
index 9295348..38d48dd 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
@@ -184,22 +184,21 @@ public class WSDLToCorbaBinding {
org.apache.cxf.common.i18n.Message msg = new org.apache.cxf.common.i18n.Message(
"No PortTypes defined in wsdl", LOG);
throw new Exception(msg.toString());
- } else {
- PortType portType = null;
- intfs = new ArrayList<>();
- if (portTypes.size() == 1) {
- portType = portTypes.values().iterator().next();
- interfaceNames.add(portType.getQName().getLocalPart());
- intfs.add(portType);
- } else if (portTypes.size() > 1) {
- if (def.getAllBindings().size() > 0) {
- throwMultipleMultipleTypeException(CastUtils.cast(def.getAllBindings().keySet(),
- QName.class));
- }
- for (PortType port : portTypes.values()) {
- interfaceNames.add(port.getQName().getLocalPart());
- intfs.add(port);
- }
+ }
+ PortType portType = null;
+ intfs = new ArrayList<>();
+ if (portTypes.size() == 1) {
+ portType = portTypes.values().iterator().next();
+ interfaceNames.add(portType.getQName().getLocalPart());
+ intfs.add(portType);
+ } else if (portTypes.size() > 1) {
+ if (def.getAllBindings().size() > 0) {
+ throwMultipleMultipleTypeException(CastUtils.cast(def.getAllBindings().keySet(),
+ QName.class));
+ }
+ for (PortType port : portTypes.values()) {
+ interfaceNames.add(port.getQName().getLocalPart());
+ intfs.add(port);
}
}
return intfs;
@@ -632,22 +631,21 @@ public class WSDLToCorbaBinding {
org.apache.cxf.common.i18n.Message msg =
new org.apache.cxf.common.i18n.Message(msgStr, LOG);
throw new Exception(msg.toString());
- } else {
- // Set the repository ID for Exception
- // add to CorbaTypeMapping
- String repoId = WSDLToCorbaHelper.REPO_STRING
- + corbaex.getName().replace('.', '/')
- + WSDLToCorbaHelper.IDL_VERSION;
- corbaex.setRepositoryID(repoId);
- CorbaType corbaTypeImpl = corbaex;
- if (!helper.isDuplicate(corbaTypeImpl)) {
- CorbaType dup = helper.isDuplicateException(corbaTypeImpl);
- if (dup != null) {
- typeMappingType.getStructOrExceptionOrUnion().remove(dup);
- typeMappingType.getStructOrExceptionOrUnion().add(corbaTypeImpl);
- } else {
- typeMappingType.getStructOrExceptionOrUnion().add(corbaTypeImpl);
- }
+ }
+ // Set the repository ID for Exception
+ // add to CorbaTypeMapping
+ String repoId = WSDLToCorbaHelper.REPO_STRING
+ + corbaex.getName().replace('.', '/')
+ + WSDLToCorbaHelper.IDL_VERSION;
+ corbaex.setRepositoryID(repoId);
+ CorbaType corbaTypeImpl = corbaex;
+ if (!helper.isDuplicate(corbaTypeImpl)) {
+ CorbaType dup = helper.isDuplicateException(corbaTypeImpl);
+ if (dup != null) {
+ typeMappingType.getStructOrExceptionOrUnion().remove(dup);
+ typeMappingType.getStructOrExceptionOrUnion().add(corbaTypeImpl);
+ } else {
+ typeMappingType.getStructOrExceptionOrUnion().add(corbaTypeImpl);
}
}
return corbaex;
@@ -755,9 +753,8 @@ public class WSDLToCorbaBinding {
if (idx != -1) {
return name.substring(0, idx);
- } else {
- return name;
}
+ return name;
}
public QName convertToQName(String name) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
index e24b702..ac063f4 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
@@ -684,14 +684,13 @@ public class WSDLToCorbaHelper {
if (itemType != null) {
return WSDLTypes.mapToSequence(name, checkPrefix(schematypeName),
itemType.getQName(), null, 0, false);
- } else {
- // if the type of the simpleContent is a list with another simple type.
- XmlSchemaType base = getSchemaType(ltype.getItemTypeName());
- itemType = convertSchemaToCorbaType(base, base.getQName(), base, null, false);
- if (itemType != null) {
- return WSDLTypes.mapToSequence(name, checkPrefix(schematypeName),
- itemType.getQName(), null, 0, false);
- }
+ }
+ // if the type of the simpleContent is a list with another simple type.
+ XmlSchemaType base = getSchemaType(ltype.getItemTypeName());
+ itemType = convertSchemaToCorbaType(base, base.getQName(), base, null, false);
+ if (itemType != null) {
+ return WSDLTypes.mapToSequence(name, checkPrefix(schematypeName),
+ itemType.getQName(), null, 0, false);
}
} else if (stype.getContent() == null) {
// elements primitive type
@@ -846,13 +845,12 @@ public class WSDLToCorbaHelper {
}
if (schemaType != null) {
return schemaType;
- } else {
- for (XmlSchemaExternal extSchema : xmlSchema.getExternals()) {
- if (!(extSchema instanceof XmlSchemaImport)) {
- schemaType = findTypeInSchema(extSchema.getSchema(), typeName);
- if (schemaType != null) {
- return schemaType;
- }
+ }
+ for (XmlSchemaExternal extSchema : xmlSchema.getExternals()) {
+ if (!(extSchema instanceof XmlSchemaImport)) {
+ schemaType = findTypeInSchema(extSchema.getSchema(), typeName);
+ if (schemaType != null) {
+ return schemaType;
}
}
}
@@ -933,18 +931,15 @@ public class WSDLToCorbaHelper {
+ minOccurs + ":maxOccurs=" + maxOccurs;
LOG.log(Level.WARNING, msg);
return null;
- } else {
- return WSDLTypes.mapToArray(name, checkPrefix(schematypeName), arrayType,
- elName, max, anonymous);
}
- } else {
return WSDLTypes.mapToArray(name, checkPrefix(schematypeName), arrayType,
elName, max, anonymous);
}
- } else {
- return WSDLTypes.mapToSequence(name, checkPrefix(schematypeName), arrayType,
- elName, max, anonymous);
+ return WSDLTypes.mapToArray(name, checkPrefix(schematypeName), arrayType,
+ elName, max, anonymous);
}
+ return WSDLTypes.mapToSequence(name, checkPrefix(schematypeName), arrayType,
+ elName, max, anonymous);
}
@@ -1568,9 +1563,8 @@ public class WSDLToCorbaHelper {
return new QName(name.getNamespaceURI(),
name.getLocalPart(),
prefix);
- } else {
- return null;
}
+ return null;
}
return name;
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
index 770f90b..d0b33e4 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
@@ -134,21 +134,19 @@ public class WSDLToIDLAction {
String msgStr = "No bindings exists within this WSDL.";
org.apache.cxf.common.i18n.Message msg = new org.apache.cxf.common.i18n.Message(msgStr, LOG);
throw new Exception(msg.toString());
- } else {
- List<QName> portTypes = new ArrayList<>();
- for (Binding binding : bindings) {
- List<?> ext = binding.getExtensibilityElements();
- if (!(ext.get(0) instanceof BindingType)) {
- continue;
- }
- if (portTypes.contains(binding.getPortType().getQName())) {
- continue;
- } else {
- portTypes.add(binding.getPortType().getQName());
- }
- generateIDL(def, binding);
- root = IdlRoot.create();
+ }
+ List<QName> portTypes = new ArrayList<>();
+ for (Binding binding : bindings) {
+ List<?> ext = binding.getExtensibilityElements();
+ if (!(ext.get(0) instanceof BindingType)) {
+ continue;
+ }
+ if (portTypes.contains(binding.getPortType().getQName())) {
+ continue;
}
+ portTypes.add(binding.getPortType().getQName());
+ generateIDL(def, binding);
+ root = IdlRoot.create();
}
}
printWriter.close();
@@ -360,18 +358,16 @@ public class WSDLToIDLAction {
if (defn != null) {
if (defn instanceof IdlType) {
return (IdlType)defn;
- } else {
- String msgStr = local + " is an incorrect idltype.";
- org.apache.cxf.common.i18n.Message msg =
- new org.apache.cxf.common.i18n.Message(msgStr, LOG);
- throw new Exception(msg.toString());
- }
- } else {
- try {
- idlType = createType(ntype, name, corbatypeImpl);
- } catch (Exception ex) {
- ex.printStackTrace();
}
+ String msgStr = local + " is an incorrect idltype.";
+ org.apache.cxf.common.i18n.Message msg =
+ new org.apache.cxf.common.i18n.Message(msgStr, LOG);
+ throw new Exception(msg.toString());
+ }
+ try {
+ idlType = createType(ntype, name, corbatypeImpl);
+ } catch (Exception ex) {
+ ex.printStackTrace();
}
}
return idlType;
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java
----------------------------------------------------------------------
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 266822b..61f78a9 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
@@ -184,9 +184,8 @@ public class JavaToJSProcessor implements Processor {
protected String getBindingId() {
if (isSOAP12()) {
return WSDLConstants.NS_SOAP12;
- } else {
- return WSDLConstants.NS_SOAP11;
}
+ return WSDLConstants.NS_SOAP11;
}
protected boolean isSOAP12() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java
index 862cb64..b4043b8 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/util/JavaFirstUtil.java
@@ -85,9 +85,8 @@ public final class JavaFirstUtil {
Class<?> clz = (Class<?>)type;
if (clz.isArray()) {
return clz.getComponentType().getName() + "[]";
- } else {
- return clz.getName();
}
+ return clz.getName();
} else if (type instanceof ParameterizedType) {
return type.toString();
} else if (type instanceof GenericArrayType) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java
index a0dcdad..9dc2e4f 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGenerator.java
@@ -40,9 +40,8 @@ public final class FaultBeanGenerator extends BeanGenerator {
String pkg = PackageUtils.getPackageName(method.getDeclaringClass());
if (pkg.length() == 0) {
return ToolConstants.DEFAULT_PACKAGE_NAME;
- } else {
- return pkg;
}
+ return pkg;
}
protected Collection<JavaClass> generateBeanClasses(final ServiceInfo serviceInfo) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
index 7df7ade..13e8ea9 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
@@ -222,9 +222,8 @@ public class JavaToWSDLProcessor implements Processor {
protected String getBindingId() {
if (isSOAP12()) {
return WSDLConstants.NS_SOAP12;
- } else {
- return WSDLConstants.NS_SOAP11;
}
+ return WSDLConstants.NS_SOAP11;
}
protected boolean isSOAP12() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
----------------------------------------------------------------------
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
index 0fdf587..1f9d3f0 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JAXWSFrontEndProcessor.java
@@ -142,9 +142,8 @@ public class JAXWSFrontEndProcessor implements Processor {
Class<?> clz = (Class<?>)type;
if (clz.isArray()) {
return clz.getComponentType().getName() + "[]";
- } else {
- return clz.getName();
}
+ return clz.getName();
} else if (type instanceof ParameterizedType) {
return type.toString();
} else if (type instanceof GenericArrayType) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java
----------------------------------------------------------------------
diff --git a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java
index f3ec024..614ab52 100644
--- a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java
+++ b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/MIMEBindingValidator.java
@@ -109,17 +109,16 @@ public class MIMEBindingValidator
+ operationName
+ "): Must provide part attribute value for meme:content elements");
return false;
+ }
+ if (partName == null) {
+ partName = mimeContnetPart;
} else {
- if (partName == null) {
- partName = mimeContnetPart;
- } else {
- if (!partName.equals(mimeContnetPart)) {
- addErrorMessage("Operation("
- + operationName
- + "): Part attribute value for meme:content "
- + "elements are different");
- return false;
- }
+ if (!partName.equals(mimeContnetPart)) {
+ addErrorMessage("Operation("
+ + operationName
+ + "): Part attribute value for meme:content "
+ + "elements are different");
+ return false;
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java
----------------------------------------------------------------------
diff --git a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java
index 5ec7566..7fa1376 100644
--- a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java
+++ b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/UniqueBodyPartsValidator.java
@@ -116,9 +116,8 @@ public class UniqueBodyPartsValidator extends AbstractDefinitionValidator {
if (opName == null) {
uniqueBodyPartsMap.put(partQN, operationName);
return null;
- } else {
- return opName;
}
+ return opName;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
----------------------------------------------------------------------
diff --git a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
index d1a2fe2..fa3f8bc 100644
--- a/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
+++ b/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
@@ -457,9 +457,8 @@ public class WSIBPValidator extends AbstractDefinitionValidator {
private boolean isOverloading(String operationName) {
if (operationMap.contains(operationName)) {
return true;
- } else {
- operationMap.add(operationName);
}
+ operationMap.add(operationName);
return false;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java
----------------------------------------------------------------------
diff --git a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java
index e51d102..701f76e 100644
--- a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java
+++ b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxb/CustomizationParser.java
@@ -184,9 +184,8 @@ public final class CustomizationParser {
if (files != null) {
return files instanceof String ? new String[]{(String)files}
: (String[])files;
- } else {
- return new String[] {};
}
+ return new String[] {};
}
public List<InputSource> getJaxbBindings() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
----------------------------------------------------------------------
diff --git a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
index e77d7ea..639cb35 100644
--- a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
+++ b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainer.java
@@ -244,17 +244,15 @@ public class JAXRSContainer extends AbstractCXFToolContainer {
methods.add("*");
}
return methods;
- } else {
- return Collections.emptySet();
}
+ return Collections.emptySet();
}
private boolean isInheritResourceParamsFirst() {
Object value = context.get(WadlToolConstants.CFG_INHERIT_PARAMS);
if (StringUtils.isEmpty((String)value)) {
return true;
- } else {
- return "first".equals(value.toString().trim());
}
+ return "first".equals(value.toString().trim());
}
//TODO: this belongs to JAXB Databinding, should we just reuse
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
----------------------------------------------------------------------
diff --git a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index a2ec0ea..5924713 100644
--- a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++ b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -383,9 +383,8 @@ public class SourceGenerator {
if (href.length() > 0 && href.startsWith("#")) {
return resolveLocalReference(wadlEl.getOwnerDocument().getDocumentElement(),
wadlEl.getLocalName(), href);
- } else {
- return wadlEl;
}
+ return wadlEl;
}
private Element resolveLocalReference(Element appEl, String elementName, String localRef) {
@@ -576,25 +575,22 @@ public class SourceGenerator {
private String firstCharToUpperCase(String name) {
if (name.length() > 0 && Character.isLowerCase(name.charAt(0))) {
return StringUtils.capitalize(name);
- } else {
- return name;
}
+ return name;
}
private String firstCharToLowerCase(String name) {
if (name.length() > 0 && Character.isUpperCase(name.charAt(0))) {
return StringUtils.uncapitalize(name);
- } else {
- return name;
}
+ return name;
}
private boolean writeAnnotations(boolean interfaceIsGenerated) {
if (interfaceIsGenerated) {
return true;
- } else {
- return !generateInterfaces && generateImpl;
}
+ return !generateInterfaces && generateImpl;
}
private void writeImplementsInterface(StringBuilder sb, String clsName,
@@ -921,9 +917,8 @@ public class SourceGenerator {
Element doc = DOMUtils.getFirstChildWithName(el, getWadlNamespace(), "doc");
if (doc != null) {
return DOMUtils.getContent(doc);
- } else {
- return null;
}
+ return null;
}
private void writeCustomHttpMethod(ContextInfo info,
@@ -1157,10 +1152,9 @@ public class SourceGenerator {
if (useVoidForEmptyResponses && !responseRequired || suspendedAsync) {
sbCode.append("void ");
return false;
- } else {
- writeJaxrResponse(sbCode, imports);
- return true;
}
+ writeJaxrResponse(sbCode, imports);
+ return true;
}
String elementType = null;
if (!responseRequired) {
@@ -1477,10 +1471,9 @@ public class SourceGenerator {
String theName = name.toUpperCase();
if (theName.length() == 1) {
return theName;
- } else {
- theName = theName.substring(0, 1) + theName.substring(1).toLowerCase();
- return theName.replaceAll("[\\.\\-]", "");
}
+ theName = theName.substring(0, 1) + theName.substring(1).toLowerCase();
+ return theName.replaceAll("[\\.\\-]", "");
}
private List<Element> getWadlElements(Element parent, String name) {
@@ -1520,9 +1513,8 @@ public class SourceGenerator {
String value = pair[1].replaceAll("[\\-\\_]", "");
return convertRefToClassName(pair[0], value, defaultValue, info, imports);
- } else {
- return addImportsAndGetSimpleName(imports, type);
}
+ return addImportsAndGetSimpleName(imports, type);
}
@@ -1853,9 +1845,8 @@ public class SourceGenerator {
} catch (Exception e) {
throw new RuntimeException("Catalog resolution failed", e);
}
- } else {
- return null;
}
+ return null;
}
private Element readIncludedDocument(String href) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java
index be6e7af..57b7f42 100644
--- a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java
+++ b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/AbstractGenerator.java
@@ -82,7 +82,7 @@ public abstract class AbstractGenerator implements FrontEndGenerator {
}
fw = new FileWriterUtil(getOutputDir(),
- (OutputStreamCreator)env.get(OutputStreamCreator.class));
+ env.get(OutputStreamCreator.class));
try {
if (".java".equals(ext)) {
writer = fw.getWriter(packageName, filename + ext,
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
index 7e57dc6..b4b2e73 100644
--- a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
+++ b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
@@ -41,6 +41,7 @@ import java.util.logging.Logger;
import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.util.StreamReaderDelegate;
@@ -179,7 +180,7 @@ public class JAXBDataBinding implements DataBindingProfile {
public int next() throws XMLStreamException {
int i = super.next();
- if (i == XMLStreamReader.START_ELEMENT) {
+ if (i == XMLStreamConstants.START_ELEMENT) {
QName qn = super.getName();
isInclude = qn.equals(WSDLConstants.QNAME_SCHEMA_INCLUDE);
isImport = qn.equals(WSDLConstants.QNAME_SCHEMA_IMPORT);
@@ -197,7 +198,7 @@ public class JAXBDataBinding implements DataBindingProfile {
public int nextTag() throws XMLStreamException {
int i = super.nextTag();
- if (i == XMLStreamReader.START_ELEMENT) {
+ if (i == XMLStreamConstants.START_ELEMENT) {
QName qn = super.getName();
isInclude = qn.equals(WSDLConstants.QNAME_SCHEMA_INCLUDE);
isImport = qn.equals(WSDLConstants.QNAME_SCHEMA_IMPORT);
@@ -418,9 +419,8 @@ public class JAXBDataBinding implements DataBindingProfile {
msg.append(System.getProperty("line.separator"));
if (args.contains("-X")) {
throw new ToolException(pluginUsage, e);
- } else {
- msg.append(pluginUsage);
}
+ msg.append(pluginUsage);
}
throw new ToolException(msg.toString(), e);
@@ -747,7 +747,7 @@ public class JAXBDataBinding implements DataBindingProfile {
return new StreamReaderDelegate(reader) {
public int next() throws XMLStreamException {
int i = super.next();
- return i == XMLStreamReader.CDATA ? XMLStreamReader.CHARACTERS : i;
+ return i == XMLStreamConstants.CDATA ? XMLStreamConstants.CHARACTERS : i;
}
};
}
@@ -993,9 +993,8 @@ public class JAXBDataBinding implements DataBindingProfile {
InputSource src = new InputSource(new StringReader(writer.toString()));
src.setSystemId(sc.getSourceURI());
return new LSInputSAXWrapper(src);
- } else {
- throw new ToolException("Schema not found for namespace: " + namespaceURI);
}
+ throw new ToolException("Schema not found for namespace: " + namespaceURI);
}
return new LSInputSAXWrapper(new InputSource(s));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
index 0ba9749..847bfd5 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingParser.java
@@ -92,13 +92,13 @@ public class JAXWSBindingParser {
jaxwsBinding.setEnableWrapperStyle(getNodeValue(child));
} else if (isPackageElement(child)) {
jaxwsBinding.setPackage(getPackageName(child));
- Node docChild = DOMUtils.getChild(child, Element.ELEMENT_NODE);
+ Node docChild = DOMUtils.getChild(child, Node.ELEMENT_NODE);
if (docChild != null && this.isJAXWSClassDoc(docChild)) {
jaxwsBinding.setPackageJavaDoc(StringEscapeUtils.escapeHtml(DOMUtils.getContent(docChild)));
}
} else if (isJAXWSMethodElement(child)) {
jaxwsBinding.setMethodName(getMethodName(child));
- Node docChild = DOMUtils.getChild(child, Element.ELEMENT_NODE);
+ Node docChild = DOMUtils.getChild(child, Node.ELEMENT_NODE);
if (docChild != null && this.isJAXWSClassDoc(docChild)) {
jaxwsBinding.setMethodJavaDoc(StringEscapeUtils.escapeHtml(DOMUtils.getContent(docChild)));
@@ -137,7 +137,7 @@ public class JAXWSBindingParser {
Element childElement = (Element)child;
String clzName = childElement.getAttribute("name");
String javadoc = "";
- Node docChild = DOMUtils.getChild(child, Element.ELEMENT_NODE);
+ Node docChild = DOMUtils.getChild(child, Node.ELEMENT_NODE);
if (docChild != null && this.isJAXWSClassDoc(docChild)) {
javadoc = StringEscapeUtils.escapeHtml(DOMUtils.getContent(docChild));
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java
index cfd3f10..86deeab 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java
@@ -163,9 +163,8 @@ public class PortTypeProcessor extends AbstractProcessor {
private boolean isOverloading(QName operationName) {
if (operationMap.contains(operationName)) {
return true;
- } else {
- operationMap.add(operationName);
}
+ operationMap.add(operationName);
return false;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java
index aed6a1b..a59e657 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java
@@ -124,9 +124,8 @@ public final class ProcessorUtil {
public static String resolvePartType(MessagePartInfo part, ToolContext env) {
if (env != null) {
return resolvePartType(part, env, false);
- } else {
- return resolvePartType(part);
}
+ return resolvePartType(part);
}
public static String resolvePartType(MessagePartInfo part, ToolContext context, boolean fullName) {
@@ -135,9 +134,8 @@ public final class ProcessorUtil {
String primitiveType = JAXBUtils.builtInTypeToJavaType(part.getTypeQName().getLocalPart());
if (part.getTypeQName() != null && primitiveType != null) {
return primitiveType;
- } else {
- return resolvePartType(part);
}
+ return resolvePartType(part);
}
String name = "";
if (part.isElement()) {
@@ -172,9 +170,8 @@ public final class ProcessorUtil {
String result = NameUtil.mangleNameToVariableName(vName);
if (JavaUtils.isJavaKeyword(result)) {
return KEYWORDS_PREFIX + result;
- } else {
- return result;
}
+ return result;
}
public static String parsePackageName(String namespace, String defaultPackageName) {
@@ -190,27 +187,24 @@ public final class ProcessorUtil {
public static String getAbsolutePath(String location) throws IOException {
if (location.startsWith("http://")) {
return location;
- } else {
- return new File(location).getAbsolutePath().replace('\\', '/');
}
+ return new File(location).getAbsolutePath().replace('\\', '/');
}
public static URL getWSDLURL(String location) throws Exception {
if (location.startsWith("http://")) {
return new URL(location);
- } else {
- return new File(getAbsolutePath(location)).toURI().toURL();
}
+ return new File(getAbsolutePath(location)).toURI().toURL();
}
public static String classNameToFilePath(String className) {
String str;
if (className.indexOf(".") < 0) {
return className;
- } else {
- str = className.replaceAll("\\.", "/");
}
+ str = className.replaceAll("\\.", "/");
return str;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
index 033ae25..ee2c816 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java
@@ -562,18 +562,17 @@ public class ServiceProcessor extends AbstractProcessor {
private static String getJavaTypeForMimeType(MIMEPart mPart) {
if (mPart.getExtensibilityElements().size() > 1) {
return "javax.activation.DataHandler";
- } else {
- ExtensibilityElement extElement = (ExtensibilityElement)mPart.getExtensibilityElements().get(0);
- if (extElement instanceof MIMEContent) {
- MIMEContent mimeContent = (MIMEContent)extElement;
- if ("image/jpeg".equals(mimeContent.getType()) || "image/gif".equals(mimeContent.getType())) {
- return "java.awt.Image";
- } else if ("text/xml".equals(mimeContent.getType())
- || "application/xml".equals(mimeContent.getType())) {
- return "javax.xml.transform.Source";
- } else {
- return "javax.activation.DataHandler";
- }
+ }
+ ExtensibilityElement extElement = (ExtensibilityElement)mPart.getExtensibilityElements().get(0);
+ if (extElement instanceof MIMEContent) {
+ MIMEContent mimeContent = (MIMEContent)extElement;
+ if ("image/jpeg".equals(mimeContent.getType()) || "image/gif".equals(mimeContent.getType())) {
+ return "java.awt.Image";
+ } else if ("text/xml".equals(mimeContent.getType())
+ || "application/xml".equals(mimeContent.getType())) {
+ return "javax.xml.transform.Source";
+ } else {
+ return "javax.activation.DataHandler";
}
}
return "javax.activation.DataHandler";
@@ -763,9 +762,8 @@ public class ServiceProcessor extends AbstractProcessor {
for (OperationInfo operation : service.getInterface().getOperations()) {
if (operationName.equals(operation.getName()) && isIn) {
return operation.getInput();
- } else {
- return operation.getOutput();
}
+ return operation.getOutput();
}
return null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java
index 6ac0035..9ee4ec3 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/UniqueBodyValidator.java
@@ -92,15 +92,14 @@ public class UniqueBodyValidator extends ServiceValidator {
endpoint.getName(), op.getName(), opName, mName);
addErrorMessage(msg.toString());
return false;
- } else {
- uniqueNames.put(mName, op.getName());
- if (action != null) {
- if (opActions == null) {
- opActions = new HashSet<>();
- actions.put(mName, opActions);
- }
- opActions.add(action);
+ }
+ uniqueNames.put(mName, op.getName());
+ if (action != null) {
+ if (opActions == null) {
+ opActions = new HashSet<>();
+ actions.put(mName, opActions);
}
+ opActions.add(action);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
index b23b48c..6d5b0ff 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
@@ -154,9 +154,8 @@ public class WrapperStyleNameCollisionValidator extends ServiceValidator {
|| names.get(mappedName).equals(element.getSchemaTypeName()))) {
handleErrors(names.get(mappedName), element);
return false;
- } else {
- names.put(mappedName, element.getSchemaTypeName());
}
+ names.put(mappedName, element.getSchemaTypeName());
}
}
@@ -174,9 +173,8 @@ public class WrapperStyleNameCollisionValidator extends ServiceValidator {
|| (mn != null && mn.equals(element.getSchemaTypeName())))) {
handleErrors(names.get(mappedName), element);
return false;
- } else {
- names.put(mappedName, element.getSchemaTypeName());
}
+ names.put(mappedName, element.getSchemaTypeName());
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa4010e/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/CustomizedWSDLLocator.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/CustomizedWSDLLocator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/CustomizedWSDLLocator.java
index 7a13a5d..742ff40 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/CustomizedWSDLLocator.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/CustomizedWSDLLocator.java
@@ -64,10 +64,9 @@ public class CustomizedWSDLLocator implements javax.wsdl.xml.WSDLLocator {
new OASISCatalogManagerHelper().resolve(catalogResolver, target, base);
if (resolvedLocation == null) {
return this.resolver.resolve(target, base);
- } else {
- resolvedMap.put(target, resolvedLocation);
- return this.resolver.resolve(resolvedLocation, base);
}
+ resolvedMap.put(target, resolvedLocation);
+ return this.resolver.resolve(resolvedLocation, base);
} catch (Exception e) {
throw new RuntimeException("Catalog resolve failed: ", e);
}
[05/12] cxf git commit: Fix a BUNCH more warnings
Posted by dk...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
index 8c3cfb2..e115356 100644
--- a/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
+++ b/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
@@ -48,6 +48,8 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
import org.apache.cxf.ws.addressing.Names;
import org.apache.cxf.ws.addressing.RelatesToType;
+import org.apache.cxf.ws.addressing.VersionTransformer.Names200403;
+import org.apache.cxf.ws.addressing.VersionTransformer.Names200408;
import org.apache.cxf.ws.addressing.v200408.AttributedURI;
import org.apache.cxf.ws.addressing.v200408.Relationship;
import org.easymock.EasyMock;
@@ -106,7 +108,7 @@ public class MAPCodecTest extends Assert {
@Test
public void testRequestorInboundNonNative200403() throws Exception {
- String uri = VersionTransformer.Names200403.WSA_NAMESPACE_NAME;
+ String uri = Names200403.WSA_NAMESPACE_NAME;
SoapMessage message = setUpMessage(true, false, false, false, uri);
codec.handleMessage(message);
control.verify();
@@ -115,7 +117,7 @@ public class MAPCodecTest extends Assert {
@Test
public void testResponderInboundNonNative200403() throws Exception {
- String uri = VersionTransformer.Names200403.WSA_NAMESPACE_NAME;
+ String uri = Names200403.WSA_NAMESPACE_NAME;
SoapMessage message = setUpMessage(false, false, false, false, uri);
codec.handleMessage(message);
control.verify();
@@ -124,7 +126,7 @@ public class MAPCodecTest extends Assert {
@Test
public void testRequestorOutboundNonNative200403() throws Exception {
- String uri = VersionTransformer.Names200403.WSA_NAMESPACE_NAME;
+ String uri = Names200403.WSA_NAMESPACE_NAME;
SoapMessage message = setUpMessage(true, true, false, false, uri);
codec.handleMessage(message);
control.verify();
@@ -133,7 +135,7 @@ public class MAPCodecTest extends Assert {
@Test
public void testResponderOutboundNonNative200403() throws Exception {
- String uri = VersionTransformer.Names200403.WSA_NAMESPACE_NAME;
+ String uri = Names200403.WSA_NAMESPACE_NAME;
SoapMessage message = setUpMessage(false, true, false, false, uri);
codec.handleMessage(message);
control.verify();
@@ -158,7 +160,7 @@ public class MAPCodecTest extends Assert {
@Test
public void testRequestorOutboundNonNative() throws Exception {
- String uri = VersionTransformer.Names200408.WSA_NAMESPACE_NAME;
+ String uri = Names200408.WSA_NAMESPACE_NAME;
SoapMessage message = setUpMessage(true, true, false, false, uri);
codec.handleMessage(message);
control.verify();
@@ -196,7 +198,7 @@ public class MAPCodecTest extends Assert {
@Test
public void testResponderInboundNonNative() throws Exception {
- String uri = VersionTransformer.Names200408.WSA_NAMESPACE_NAME;
+ String uri = Names200408.WSA_NAMESPACE_NAME;
SoapMessage message = setUpMessage(false, false, false, false, uri);
codec.handleMessage(message);
control.verify();
@@ -227,7 +229,7 @@ public class MAPCodecTest extends Assert {
@Test
public void testResponderOutboundNonNative() throws Exception {
- String uri = VersionTransformer.Names200408.WSA_NAMESPACE_NAME;
+ String uri = Names200408.WSA_NAMESPACE_NAME;
SoapMessage message = setUpMessage(false, true, false, false, uri);
codec.handleMessage(message);
control.verify();
@@ -244,7 +246,7 @@ public class MAPCodecTest extends Assert {
@Test
public void testRequestorInboundNonNative() throws Exception {
- String uri = VersionTransformer.Names200408.WSA_NAMESPACE_NAME;
+ String uri = Names200408.WSA_NAMESPACE_NAME;
SoapMessage message = setUpMessage(true, false, false, false, uri);
codec.handleMessage(message);
control.verify();
@@ -263,7 +265,7 @@ public class MAPCodecTest extends Assert {
@Test
public void testRequestorInboundNonNativeNonReply() throws Exception {
nonReplyRelationship = "wsat:correlatedOneway";
- String uri = VersionTransformer.Names200408.WSA_NAMESPACE_NAME;
+ String uri = Names200408.WSA_NAMESPACE_NAME;
SoapMessage message = setUpMessage(true, false, false, false, uri);
codec.handleMessage(message);
control.verify();
@@ -308,8 +310,8 @@ public class MAPCodecTest extends Assert {
List<Header> headers = message.getHeaders();
JAXBContext jaxbContext = control.createMock(JAXBContext.class);
ContextUtils.setJAXBContext(jaxbContext);
- VersionTransformer.Names200408.setJAXBContext(jaxbContext);
- VersionTransformer.Names200403.setJAXBContext(jaxbContext);
+ Names200408.setJAXBContext(jaxbContext);
+ Names200403.setJAXBContext(jaxbContext);
if (outbound) {
setUpEncode(requestor, message, header, maps, mapProperty, invalidMAP, preExistingSOAPAction);
} else {
@@ -346,8 +348,8 @@ public class MAPCodecTest extends Assert {
EasyMock.expectLastCall().andReturn(unmarshaller);
String uri = maps.getNamespaceURI();
boolean exposedAsNative = Names.WSA_NAMESPACE_NAME.equals(uri);
- boolean exposedAs200408 = VersionTransformer.Names200408.WSA_NAMESPACE_NAME.equals(uri);
- boolean exposedAs200403 = VersionTransformer.Names200403.WSA_NAMESPACE_NAME.equals(uri);
+ boolean exposedAs200408 = Names200408.WSA_NAMESPACE_NAME.equals(uri);
+ boolean exposedAs200403 = Names200403.WSA_NAMESPACE_NAME.equals(uri);
assertTrue("unexpected namescape URI: " + uri, exposedAsNative || exposedAs200408 || exposedAs200403);
setUpHeaderDecode(headers, uri, Names.WSA_ACTION_NAME, exposedAsNative
? AttributedURIType.class : exposedAs200408 ? AttributedURI.class : exposedAs200403
@@ -360,19 +362,19 @@ public class MAPCodecTest extends Assert {
? org.apache.cxf.ws.addressing.v200403.AttributedURI.class : null, 2, unmarshaller);
setUpHeaderDecode(headers, uri, Names.WSA_REPLYTO_NAME, exposedAsNative
? EndpointReferenceType.class : exposedAs200408
- ? VersionTransformer.Names200408.EPR_TYPE : exposedAs200403
- ? VersionTransformer.Names200403.EPR_TYPE : null, 3, unmarshaller);
+ ? Names200408.EPR_TYPE : exposedAs200403
+ ? Names200403.EPR_TYPE : null, 3, unmarshaller);
setUpHeaderDecode(headers, uri, Names.WSA_RELATESTO_NAME, exposedAsNative
? RelatesToType.class : exposedAs200408 ? Relationship.class : exposedAs200403
? org.apache.cxf.ws.addressing.v200403.Relationship.class : null, 4, unmarshaller);
setUpHeaderDecode(headers, uri, Names.WSA_FAULTTO_NAME, exposedAsNative
? EndpointReferenceType.class : exposedAs200408
- ? VersionTransformer.Names200408.EPR_TYPE : exposedAs200403
- ? VersionTransformer.Names200403.EPR_TYPE : null, 5, unmarshaller);
+ ? Names200408.EPR_TYPE : exposedAs200403
+ ? Names200403.EPR_TYPE : null, 5, unmarshaller);
setUpHeaderDecode(headers, uri, Names.WSA_FROM_NAME, exposedAsNative
? EndpointReferenceType.class : exposedAs200408
- ? VersionTransformer.Names200408.EPR_TYPE : exposedAs200403
- ? VersionTransformer.Names200403.EPR_TYPE : null, 6, unmarshaller);
+ ? Names200408.EPR_TYPE : exposedAs200403
+ ? Names200403.EPR_TYPE : null, 6, unmarshaller);
}
private <T> void setUpHeaderDecode(List<Header> headers, String uri, String name, Class<?> clz,
@@ -403,8 +405,8 @@ public class MAPCodecTest extends Assert {
private AddressingProperties getMAPs(boolean requestor, boolean outbound, String uri) {
AddressingProperties maps = new AddressingProperties();
boolean exposeAsNative = Names.WSA_NAMESPACE_NAME.equals(uri);
- boolean exposeAs200408 = VersionTransformer.Names200408.WSA_NAMESPACE_NAME.equals(uri);
- boolean exposeAs200403 = VersionTransformer.Names200403.WSA_NAMESPACE_NAME.equals(uri);
+ boolean exposeAs200408 = Names200408.WSA_NAMESPACE_NAME.equals(uri);
+ boolean exposeAs200403 = Names200403.WSA_NAMESPACE_NAME.equals(uri);
AttributedURIType id = ContextUtils.getAttributedURI("urn:uuid:12345");
maps.setMessageID(id);
@@ -413,16 +415,16 @@ public class MAPCodecTest extends Assert {
maps.setTo(toEpr);
EndpointReferenceType replyTo = new EndpointReferenceType();
String anonymous = exposeAsNative ? Names.WSA_ANONYMOUS_ADDRESS : exposeAs200408
- ? VersionTransformer.Names200408.WSA_ANONYMOUS_ADDRESS
- : VersionTransformer.Names200403.WSA_ANONYMOUS_ADDRESS;
+ ? Names200408.WSA_ANONYMOUS_ADDRESS
+ : Names200403.WSA_ANONYMOUS_ADDRESS;
replyTo.setAddress(ContextUtils.getAttributedURI(anonymous));
maps.setReplyTo(replyTo);
EndpointReferenceType from = EndpointReferenceUtils.getEndpointReference("snafu");
maps.setFrom(from);
EndpointReferenceType faultTo = new EndpointReferenceType();
anonymous = exposeAsNative ? Names.WSA_ANONYMOUS_ADDRESS : exposeAs200408
- ? VersionTransformer.Names200408.WSA_ANONYMOUS_ADDRESS
- : VersionTransformer.Names200403.WSA_ANONYMOUS_ADDRESS;
+ ? Names200408.WSA_ANONYMOUS_ADDRESS
+ : Names200403.WSA_ANONYMOUS_ADDRESS;
faultTo.setAddress(ContextUtils.getAttributedURI(anonymous));
maps.setFaultTo(faultTo);
RelatesToType relatesTo = null;
@@ -458,38 +460,38 @@ public class MAPCodecTest extends Assert {
};
} else if (exposeAs200408) {
expectedValues = new Object[] {
- VersionTransformer.convert(action),
- VersionTransformer.convert(id),
- VersionTransformer.convert(to),
- VersionTransformer.convert(replyTo),
- VersionTransformer.convert(relatesTo),
- VersionTransformer.convert(from),
- VersionTransformer.convert(faultTo),
+ org.apache.cxf.ws.addressing.VersionTransformer.convert(action),
+ org.apache.cxf.ws.addressing.VersionTransformer.convert(id),
+ org.apache.cxf.ws.addressing.VersionTransformer.convert(to),
+ org.apache.cxf.ws.addressing.VersionTransformer.convert(replyTo),
+ org.apache.cxf.ws.addressing.VersionTransformer.convert(relatesTo),
+ org.apache.cxf.ws.addressing.VersionTransformer.convert(from),
+ org.apache.cxf.ws.addressing.VersionTransformer.convert(faultTo),
};
if (!outbound) {
// conversion from 2004/08 to 2005/08 anonymous address
// occurs transparently in VersionTransformer
- VersionTransformer.Names200408.EPR_TYPE.cast(expectedValues[3]).getAddress()
+ Names200408.EPR_TYPE.cast(expectedValues[3]).getAddress()
.setValue(Names.WSA_ANONYMOUS_ADDRESS);
- VersionTransformer.Names200408.EPR_TYPE.cast(expectedValues[5]).getAddress()
+ Names200408.EPR_TYPE.cast(expectedValues[5]).getAddress()
.setValue(Names.WSA_ANONYMOUS_ADDRESS);
}
} else if (exposeAs200403) {
expectedValues = new Object[] {
- VersionTransformer.convertTo200403(action),
- VersionTransformer.convertTo200403(id),
- VersionTransformer.convertTo200403(to),
- VersionTransformer.convertTo200403(replyTo),
- VersionTransformer.convertTo200403(relatesTo),
- VersionTransformer.convertTo200403(from),
- VersionTransformer.convertTo200403(faultTo),
+ org.apache.cxf.ws.addressing.VersionTransformer.convertTo200403(action),
+ org.apache.cxf.ws.addressing.VersionTransformer.convertTo200403(id),
+ org.apache.cxf.ws.addressing.VersionTransformer.convertTo200403(to),
+ org.apache.cxf.ws.addressing.VersionTransformer.convertTo200403(replyTo),
+ org.apache.cxf.ws.addressing.VersionTransformer.convertTo200403(relatesTo),
+ org.apache.cxf.ws.addressing.VersionTransformer.convertTo200403(from),
+ org.apache.cxf.ws.addressing.VersionTransformer.convertTo200403(faultTo),
};
if (!outbound) {
// conversion from 2004/03 to 2005/08 anonymous address
// occurs transparently in VersionTransformer
- VersionTransformer.Names200403.EPR_TYPE.cast(expectedValues[3]).getAddress()
+ Names200403.EPR_TYPE.cast(expectedValues[3]).getAddress()
.setValue(Names.WSA_ANONYMOUS_ADDRESS);
- VersionTransformer.Names200403.EPR_TYPE.cast(expectedValues[5]).getAddress()
+ Names200403.EPR_TYPE.cast(expectedValues[5]).getAddress()
.setValue(Names.WSA_ANONYMOUS_ADDRESS);
}
} else {
@@ -510,8 +512,8 @@ public class MAPCodecTest extends Assert {
boolean ret = false;
String uri = other.getNamespaceURI();
boolean exposedAsNative = Names.WSA_NAMESPACE_NAME.equals(uri);
- boolean exposedAs200408 = VersionTransformer.Names200408.WSA_NAMESPACE_NAME.equals(uri);
- boolean exposedAs200403 = VersionTransformer.Names200403.WSA_NAMESPACE_NAME.equals(uri);
+ boolean exposedAs200408 = Names200408.WSA_NAMESPACE_NAME.equals(uri);
+ boolean exposedAs200403 = Names200403.WSA_NAMESPACE_NAME.equals(uri);
if (exposedAsNative || exposedAs200408 || exposedAs200403) {
String expectedMessageID = exposedAsNative
@@ -525,8 +527,8 @@ public class MAPCodecTest extends Assert {
: ((org.apache.cxf.ws.addressing.v200403.AttributedURI)expectedValues[2]).getValue();
String expectedReplyTo = exposedAsNative ? ((EndpointReferenceType)expectedValues[3])
- .getAddress().getValue() : exposedAs200408 ? (VersionTransformer.Names200408.EPR_TYPE
- .cast(expectedValues[3])).getAddress().getValue() : (VersionTransformer.Names200403.EPR_TYPE
+ .getAddress().getValue() : exposedAs200408 ? (Names200408.EPR_TYPE
+ .cast(expectedValues[3])).getAddress().getValue() : (Names200403.EPR_TYPE
.cast(expectedValues[3])).getAddress().getValue();
String expectedAction = exposedAsNative
? ((AttributedURIType)expectedValues[0]).getValue() : exposedAs200408
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java
index ceda5f8..c7cfa18 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ClientPolicyInFaultInterceptor.java
@@ -84,7 +84,7 @@ public class ClientPolicyInFaultInterceptor extends AbstractPolicyInterceptor {
if (p != null) {
EndpointPolicyImpl endpi = new EndpointPolicyImpl(p);
EffectivePolicyImpl effectivePolicy = new EffectivePolicyImpl();
- effectivePolicy.initialise(endpi, (PolicyEngineImpl)pe, true, true, msg);
+ effectivePolicy.initialise(endpi, pe, true, true, msg);
PolicyUtils.logPolicy(LOG, Level.FINEST, "Using effective policy: ",
effectivePolicy.getPolicy());
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java
index f41a576..9a0cb5d 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInInterceptor.java
@@ -75,7 +75,7 @@ public class PolicyInInterceptor extends AbstractPolicyInterceptor {
if (p != null) {
EndpointPolicyImpl endpi = new EndpointPolicyImpl(p);
EffectivePolicyImpl effectivePolicy = new EffectivePolicyImpl();
- effectivePolicy.initialise(endpi, (PolicyEngineImpl)pe, true, msg);
+ effectivePolicy.initialise(endpi, pe, true, msg);
msg.put(EffectivePolicy.class, effectivePolicy);
PolicyUtils.logPolicy(LOG, Level.FINEST, "Using effective policy: ",
effectivePolicy.getPolicy());
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java
index 5964dce..3b6166c 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyOutInterceptor.java
@@ -83,7 +83,7 @@ public class PolicyOutInterceptor extends AbstractPolicyInterceptor {
if (p != null) {
EndpointPolicyImpl endpi = new EndpointPolicyImpl(p);
EffectivePolicyImpl effectivePolicy = new EffectivePolicyImpl();
- effectivePolicy.initialise(endpi, (PolicyEngineImpl)pe, false, msg);
+ effectivePolicy.initialise(endpi, pe, false, msg);
msg.put(EffectivePolicy.class, effectivePolicy);
PolicyUtils.logPolicy(LOG, Level.FINEST, "Using effective policy: ",
effectivePolicy.getPolicy());
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java
index 3d0d3e5..12223cd 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/ServerPolicyOutFaultInterceptor.java
@@ -93,7 +93,7 @@ public class ServerPolicyOutFaultInterceptor extends AbstractPolicyInterceptor {
if (p != null) {
EndpointPolicyImpl endpi = new EndpointPolicyImpl(p);
EffectivePolicyImpl effectivePolicy = new EffectivePolicyImpl();
- effectivePolicy.initialise(endpi, (PolicyEngineImpl)pe, false, true, msg);
+ effectivePolicy.initialise(endpi, pe, false, true, msg);
PolicyUtils.logPolicy(LOG, Level.FINEST, "Using effective policy: ",
effectivePolicy.getPolicy());
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/PersistenceUtils.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/PersistenceUtils.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/PersistenceUtils.java
index 536b6ac..2f4dd20 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/PersistenceUtils.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/PersistenceUtils.java
@@ -115,7 +115,7 @@ public final class PersistenceUtils {
MessageImpl msgImpl1 = new MessageImpl();
msgImpl1.setContent(OutputStream.class, cos);
msgImpl1.setAttachments(msg.getAttachments());
- msgImpl1.put(Message.CONTENT_TYPE, (String) msg.get(Message.CONTENT_TYPE));
+ msgImpl1.put(Message.CONTENT_TYPE, msg.get(Message.CONTENT_TYPE));
msgImpl1.setContent(InputStream.class, msgContent);
AttachmentSerializer serializer = new AttachmentSerializer(msgImpl1);
serializer.setXop(false);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RM12AssertionBuilder.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RM12AssertionBuilder.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RM12AssertionBuilder.java
index 4a4ebfb..648e168 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RM12AssertionBuilder.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RM12AssertionBuilder.java
@@ -27,6 +27,7 @@ import org.w3c.dom.Element;
import org.apache.cxf.ws.policy.builder.primitive.PrimitiveAssertion;
import org.apache.cxf.ws.rm.RM11Constants;
+import org.apache.cxf.ws.rm.RMConstants;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Policy;
@@ -84,7 +85,7 @@ public class RM12AssertionBuilder implements AssertionBuilder<Element> {
if (RM11Constants.WSRMP_NAMESPACE_URI.equals(elem.getNamespaceURI())) {
boolean optional = XMLPrimitiveAssertionBuilder.isOptional(elem);
String lname = elem.getLocalName();
- if (RM11Constants.RMASSERTION_NAME.equals(lname)) {
+ if (RMConstants.RMASSERTION_NAME.equals(lname)) {
// top-level RMAssertion, with nested policy
XMLPrimitiveAssertionBuilder nesting = new XMLPrimitiveAssertionBuilder() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyUtilities.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyUtilities.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyUtilities.java
index 8360593..b3c1d21 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyUtilities.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/policy/RMPolicyUtilities.java
@@ -32,6 +32,7 @@ import org.apache.cxf.ws.policy.builder.jaxb.JaxbAssertion;
import org.apache.cxf.ws.rm.RM11Constants;
import org.apache.cxf.ws.rm.RMConfiguration;
import org.apache.cxf.ws.rm.RMConfiguration.DeliveryAssurance;
+import org.apache.cxf.ws.rm.RMConstants;
import org.apache.cxf.ws.rm.RMUtils;
import org.apache.cxf.ws.rmp.v200502.RMAssertion;
import org.apache.neethi.builders.PrimitiveAssertion;
@@ -303,7 +304,7 @@ public final class RMPolicyUtilities {
}
RMConfiguration compatible = new RMConfiguration(cfg);
String lname = rma.getName().getLocalPart();
- if (RM11Constants.RMASSERTION_NAME.equals(lname)) {
+ if (RMConstants.RMASSERTION_NAME.equals(lname)) {
compatible.setRMNamespace(RM11Constants.NAMESPACE_URI);
} else if (RM12AssertionBuilder.SEQUENCESTR_NAME.equals(lname)) {
compatible.setSequenceSTRRequired(true);
@@ -331,7 +332,7 @@ public final class RMPolicyUtilities {
public static boolean isCompatible(PrimitiveAssertion rma, RMConfiguration cfg) {
String lname = rma.getName().getLocalPart();
boolean compatible = true;
- if (RM11Constants.RMASSERTION_NAME.equals(lname)) {
+ if (RMConstants.RMASSERTION_NAME.equals(lname)) {
compatible = RM11Constants.WSRMP_NAMESPACE_URI.equals(cfg.getRMNamespace());
} else if (RM12AssertionBuilder.SEQUENCESTR_NAME.equals(lname)) {
compatible = cfg.isSequenceSTRRequired();
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/language/FragmentDialectLanguageXPath10.java
----------------------------------------------------------------------
diff --git a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/language/FragmentDialectLanguageXPath10.java b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/language/FragmentDialectLanguageXPath10.java
index 4f11234..57a7e0a 100644
--- a/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/language/FragmentDialectLanguageXPath10.java
+++ b/rt/ws/transfer/src/main/java/org/apache/cxf/ws/transfer/dialect/fragment/language/FragmentDialectLanguageXPath10.java
@@ -87,7 +87,7 @@ public class FragmentDialectLanguageXPath10 implements FragmentDialectLanguage {
}
try {
- return (String) xPath.evaluate(
+ return xPath.evaluate(
expressionStr, representation.getAny(), XPathConstants.STRING);
} catch (XPathException ex) {
throw new InvalidExpression();
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java
index 953b59a..e20e7c4 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/interceptors/BareInInterceptor.java
@@ -27,6 +27,7 @@ import java.util.Set;
import java.util.logging.Logger;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
import org.apache.cxf.common.logging.LogUtils;
@@ -87,7 +88,7 @@ public class BareInInterceptor extends AbstractInDatabindingInterceptor {
if (bop == null) {
ops = new ArrayList<>();
ops.addAll(si.getInterface().getOperations());
- if (xmlReader.getEventType() == XMLStreamReader.END_ELEMENT && !client) {
+ if (xmlReader.getEventType() == XMLStreamConstants.END_ELEMENT && !client) {
//empty input
//TO DO : check duplicate operation with no input
for (OperationInfo op : ops) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/EHCacheUtil.java
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/EHCacheUtil.java b/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/EHCacheUtil.java
index b18a382..f0fd29a 100644
--- a/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/EHCacheUtil.java
+++ b/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/EHCacheUtil.java
@@ -64,7 +64,7 @@ public final class EHCacheUtil {
if (cc == null) {
cc = new CacheConfiguration();
} else {
- cc = (CacheConfiguration)cc.clone();
+ cc = cc.clone();
}
cc.setName(key);
return cc;
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java b/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java
index 0e35aa5..26527bb 100644
--- a/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java
+++ b/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java
@@ -23,7 +23,6 @@ import java.util.Properties;
import org.apache.cxf.message.Message;
import org.apache.cxf.rt.security.utils.SecurityUtils;
-import org.apache.cxf.ws.security.SecurityConstants;
import org.apache.cxf.xkms.crypto.CryptoProviderException;
import org.apache.cxf.xkms.crypto.CryptoProviderFactory;
import org.apache.wss4j.common.crypto.Crypto;
@@ -45,15 +44,15 @@ public class XkmsCryptoProviderFactory implements CryptoProviderFactory {
@Override
public Crypto create(Message message) {
- Object crypto =
- SecurityUtils.getSecurityPropertyValue(SecurityConstants.SIGNATURE_CRYPTO, message);
+ Object crypto = SecurityUtils
+ .getSecurityPropertyValue(org.apache.cxf.rt.security.SecurityConstants.SIGNATURE_CRYPTO, message);
if (crypto instanceof Crypto) {
new XkmsCryptoProvider(xkmsConsumer, (Crypto)crypto);
}
Properties keystoreProps = CryptoProviderUtils
.loadKeystoreProperties(message,
- SecurityConstants.SIGNATURE_PROPERTIES);
+ org.apache.cxf.rt.security.SecurityConstants.SIGNATURE_PROPERTIES);
try {
Crypto defaultCrypto = CryptoFactory.getInstance(keystoreProps);
return new XkmsCryptoProvider(xkmsConsumer, defaultCrypto);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java
----------------------------------------------------------------------
diff --git a/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java b/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java
index f85fd20..0581a5b 100644
--- a/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java
+++ b/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java
@@ -154,7 +154,7 @@ public class EndpointAPITest extends Assert {
}
private static void checkBasicInvocations(Service service) {
- EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class);
+ EndpointInterface port = service.getPort(EndpointInterface.class);
String helloWorld = "Hello world!";
assertEquals(0, port.getCount());
Object retObj = port.echo(helloWorld);
@@ -188,7 +188,7 @@ public class EndpointAPITest extends Assert {
return null;
}
};
- EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class,
+ EndpointInterface port = service.getPort(EndpointInterface.class,
new MTOMFeature(true));
DataHandler dh = new DataHandler(ds);
DHResponse response = port.echoDataHandler(new DHRequest(dh));
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/validators/CustomValidatorJAXBTest.java
----------------------------------------------------------------------
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/validators/CustomValidatorJAXBTest.java b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/validators/CustomValidatorJAXBTest.java
index d865348..1aaa136 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/validators/CustomValidatorJAXBTest.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/validators/CustomValidatorJAXBTest.java
@@ -34,7 +34,7 @@ public class CustomValidatorJAXBTest extends AbstractJUnit4SpringContextTests {
@Test
public void cleanTest() {
- HelloWorld client = (HelloWorld)applicationContext
+ HelloWorld client = applicationContext
.getBean("testClient", HelloWorld.class);
PassedObject hi = client.sayHi(new PassedObject("John", "Doe"));
@@ -45,7 +45,7 @@ public class CustomValidatorJAXBTest extends AbstractJUnit4SpringContextTests {
@Test
public void sendNullTest() {
- HelloWorld client = (HelloWorld)applicationContext
+ HelloWorld client = applicationContext
.getBean("testClient", HelloWorld.class);
PassedObject hi = client.sayHi(new PassedObject());
@@ -56,7 +56,7 @@ public class CustomValidatorJAXBTest extends AbstractJUnit4SpringContextTests {
@Test
public void returnNullTest() {
- HelloWorld client = (HelloWorld)applicationContext
+ HelloWorld client = applicationContext
.getBean("testClient", HelloWorld.class);
PassedObject hi = client.returnNull(new PassedObject("John", "Doe"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
index 38b8da9..4313179 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
@@ -316,7 +316,7 @@ public class BookStore {
@Path("/echoxmlbookquery")
@Produces("application/xml")
public Book echoXmlBookQuery(@QueryParam("book") Book book, @QueryParam("id") byte id) {
- if (book.getId() != (long)id) {
+ if (book.getId() != id) {
throw new RuntimeException();
}
return book;
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
index aa2cea7..8b59dc7 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
@@ -265,7 +265,7 @@ public class JAXRSClientServerSpringBookTest extends AbstractBusClientServerTest
NodeList nd = doc.getChildNodes();
for (int i = 0; i < nd.getLength(); i++) {
Node n = nd.item(i);
- if (n.getNodeType() == Document.PROCESSING_INSTRUCTION_NODE) {
+ if (n.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE) {
String piData = ((ProcessingInstruction)n).getData();
int hRefStart = piData.indexOf("href=\"");
if (hRefStart > 0) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/JAXRSClientServerTikaTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/JAXRSClientServerTikaTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/JAXRSClientServerTikaTest.java
index 8fa233a..041ad04 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/JAXRSClientServerTikaTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/extraction/JAXRSClientServerTikaTest.java
@@ -127,7 +127,7 @@ public class JAXRSClientServerTikaTest extends AbstractBusClientServerTestBase {
@SuppressWarnings("unchecked")
private Collection<ScoreDoc> search(final String expression) {
- return (Collection<ScoreDoc>)createWebClient("/catalog")
+ return createWebClient("/catalog")
.accept(MediaType.APPLICATION_JSON)
.query("$filter", expression)
.get(Collection.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java
index 0eca57b..c1b1987 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/WebSocketTestClient.java
@@ -251,7 +251,7 @@ class WebSocketTestClient {
entity = ((String)data).substring(pos);
} else if (data instanceof byte[]) {
entity = new byte[((byte[])data).length - pos];
- System.arraycopy((byte[])data, pos, (byte[])entity, 0, ((byte[])entity).length);
+ System.arraycopy(data, pos, entity, 0, ((byte[])entity).length);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/SecurityTestUtil.java
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/SecurityTestUtil.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/SecurityTestUtil.java
index bb3aace..da3c0b9 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/SecurityTestUtil.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/common/SecurityTestUtil.java
@@ -90,7 +90,8 @@ public final class SecurityTestUtil {
}
public static void updateSTSPort(BindingProvider p, String port) {
- STSClient stsClient = (STSClient)p.getRequestContext().get(SecurityConstants.STS_CLIENT);
+ STSClient stsClient = (STSClient)p.getRequestContext()
+ .get(org.apache.cxf.rt.security.SecurityConstants.STS_CLIENT);
if (stsClient != null) {
String location = stsClient.getWsdlLocation();
if (location != null && location.contains("8080")) {
@@ -99,7 +100,8 @@ public final class SecurityTestUtil {
stsClient.setWsdlLocation(location.replace("8443", port));
}
}
- stsClient = (STSClient)p.getRequestContext().get(SecurityConstants.STS_CLIENT + ".sct");
+ stsClient = (STSClient)p.getRequestContext()
+ .get(org.apache.cxf.rt.security.SecurityConstants.STS_CLIENT + ".sct");
if (stsClient != null) {
String location = stsClient.getWsdlLocation();
if (location.contains("8080")) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
index 65346dc..1027439 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/JAXRSKerberosBookTest.java
@@ -27,7 +27,7 @@ import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.security.KerberosAuthOutInterceptor;
import org.apache.cxf.systest.kerberos.common.SecurityTestUtil;
-import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
import org.apache.cxf.transport.http.auth.HttpAuthHeader;
import org.apache.cxf.transport.http.auth.SpnegoAuthSupplier;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
@@ -93,14 +93,14 @@ public class JAXRSKerberosBookTest extends AbstractLdapTestUnit {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- AbstractBusClientServerTestBase.launchServer(BookKerberosServer.class, true)
+ AbstractClientServerTestBase.launchServer(BookKerberosServer.class, true)
);
}
@org.junit.AfterClass
public static void cleanup() throws Exception {
SecurityTestUtil.cleanup();
- AbstractBusClientServerTestBase.stopAllServers();
+ AbstractClientServerTestBase.stopAllServers();
if (kerbyServer != null) {
kerbyServer.stop();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
index 737ee15..87aa70d 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java
@@ -27,11 +27,12 @@ import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.kerberos.common.SecurityTestUtil;
import org.apache.cxf.systest.kerberos.wssec.sts.STSServer;
import org.apache.cxf.systest.kerberos.wssec.sts.StaxSTSServer;
-import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
import org.apache.cxf.testutil.common.TestUtil;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.kerby.kerberos.kerb.server.SimpleKdcServer;
@@ -108,35 +109,35 @@ public class KerberosTokenTest extends AbstractLdapTestUnit {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- AbstractBusClientServerTestBase.launchServer(Server.class, true)
+ AbstractClientServerTestBase.launchServer(Server.class, true)
);
org.junit.Assert.assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- AbstractBusClientServerTestBase.launchServer(StaxServer.class, true)
+ AbstractClientServerTestBase.launchServer(StaxServer.class, true)
);
org.junit.Assert.assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- AbstractBusClientServerTestBase.launchServer(STSServer.class, true)
+ AbstractClientServerTestBase.launchServer(STSServer.class, true)
);
org.junit.Assert.assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- AbstractBusClientServerTestBase.launchServer(StaxSTSServer.class, true)
+ AbstractClientServerTestBase.launchServer(StaxSTSServer.class, true)
);
}
@org.junit.AfterClass
public static void cleanup() throws Exception {
SecurityTestUtil.cleanup();
- AbstractBusClientServerTestBase.stopAllServers();
+ AbstractClientServerTestBase.stopAllServers();
if (kerbyServer != null) {
kerbyServer.stop();
}
@@ -381,8 +382,8 @@ public class KerberosTokenTest extends AbstractLdapTestUnit {
URL busFile = KerberosTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = KerberosTokenTest.class.getResource("DoubleItKerberos.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
@@ -409,8 +410,8 @@ public class KerberosTokenTest extends AbstractLdapTestUnit {
URL busFile = KerberosTokenTest.class.getResource("sts-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = KerberosTokenTest.class.getResource("DoubleItKerberos.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
----------------------------------------------------------------------
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
index 5b22ec6..f422932 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java
@@ -26,9 +26,10 @@ import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.systest.kerberos.common.SecurityTestUtil;
-import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractClientServerTestBase;
import org.apache.cxf.testutil.common.TestUtil;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.kerby.kerberos.kerb.server.SimpleKdcServer;
@@ -100,21 +101,21 @@ public class SpnegoTokenTest extends AbstractLdapTestUnit {
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- AbstractBusClientServerTestBase.launchServer(Server.class, true)
+ AbstractClientServerTestBase.launchServer(Server.class, true)
);
org.junit.Assert.assertTrue(
"Server failed to launch",
// run the server in the same process
// set this to false to fork
- AbstractBusClientServerTestBase.launchServer(StaxServer.class, true)
+ AbstractClientServerTestBase.launchServer(StaxServer.class, true)
);
}
@org.junit.AfterClass
public static void cleanup() throws Exception {
SecurityTestUtil.cleanup();
- AbstractBusClientServerTestBase.stopAllServers();
+ AbstractClientServerTestBase.stopAllServers();
if (kerbyServer != null) {
kerbyServer.stop();
}
@@ -221,8 +222,8 @@ public class SpnegoTokenTest extends AbstractLdapTestUnit {
URL busFile = SpnegoTokenTest.class.getResource("client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL wsdl = SpnegoTokenTest.class.getResource("DoubleItSpnego.wsdl");
Service service = Service.create(wsdl, SERVICE_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/CallbackHandlerLoginHandler.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/CallbackHandlerLoginHandler.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/CallbackHandlerLoginHandler.java
index 00d251b..e64d5f3 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/CallbackHandlerLoginHandler.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/CallbackHandlerLoginHandler.java
@@ -28,7 +28,7 @@ import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.common.UserSubject;
import org.apache.cxf.rs.security.oauth2.grants.owner.ResourceOwnerLoginHandler;
-import org.apache.wss4j.dom.WSConstants;
+import org.apache.wss4j.common.WSS4JConstants;
import org.apache.wss4j.dom.engine.WSSConfig;
import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.message.token.UsernameToken;
@@ -50,7 +50,7 @@ public class CallbackHandlerLoginHandler implements ResourceOwnerLoginHandler {
public UserSubject createSubject(Client client, String user, String pass) {
Document doc = DOMUtils.createDocument();
UsernameToken token = new UsernameToken(false, doc,
- WSConstants.PASSWORD_TEXT);
+ WSS4JConstants.PASSWORD_TEXT);
token.setName(user);
token.setPassword(pass);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java
index 3798dbc..dcffc11 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java
@@ -45,8 +45,8 @@ import org.apache.cxf.rs.security.xml.XmlSigOutInterceptor;
import org.apache.cxf.rt.security.SecurityConstants;
import org.apache.cxf.systest.jaxrs.security.Book;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.wss4j.common.WSS4JConstants;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
-import org.apache.wss4j.dom.WSConstants;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -131,7 +131,7 @@ public class JAXRSSamlTest extends AbstractBusClientServerTestBase {
public void testBearerSignedDifferentAlgorithms() throws Exception {
SamlCallbackHandler callbackHandler = new SamlCallbackHandler();
callbackHandler.setSignatureAlgorithm("http://www.w3.org/2001/04/xmldsig-more#rsa-sha256");
- callbackHandler.setDigestAlgorithm(WSConstants.SHA256);
+ callbackHandler.setDigestAlgorithm(WSS4JConstants.SHA256);
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_BEARER);
callbackHandler.setSignAssertion(true);
doTestEnvelopedSAMLToken(true, callbackHandler);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
index 45e09ec..2b69dee 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java
@@ -36,10 +36,10 @@ import org.apache.cxf.hello_world_jms.HelloWorldService;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher;
import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.saml.bean.AudienceRestrictionBean;
import org.apache.wss4j.common.saml.bean.ConditionsBean;
import org.apache.wss4j.common.saml.builder.SAML2Constants;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -98,8 +98,8 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase {
callbackHandler.setConfirmationMethod(SAML2Constants.CONF_BEARER);
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, callbackHandler);
WSS4JOutInterceptor outInterceptor = new WSS4JOutInterceptor(outProperties);
Client client = ClientProxy.getClient(greeter);
@@ -137,8 +137,8 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase {
callbackHandler.setConditions(conditions);
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, callbackHandler);
WSS4JOutInterceptor outInterceptor = new WSS4JOutInterceptor(outProperties);
Client client = ClientProxy.getClient(greeter);
@@ -175,8 +175,8 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase {
callbackHandler.setConditions(conditions);
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, callbackHandler);
WSS4JOutInterceptor outInterceptor = new WSS4JOutInterceptor(outProperties);
Client client = ClientProxy.getClient(greeter);
@@ -217,8 +217,8 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase {
callbackHandler.setConditions(conditions);
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, callbackHandler);
WSS4JOutInterceptor outInterceptor = new WSS4JOutInterceptor(outProperties);
Client client = ClientProxy.getClient(greeter);
@@ -255,8 +255,8 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase {
callbackHandler.setConditions(conditions);
Map<String, Object> outProperties = new HashMap<>();
- outProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_UNSIGNED);
- outProperties.put(WSHandlerConstants.SAML_CALLBACK_REF, callbackHandler);
+ outProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_UNSIGNED);
+ outProperties.put(ConfigurationConstants.SAML_CALLBACK_REF, callbackHandler);
WSS4JOutInterceptor outInterceptor = new WSS4JOutInterceptor(outProperties);
Client client = ClientProxy.getClient(greeter);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/Server.java
----------------------------------------------------------------------
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/Server.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/Server.java
index 3b49345..03b93cf 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/Server.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/Server.java
@@ -28,7 +28,7 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher;
import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
-import org.apache.wss4j.dom.handler.WSHandlerConstants;
+import org.apache.wss4j.common.ConfigurationConstants;
public class Server extends AbstractBusTestServerBase {
public static final String PORT = allocatePort(Server.class);
@@ -43,9 +43,9 @@ public class Server extends AbstractBusTestServerBase {
setBus(bus);
Map<String, Object> inProperties = new HashMap<>();
- inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SAML_TOKEN_SIGNED);
- inProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new KeystorePasswordCallback());
- inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "bob.properties");
+ inProperties.put(ConfigurationConstants.ACTION, ConfigurationConstants.SAML_TOKEN_SIGNED);
+ inProperties.put(ConfigurationConstants.PW_CALLBACK_REF, new KeystorePasswordCallback());
+ inProperties.put(ConfigurationConstants.SIG_VER_PROP_FILE, "bob.properties");
WSS4JInInterceptor inInterceptor = new WSS4JInInterceptor(inProperties);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/SessionServer.java
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/SessionServer.java b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/SessionServer.java
index 47274fc..dc6d433 100644
--- a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/SessionServer.java
+++ b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/SessionServer.java
@@ -22,6 +22,7 @@ package org.apache.cxf.systest.http_undertow;
import java.net.URL;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
@@ -35,7 +36,7 @@ public class SessionServer extends AbstractBusTestServerBase {
URL configure =
SessionServer.class.getResource(configurationFile);
bus = new SpringBusFactory().createBus(configure, true);
- SpringBusFactory.setDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthServer.java
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthServer.java b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthServer.java
index 3f475b7..7db5b5f 100644
--- a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthServer.java
+++ b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthServer.java
@@ -25,6 +25,7 @@ import java.net.URL;
import javax.xml.ws.Endpoint;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.ext.logging.LoggingInInterceptor;
import org.apache.cxf.ext.logging.LoggingOutInterceptor;
@@ -44,7 +45,7 @@ public class UndertowBasicAuthServer extends AbstractBusTestServerBase {
Bus bus = new SpringBusFactory().createBus(configure, true);
bus.getInInterceptors().add(new LoggingInInterceptor());
bus.getOutInterceptors().add(new LoggingOutInterceptor());
- SpringBusFactory.setDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
setBus(bus);
GreeterImpl implementor = new GreeterImpl();
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthTest.java
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthTest.java b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthTest.java
index cebab6e..13afbc7 100644
--- a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthTest.java
+++ b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthTest.java
@@ -26,7 +26,6 @@ import javax.xml.ws.BindingProvider;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.configuration.security.AuthorizationPolicy;
import org.apache.cxf.ext.logging.LoggingInInterceptor;
import org.apache.cxf.ext.logging.LoggingOutInterceptor;
@@ -77,7 +76,7 @@ public class UndertowBasicAuthTest extends AbstractClientServerTestBase {
@org.junit.Test
public void testGetWSDL() throws Exception {
- BusFactory bf = CXFBusFactory.newInstance();
+ BusFactory bf = BusFactory.newInstance();
Bus bus = bf.createBus();
bus.getInInterceptors().add(new LoggingInInterceptor());
bus.getOutInterceptors().add(new LoggingOutInterceptor());
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowDigestAuthTest.java
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowDigestAuthTest.java b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowDigestAuthTest.java
index be6992f..d393f07 100644
--- a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowDigestAuthTest.java
+++ b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowDigestAuthTest.java
@@ -29,7 +29,6 @@ import javax.xml.ws.WebServiceException;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.configuration.security.AuthorizationPolicy;
import org.apache.cxf.ext.logging.LoggingInInterceptor;
@@ -78,7 +77,7 @@ public class UndertowDigestAuthTest extends AbstractClientServerTestBase {
Bus bus = new SpringBusFactory().createBus(configure, true);
//bus.getInInterceptors().add(new LoggingInInterceptor());
//bus.getOutInterceptors().add(new LoggingOutInterceptor());
- SpringBusFactory.setDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
setBus(bus);
GreeterImpl implementor = new GreeterImpl();
@@ -177,7 +176,7 @@ public class UndertowDigestAuthTest extends AbstractClientServerTestBase {
@Test
public void testGetWSDL() throws Exception {
- BusFactory bf = CXFBusFactory.newInstance();
+ BusFactory bf = BusFactory.newInstance();
Bus bus = bf.createBus();
bus.getInInterceptors().add(new LoggingInInterceptor());
bus.getOutInterceptors().add(new LoggingOutInterceptor());
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/WebSocketTestClient.java
----------------------------------------------------------------------
diff --git a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/WebSocketTestClient.java b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/WebSocketTestClient.java
index ffb46bf..d247278 100644
--- a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/WebSocketTestClient.java
+++ b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/websocket/WebSocketTestClient.java
@@ -251,7 +251,7 @@ class WebSocketTestClient {
entity = ((String)data).substring(pos);
} else if (data instanceof byte[]) {
entity = new byte[((byte[])data).length - pos];
- System.arraycopy((byte[])data, pos, (byte[])entity, 0, ((byte[])entity).length);
+ System.arraycopy(data, pos, entity, 0, ((byte[])entity).length);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java
----------------------------------------------------------------------
diff --git a/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java b/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java
index 6e9de9e..a2706a5 100644
--- a/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java
+++ b/systests/transports-ssl3/src/test/java/org/apache/cxf/https/ssl3/SSLv3Test.java
@@ -33,6 +33,7 @@ import javax.net.ssl.TrustManagerFactory;
import javax.xml.ws.BindingProvider;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
@@ -73,8 +74,8 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
URL busFile = SSLv3Test.class.getResource("sslv3-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
System.setProperty("https.protocols", "SSLv3");
@@ -121,8 +122,8 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
URL busFile = SSLv3Test.class.getResource("sslv3-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
System.setProperty("https.protocols", "SSLv3");
@@ -160,8 +161,8 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
URL busFile = SSLv3Test.class.getResource("sslv3-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -188,8 +189,8 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
URL busFile = SSLv3Test.class.getResource("sslv3-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -224,8 +225,8 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
URL busFile = SSLv3Test.class.getResource("sslv3-client-allow.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -252,8 +253,8 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
URL busFile = SSLv3Test.class.getResource("sslv3-client-allow.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -283,8 +284,8 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
URL busFile = SSLv3Test.class.getResource("sslv3-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -311,8 +312,8 @@ public class SSLv3Test extends AbstractBusClientServerTestBase {
URL busFile = SSLv3Test.class.getResource("sslv3-client-allow.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transports/src/test/java/org/apache/cxf/systest/http/BareServer.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/BareServer.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/BareServer.java
index 704b4f7..9d6c61d 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/BareServer.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/BareServer.java
@@ -22,6 +22,7 @@ package org.apache.cxf.systest.http;
import javax.xml.ws.Endpoint;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
@@ -33,7 +34,7 @@ public class BareServer extends AbstractBusTestServerBase {
@Override
protected void run() {
Bus bus = new SpringBusFactory().createBus();
- SpringBusFactory.setDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
Object implementor = new GreeterImpl();
String address = "http://localhost:" + PORT + "/SoapContext/GreeterPort";
ep = Endpoint.publish(address, implementor);
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java
index 5a330a1..ffad4e1 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java
@@ -22,6 +22,7 @@ package org.apache.cxf.systest.http;
import java.net.URL;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
@@ -35,7 +36,7 @@ public class SessionServer extends AbstractBusTestServerBase {
URL configure =
SessionServer.class.getResource(configurationFile);
bus = new SpringBusFactory().createBus(configure, true);
- SpringBusFactory.setDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthServer.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthServer.java b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthServer.java
index 4e398df..dcd5761 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthServer.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthServer.java
@@ -25,6 +25,7 @@ import java.net.URL;
import javax.xml.ws.Endpoint;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.ext.logging.LoggingInInterceptor;
import org.apache.cxf.ext.logging.LoggingOutInterceptor;
@@ -44,7 +45,7 @@ public class JettyBasicAuthServer extends AbstractBusTestServerBase {
Bus bus = new SpringBusFactory().createBus(configure, true);
bus.getInInterceptors().add(new LoggingInInterceptor());
bus.getOutInterceptors().add(new LoggingOutInterceptor());
- SpringBusFactory.setDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
setBus(bus);
GreeterImpl implementor = new GreeterImpl();
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthTest.java
index bdb5fda..0dd53a6 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyBasicAuthTest.java
@@ -26,7 +26,6 @@ import javax.xml.ws.BindingProvider;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.configuration.security.AuthorizationPolicy;
import org.apache.cxf.ext.logging.LoggingInInterceptor;
import org.apache.cxf.ext.logging.LoggingOutInterceptor;
@@ -77,7 +76,7 @@ public class JettyBasicAuthTest extends AbstractClientServerTestBase {
@org.junit.Test
public void testGetWSDL() throws Exception {
- BusFactory bf = CXFBusFactory.newInstance();
+ BusFactory bf = BusFactory.newInstance();
Bus bus = bf.createBus();
bus.getInInterceptors().add(new LoggingInInterceptor());
bus.getOutInterceptors().add(new LoggingOutInterceptor());
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java
index 0210fa0..1cf0bb3 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/JettyDigestAuthTest.java
@@ -29,7 +29,6 @@ import javax.xml.ws.WebServiceException;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.configuration.security.AuthorizationPolicy;
import org.apache.cxf.ext.logging.LoggingInInterceptor;
@@ -78,7 +77,7 @@ public class JettyDigestAuthTest extends AbstractClientServerTestBase {
Bus bus = new SpringBusFactory().createBus(configure, true);
bus.getInInterceptors().add(new LoggingInInterceptor());
bus.getOutInterceptors().add(new LoggingOutInterceptor());
- SpringBusFactory.setDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
setBus(bus);
GreeterImpl implementor = new GreeterImpl();
@@ -175,7 +174,7 @@ public class JettyDigestAuthTest extends AbstractClientServerTestBase {
@org.junit.Test
public void testGetWSDL() throws Exception {
- BusFactory bf = CXFBusFactory.newInstance();
+ BusFactory bf = BusFactory.newInstance();
Bus bus = bf.createBus();
bus.getInInterceptors().add(new LoggingInInterceptor());
bus.getOutInterceptors().add(new LoggingOutInterceptor());
http://git-wip-us.apache.org/repos/asf/cxf/blob/13bcc236/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
----------------------------------------------------------------------
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
index 28acadd..0394128 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
@@ -32,6 +32,7 @@ import javax.net.ssl.X509TrustManager;
import javax.xml.ws.BindingProvider;
import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.endpoint.Client;
@@ -96,8 +97,8 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -120,8 +121,8 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -156,8 +157,8 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-explicit-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -180,8 +181,8 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-rc4-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -209,8 +210,8 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-rc4-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -251,8 +252,8 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-rc4-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -285,8 +286,8 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-rc4-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -312,8 +313,8 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -341,8 +342,8 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -373,8 +374,8 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-null-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -397,8 +398,8 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-null-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -424,8 +425,8 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -453,8 +454,8 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-client.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -490,8 +491,8 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-client-tlsv12.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -519,8 +520,8 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-client-noconfig.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -563,8 +564,8 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-client-noconfig.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -601,8 +602,8 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-client-noconfig.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
@@ -640,8 +641,8 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase {
URL busFile = CipherSuitesTest.class.getResource("ciphersuites-client-expired-cert.xml");
Bus bus = bf.createBus(busFile.toString());
- SpringBusFactory.setDefaultBus(bus);
- SpringBusFactory.setThreadDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
URL url = SOAPService.WSDL_LOCATION;
SOAPService service = new SOAPService(url, SOAPService.SERVICE);
[03/12] cxf git commit: Fix static references in core and
"unnecessarily nested within else" warnings
Posted by dk...@apache.org.
Fix static references in core and "unnecessarily nested within else" warnings
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6d35b60b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6d35b60b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6d35b60b
Branch: refs/heads/master
Commit: 6d35b60b0fa5466a36cd5d60f010d1adbb1f5b84
Parents: 7443f01
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Aug 4 10:18:02 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Aug 4 10:40:43 2017 -0400
----------------------------------------------------------------------
.../cxf/bus/extension/ExtensionManagerBus.java | 3 +-
.../apache/cxf/common/logging/Log4jLogger.java | 14 +++---
.../org/apache/cxf/endpoint/ClientImpl.java | 4 +-
.../cxf/staxutils/DepthXMLStreamReader.java | 2 +-
.../cxf/staxutils/FragmentStreamReader.java | 13 ++---
.../org/apache/cxf/staxutils/StaxUtils.java | 52 ++++++++++----------
.../cxf/staxutils/DepthXMLStreamReaderTest.java | 3 +-
.../cxf/staxutils/FragmentStreamReaderTest.java | 7 +--
.../org/apache/cxf/staxutils/StaxUtilsTest.java | 9 ++--
9 files changed, 55 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6d35b60b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
index e86867f..d274267 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
@@ -29,7 +29,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.BindingFactoryManager;
-import org.apache.cxf.bus.CXFBusFactory;
import org.apache.cxf.bus.managers.BindingFactoryManagerImpl;
import org.apache.cxf.bus.managers.ConduitInitiatorManagerImpl;
import org.apache.cxf.bus.managers.DestinationFactoryManagerImpl;
@@ -84,7 +83,7 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
state = BusState.INITIAL;
- CXFBusFactory.possiblySetDefaultBus(this);
+ BusFactory.possiblySetDefaultBus(this);
if (null != props) {
properties.putAll(props);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/6d35b60b/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
----------------------------------------------------------------------
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 a727ae6..7f52fac 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
@@ -117,25 +117,25 @@ public class Log4jLogger extends AbstractDelegatingLogger {
private Level fromL4J(org.apache.log4j.Level l) {
Level l2 = null;
switch (l.toInt()) {
- case org.apache.log4j.Level.ALL_INT:
+ case org.apache.log4j.Priority.ALL_INT:
l2 = Level.ALL;
break;
- case org.apache.log4j.Level.FATAL_INT:
+ case org.apache.log4j.Priority.FATAL_INT:
l2 = Level.SEVERE;
break;
- case org.apache.log4j.Level.ERROR_INT:
+ case org.apache.log4j.Priority.ERROR_INT:
l2 = Level.SEVERE;
break;
- case org.apache.log4j.Level.WARN_INT:
+ case org.apache.log4j.Priority.WARN_INT:
l2 = Level.WARNING;
break;
- case org.apache.log4j.Level.INFO_INT:
+ case org.apache.log4j.Priority.INFO_INT:
l2 = Level.INFO;
break;
- case org.apache.log4j.Level.DEBUG_INT:
+ case org.apache.log4j.Priority.DEBUG_INT:
l2 = Level.FINE;
break;
- case org.apache.log4j.Level.OFF_INT:
+ case org.apache.log4j.Priority.OFF_INT:
l2 = Level.OFF;
break;
default:
http://git-wip-us.apache.org/repos/asf/cxf/blob/6d35b60b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
index 8fc116f..b92e48b 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
@@ -764,9 +764,9 @@ public class ClientImpl
}
String startingAfterInterceptorID = (String) message.get(
- PhaseInterceptorChain.STARTING_AFTER_INTERCEPTOR_ID);
+ InterceptorChain.STARTING_AFTER_INTERCEPTOR_ID);
String startingInterceptorID = (String) message.get(
- PhaseInterceptorChain.STARTING_AT_INTERCEPTOR_ID);
+ InterceptorChain.STARTING_AT_INTERCEPTOR_ID);
if (startingAfterInterceptorID != null) {
chain.doInterceptStartingAfter(message, startingAfterInterceptorID);
} else if (startingInterceptorID != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/6d35b60b/core/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java
----------------------------------------------------------------------
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 21db10b..9469498 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java
@@ -87,7 +87,7 @@ public class DepthXMLStreamReader implements XMLStreamReader {
String ret = reader.getElementText();
//workaround bugs in some readers that aren't properly advancing to
//the END_ELEMENT (*cough*jettison*cough*)
- while (reader.getEventType() != XMLStreamReader.END_ELEMENT) {
+ while (reader.getEventType() != XMLStreamConstants.END_ELEMENT) {
reader.next();
}
depth--;
http://git-wip-us.apache.org/repos/asf/cxf/blob/6d35b60b/core/src/main/java/org/apache/cxf/staxutils/FragmentStreamReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/FragmentStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/FragmentStreamReader.java
index b309a3f..2c6c9c2 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/FragmentStreamReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/FragmentStreamReader.java
@@ -19,6 +19,7 @@
package org.apache.cxf.staxutils;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -32,7 +33,7 @@ public class FragmentStreamReader extends DepthXMLStreamReader {
private boolean doDocEvents = true;
private int depth;
- private int current = XMLStreamReader.START_DOCUMENT;
+ private int current = XMLStreamConstants.START_DOCUMENT;
private boolean filter = true;
private boolean advanceAtEnd = true;
@@ -45,7 +46,7 @@ public class FragmentStreamReader extends DepthXMLStreamReader {
if (!doDocEvents) {
depth = getDepth();
current = reader.getEventType();
- if (current != XMLStreamReader.START_DOCUMENT) {
+ if (current != XMLStreamConstants.START_DOCUMENT) {
startElement = true;
}
}
@@ -56,19 +57,19 @@ public class FragmentStreamReader extends DepthXMLStreamReader {
}
public boolean isCharacters() {
- return current == XMLStreamReader.CHARACTERS;
+ return current == XMLStreamConstants.CHARACTERS;
}
public boolean isEndElement() {
- return current == XMLStreamReader.END_ELEMENT;
+ return current == XMLStreamConstants.END_ELEMENT;
}
public boolean isStartElement() {
- return current == XMLStreamReader.START_ELEMENT;
+ return current == XMLStreamConstants.START_ELEMENT;
}
public boolean isWhiteSpace() {
- return current == XMLStreamReader.CHARACTERS && reader.isWhiteSpace();
+ return current == XMLStreamConstants.CHARACTERS && reader.isWhiteSpace();
}
public boolean hasNext() throws XMLStreamException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/6d35b60b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
index ff9d284..fab8f31 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
@@ -462,7 +462,7 @@ public final class StaxUtils {
}
public static boolean toNextText(DepthXMLStreamReader reader) {
- if (reader.getEventType() == XMLStreamReader.CHARACTERS) {
+ if (reader.getEventType() == XMLStreamConstants.CHARACTERS) {
return true;
}
@@ -470,7 +470,7 @@ public final class StaxUtils {
int depth = reader.getDepth();
int event = reader.getEventType();
while (reader.getDepth() >= depth && reader.hasNext()) {
- if (event == XMLStreamReader.CHARACTERS && reader.getDepth() == depth + 1) {
+ if (event == XMLStreamConstants.CHARACTERS && reader.getDepth() == depth + 1) {
return true;
}
event = reader.next();
@@ -484,8 +484,8 @@ public final class StaxUtils {
try {
// advance to first tag.
int x = reader.getEventType();
- while (x != XMLStreamReader.START_ELEMENT
- && x != XMLStreamReader.END_ELEMENT
+ while (x != XMLStreamConstants.START_ELEMENT
+ && x != XMLStreamConstants.END_ELEMENT
&& reader.hasNext()) {
x = reader.next();
}
@@ -500,7 +500,7 @@ public final class StaxUtils {
int depth = reader.getDepth();
int event = reader.getEventType();
while (reader.getDepth() >= depth && reader.hasNext()) {
- if (event == XMLStreamReader.START_ELEMENT && reader.getName().equals(endTag)
+ if (event == XMLStreamConstants.START_ELEMENT && reader.getName().equals(endTag)
&& reader.getDepth() == depth + 1) {
return true;
}
@@ -540,8 +540,8 @@ public final class StaxUtils {
* returned if the end of the stream is reached.
*/
public static boolean skipToStartOfElement(XMLStreamReader in) throws XMLStreamException {
- for (int code = in.getEventType(); code != XMLStreamReader.END_DOCUMENT; code = in.next()) {
- if (code == XMLStreamReader.START_ELEMENT) {
+ for (int code = in.getEventType(); code != XMLStreamConstants.END_DOCUMENT; code = in.next()) {
+ if (code == XMLStreamConstants.START_ELEMENT) {
return true;
}
}
@@ -549,19 +549,19 @@ public final class StaxUtils {
}
public static boolean toNextElement(DepthXMLStreamReader dr) {
- if (dr.getEventType() == XMLStreamReader.START_ELEMENT) {
+ if (dr.getEventType() == XMLStreamConstants.START_ELEMENT) {
return true;
}
- if (dr.getEventType() == XMLStreamReader.END_ELEMENT) {
+ if (dr.getEventType() == XMLStreamConstants.END_ELEMENT) {
return false;
}
try {
int depth = dr.getDepth();
for (int event = dr.getEventType(); dr.getDepth() >= depth && dr.hasNext(); event = dr.next()) {
- if (event == XMLStreamReader.START_ELEMENT && dr.getDepth() == depth + 1) {
+ if (event == XMLStreamConstants.START_ELEMENT && dr.getDepth() == depth + 1) {
return true;
- } else if (event == XMLStreamReader.END_ELEMENT) {
+ } else if (event == XMLStreamConstants.END_ELEMENT) {
depth--;
}
}
@@ -573,8 +573,8 @@ public final class StaxUtils {
}
public static boolean skipToStartOfElement(DepthXMLStreamReader in) throws XMLStreamException {
- for (int code = in.getEventType(); code != XMLStreamReader.END_DOCUMENT; code = in.next()) {
- if (code == XMLStreamReader.START_ELEMENT) {
+ for (int code = in.getEventType(); code != XMLStreamConstants.END_DOCUMENT; code = in.next()) {
+ if (code == XMLStreamConstants.START_ELEMENT) {
return true;
}
}
@@ -1984,22 +1984,22 @@ public final class StaxUtils {
throws XMLStreamException {
switch (event.getEventType()) {
- case XMLEvent.START_ELEMENT:
+ case XMLStreamConstants.START_ELEMENT:
writeStartElementEvent(event, writer);
break;
- case XMLEvent.END_ELEMENT:
+ case XMLStreamConstants.END_ELEMENT:
writer.writeEndElement();
break;
- case XMLEvent.ATTRIBUTE:
+ case XMLStreamConstants.ATTRIBUTE:
writeAttributeEvent(event, writer);
break;
- case XMLEvent.ENTITY_REFERENCE:
+ case XMLStreamConstants.ENTITY_REFERENCE:
writer.writeEntityRef(((javax.xml.stream.events.EntityReference)event).getName());
break;
- case XMLEvent.DTD:
+ case XMLStreamConstants.DTD:
writer.writeDTD(((DTD)event).getDocumentTypeDeclaration());
break;
- case XMLEvent.PROCESSING_INSTRUCTION:
+ case XMLStreamConstants.PROCESSING_INSTRUCTION:
if (((javax.xml.stream.events.ProcessingInstruction)event).getData() != null) {
writer.writeProcessingInstruction(
((javax.xml.stream.events.ProcessingInstruction)event).getTarget(),
@@ -2009,7 +2009,7 @@ public final class StaxUtils {
((javax.xml.stream.events.ProcessingInstruction)event).getTarget());
}
break;
- case XMLEvent.NAMESPACE:
+ case XMLStreamConstants.NAMESPACE:
if (((Namespace)event).isDefaultNamespaceDeclaration()) {
writer.writeDefaultNamespace(((Namespace)event).getNamespaceURI());
writer.setDefaultNamespace(((Namespace)event).getNamespaceURI());
@@ -2020,17 +2020,17 @@ public final class StaxUtils {
((Namespace)event).getNamespaceURI());
}
break;
- case XMLEvent.COMMENT:
+ case XMLStreamConstants.COMMENT:
writer.writeComment(((javax.xml.stream.events.Comment)event).getText());
break;
- case XMLEvent.CHARACTERS:
- case XMLEvent.SPACE:
+ case XMLStreamConstants.CHARACTERS:
+ case XMLStreamConstants.SPACE:
writer.writeCharacters(event.asCharacters().getData());
break;
- case XMLEvent.CDATA:
+ case XMLStreamConstants.CDATA:
writer.writeCData(event.asCharacters().getData());
break;
- case XMLEvent.START_DOCUMENT:
+ case XMLStreamConstants.START_DOCUMENT:
if (((StartDocument)event).encodingSet()) {
writer.writeStartDocument(((StartDocument)event).getCharacterEncodingScheme(),
((StartDocument)event).getVersion());
@@ -2039,7 +2039,7 @@ public final class StaxUtils {
writer.writeStartDocument(((StartDocument)event).getVersion());
}
break;
- case XMLEvent.END_DOCUMENT:
+ case XMLStreamConstants.END_DOCUMENT:
writer.writeEndDocument();
break;
default:
http://git-wip-us.apache.org/repos/asf/cxf/blob/6d35b60b/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
index 502b845..9300ea2 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
@@ -19,6 +19,7 @@
package org.apache.cxf.staxutils;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
import org.junit.Assert;
@@ -35,7 +36,7 @@ public class DepthXMLStreamReaderTest extends Assert {
StaxUtils.toNextElement(dr);
assertEquals("ItemLookup", dr.getLocalName());
- assertEquals(XMLStreamReader.START_ELEMENT, reader.getEventType());
+ assertEquals(XMLStreamConstants.START_ELEMENT, reader.getEventType());
assertEquals(1, dr.getDepth());
http://git-wip-us.apache.org/repos/asf/cxf/blob/6d35b60b/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
index cb0981f..f1de75e 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
@@ -21,6 +21,7 @@ package org.apache.cxf.staxutils;
import java.io.StringReader;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
import org.junit.Assert;
@@ -37,18 +38,18 @@ public class FragmentStreamReaderTest extends Assert {
StaxUtils.toNextElement(dr);
assertEquals("ItemLookup", dr.getLocalName());
- assertEquals(XMLStreamReader.START_ELEMENT, reader.getEventType());
+ assertEquals(XMLStreamConstants.START_ELEMENT, reader.getEventType());
FragmentStreamReader fsr = new FragmentStreamReader(dr);
assertTrue(fsr.hasNext());
- assertEquals(XMLStreamReader.START_DOCUMENT, fsr.getEventType());
+ assertEquals(XMLStreamConstants.START_DOCUMENT, fsr.getEventType());
fsr.next();
assertEquals("ItemLookup", fsr.getLocalName());
assertEquals("ItemLookup", dr.getLocalName());
- assertEquals(XMLStreamReader.START_ELEMENT, reader.getEventType());
+ assertEquals(XMLStreamConstants.START_ELEMENT, reader.getEventType());
fsr.close();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/6d35b60b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
index 8ac46da..e38d939 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
@@ -29,6 +29,7 @@ import java.io.Writer;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.stream.events.XMLEvent;
@@ -425,14 +426,14 @@ public class StaxUtilsTest extends Assert {
new ByteArrayInputStream(in.toString().getBytes()));
QName qname = new QName("http://example.com/", "Bar");
- assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
- assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
+ assertEquals(XMLStreamConstants.START_ELEMENT, reader.next());
+ assertEquals(XMLStreamConstants.START_ELEMENT, reader.next());
// first bar
assertEquals(qname, StaxUtils.readQName(reader));
- assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
+ assertEquals(XMLStreamConstants.START_ELEMENT, reader.next());
// second bar
assertEquals(qname, StaxUtils.readQName(reader));
- assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
+ assertEquals(XMLStreamConstants.START_ELEMENT, reader.next());
// third bar
try {
StaxUtils.readQName(reader);