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/14 14:14:15 UTC
[1/2] cxf git commit: Update to Eclipse Oxygen,
remove the new warnings
Repository: cxf
Updated Branches:
refs/heads/master 214695957 -> 390231e77
Update to Eclipse Oxygen, remove the new warnings
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b02720dd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b02720dd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b02720dd
Branch: refs/heads/master
Commit: b02720dd7e7d81cd2f0c9ba9c8d424b038c34c7a
Parents: 2146959
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Aug 14 08:53:47 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Aug 14 08:53:47 2017 -0400
----------------------------------------------------------------------
.../java/org/apache/cxf/common/util/SortedArraySet.java | 2 +-
.../main/java/org/apache/cxf/message/ExchangeImpl.java | 2 +-
.../resourceadapter/ManagedConnectionFactoryImplTest.java | 1 -
.../org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java | 2 --
.../cxf/jca/cxf/ManagedConnectionFactoryImplTest.java | 2 --
.../org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java | 10 ----------
.../org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java | 2 --
.../org/apache/cxf/aegis/util/jdom/StaxBuilder.java | 1 -
.../type/java5/map/StudentServiceDocLiteralImpl.java | 2 +-
.../cxf/aegis/type/java5/map/StudentServiceImpl.java | 2 +-
.../apache/cxf/jaxrs/provider/ServerProviderFactory.java | 2 +-
.../java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 4 +---
.../oauth2/provider/JPAOAuthDataProviderTest.java | 1 -
.../java/org/apache/cxf/transport/http/HTTPConduit.java | 2 +-
.../org/apache/cxf/transport/jms/JMSDestinationTest.java | 1 -
.../org/apache/cxf/ws/rm/DestinationSequenceTest.java | 1 -
.../java/org/apache/cxf/ws/rm/SourceSequenceTest.java | 1 -
.../org/apache/cxf/wsdl/service/factory/ClassReader.java | 1 -
.../cxf/sts/claims/mapper/JexlClaimsMapperTest.java | 2 +-
.../org/apache/cxf/xkms/x509/handlers/X509Register.java | 2 +-
.../cxf/systest/type_test/AbstractTypeTestClient3.java | 2 --
.../jaxws/processor/internal/ParameterProcessor.java | 2 +-
22 files changed, 10 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java b/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
index 54d846d..2143e10 100644
--- a/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
+++ b/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
@@ -224,7 +224,7 @@ public final class SortedArraySet<T> implements SortedSet<T> {
public void remove() {
if (idx > 0) {
- SortedArraySet.this.remove(data[idx - 1]);
+ SortedArraySet.this.remove((Object)data[idx - 1]);
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java b/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java
index 618667e..e6e00dc 100644
--- a/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java
+++ b/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java
@@ -129,7 +129,7 @@ public class ExchangeImpl extends ConcurrentHashMap<String, Object> implements
public <T> void put(Class<T> key, T value) {
if (value == null) {
- super.remove(key);
+ super.remove((Object)key);
} else if (key == Bus.class) {
resetContextCaches();
bus = (Bus)value;
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/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 6913e6e..68b03f8 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,7 +41,6 @@ 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/b02720dd/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 cf0125f..5ecd26f 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,13 +54,11 @@ 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/b02720dd/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 d95dbda..8278b4a 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
@@ -144,7 +144,6 @@ public class ManagedConnectionFactoryImplTest extends Assert {
.getDeclaredMethod("hashCode", (Class[])null));
assertEquals("equal with its self", mci, mci);
assertTrue("not equal with another", !mci.equals(new ManagedConnectionFactoryImpl()));
- assertTrue("not equal with another thing", !mci.equals(this));
}
@Test
@@ -231,7 +230,6 @@ 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/b02720dd/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 c09b47b..03b51cb 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,7 +45,6 @@ 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();
@@ -59,15 +58,6 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
assertTrue(o instanceof Foo);
}
-
- @Ignore("Need to check the classloader")
- public void testThreadContextClassLoaderIsSet() throws Exception {
- //set the threadContextClassLoader for Bus
- //TODO njiang classloader things
- //check the threadContextClassLoader
- mci.getConnection(subj, cri);
- }
-
@Test
public void testGetConnectionWithNoWSDLInvokesCreateClientWithTwoParameters() throws Exception {
cri = new CXFConnectionRequestInfo(Greeter.class, null, serviceName, portName);
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/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 a96fda0..3929e55 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,7 +45,6 @@ public class ResourceAdapterImplTest extends Assert {
}
@Test
- @SuppressWarnings("cast")
public void testConstructorWithoutProperties() throws Exception {
ResourceAdapterImpl rai = new ResourceAdapterImpl();
assertTrue("constructed without props", rai instanceof ResourceAdapterImpl);
@@ -55,7 +54,6 @@ public class ResourceAdapterImplTest extends Assert {
}
@Test
- @SuppressWarnings("cast")
public void testConstructorWithProperties() throws Exception {
Properties props = new Properties();
ResourceAdapterImpl rai = new ResourceAdapterImpl(props);
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java b/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
index 648dc88..b57ffe5 100644
--- a/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
+++ b/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
@@ -227,7 +227,6 @@ public class StaxBuilder {
* @param node <code>Code</node> to examine.
* @param doc JDOM <code>Document</code> being built.
*/
- @SuppressWarnings("fallthrough")
private void buildTree(JDOMFactory f, XMLStreamReader r, Document doc) throws XMLStreamException {
Element current = null; // At top level
int event = r.getEventType();
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java
index 7a1908d..82378cd 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java
@@ -41,7 +41,7 @@ public class StudentServiceDocLiteralImpl implements StudentServiceDocLiteral {
public List<Student> getStudents(Map<String, String> filters) {
List<Student> returnValue = new LinkedList<Student>();
for (Map.Entry<Long, Student> e : studentMap.entrySet()) {
- if (filters.containsKey(e.getValue())) {
+ if (filters.containsKey((Object)e.getValue())) {
returnValue.add(e.getValue());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java
index 483285d..80d4bf8 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java
@@ -41,7 +41,7 @@ public class StudentServiceImpl implements StudentService {
public List<Student> getStudents(Map<String, String> filters) {
List<Student> returnValue = new LinkedList<Student>();
for (Map.Entry<Long, Student> e : studentMap.entrySet()) {
- if (filters.containsKey(e.getValue())) {
+ if (filters.containsKey((Object)e.getValue())) {
returnValue.add(e.getValue());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
index ecc5867..b9003aa 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
@@ -472,7 +472,7 @@ public final class ServerProviderFactory extends ProviderFactory {
@Override
public boolean isEnabled(Feature f) {
- return dynamicFeatures.contains(f);
+ return dynamicFeatures.contains((Object)f);
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
index b7181c1..f8ec86e 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
@@ -210,7 +210,6 @@ public class JAXRSUtilsTest extends Assert {
assertEquals("customerContext", context.get());
}
- @SuppressWarnings("cast")
@Test
public void testInjectApplicationInSingleton() throws Exception {
CustomerApplication app = new CustomerApplication();
@@ -231,7 +230,6 @@ public class JAXRSUtilsTest extends Assert {
assertTrue(proxy.get() instanceof UriInfo);
}
- @SuppressWarnings("cast")
@Test
public void testInjectApplicationInPerRequestResource() throws Exception {
CustomerApplication app = new CustomerApplication();
@@ -967,7 +965,7 @@ public class JAXRSUtilsTest extends Assert {
assertTrue(set1.contains(Cookie.valueOf("c1=c1Value")));
assertEquals("c2Value", params.get(2));
Set<Cookie> set2 = CastUtils.cast((Set<?>)params.get(3));
- assertTrue(set2.contains("c2Value"));
+ assertTrue(set2.contains((Object)"c2Value"));
assertEquals(1, set2.size());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
index 076a431..23abcd1 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProviderTest.java
@@ -203,7 +203,6 @@ public class JPAOAuthDataProviderTest extends Assert {
* Checks that having multiple token each with its own
* userSubject (but having same login) works.
*/
- @SuppressWarnings("cast")
@Test
public void testAddGetDeleteMultipleAccessToken() {
Client c = addClient("101", "bob");
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index cbf0e08..ec21cba 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -1068,7 +1068,7 @@ public abstract class HTTPConduit
}
public boolean canAssert(QName type) {
- return new ClientPolicyCalculator().equals(type);
+ return type.equals(new QName("http://cxf.apache.org/transports/http/configuration", "client"));
}
public void propertyChange(PropertyChangeEvent evt) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
index ab2256c..3f8f154 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
@@ -308,7 +308,6 @@ public class JMSDestinationTest extends AbstractJMSTester {
destination.shutdown();
}
- @SuppressWarnings("cast")
@Test
public void testIsMultiplexCapable() throws Exception {
EndpointInfo ei = setupServiceInfo("HelloWorldService", "HelloWorldPort");
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
index cb1f6c3..fb022f8 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/DestinationSequenceTest.java
@@ -119,7 +119,6 @@ public class DestinationSequenceTest extends Assert {
otherSeq = new DestinationSequence(otherId, ref, destination, ProtocolVariation.RM10WSA200408);
assertTrue(!seq.equals(otherSeq));
assertTrue(seq.hashCode() != otherSeq.hashCode());
- assertTrue(!seq.equals(this));
}
@Test
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
index 68f7a06..d8817b2 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/SourceSequenceTest.java
@@ -162,7 +162,6 @@ public class SourceSequenceTest extends Assert {
otherSeq = new SourceSequence(otherId, ProtocolVariation.RM10WSA200408);
assertTrue(!seq.equals(otherSeq));
assertTrue(seq.hashCode() != otherSeq.hashCode());
- assertTrue(!seq.equals(this));
}
@Test
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java
----------------------------------------------------------------------
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java
index 6c79834..8a26d4e 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java
@@ -305,7 +305,6 @@ class ClassReader extends ByteArrayInputStream {
}
}
- @SuppressWarnings("fallthrough")
protected final void readCpool() throws IOException {
int count = readShort(); // cpool count
cpoolIndex = new int[count];
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java
index 82b947f..694b32c 100644
--- a/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java
+++ b/services/sts/sts-core/src/test/java/org/apache/cxf/sts/claims/mapper/JexlClaimsMapperTest.java
@@ -68,7 +68,7 @@ public class JexlClaimsMapperTest extends org.junit.Assert {
assertEquals("Jan Bernhardt", result.get(1).getValues().get(0));
for (ProcessedClaim c : result) {
- if ("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname".equals(c.getClaimType())) {
+ if ("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname".equals(c.getClaimType().toString())) {
fail("Only merged claim should be in result set, but not the individual claims");
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/handlers/X509Register.java
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/handlers/X509Register.java b/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/handlers/X509Register.java
index 497568e..e352222 100644
--- a/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/handlers/X509Register.java
+++ b/services/xkms/xkms-x509-handlers/src/main/java/org/apache/cxf/xkms/x509/handlers/X509Register.java
@@ -65,7 +65,7 @@ public class X509Register implements Register {
}
List<String> respondWithList = request.getRespondWith();
if ((respondWithList != null) && !(respondWithList.isEmpty())) {
- return respondWithList.contains(RespondWithEnum.HTTP_WWW_W_3_ORG_2002_03_XKMS_X_509_CERT);
+ return respondWithList.contains((Object)RespondWithEnum.HTTP_WWW_W_3_ORG_2002_03_XKMS_X_509_CERT);
}
// Default handler
return true;
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
index b0caa40..27556b1 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
@@ -524,7 +524,6 @@ public abstract class AbstractTypeTestClient3 extends AbstractTypeTestClient2 {
//org.apache.type_test.types1.DerivedEmptyBaseEmptyAll
- @SuppressWarnings("cast")
@Test
public void testDerivedEmptyBaseEmptyAll() throws Exception {
if (!shouldRunTest("DerivedEmptyBaseEmptyAll")) {
@@ -554,7 +553,6 @@ public abstract class AbstractTypeTestClient3 extends AbstractTypeTestClient2 {
//org.apache.type_test.types1.DerivedEmptyBaseEmptyChoice
- @SuppressWarnings("cast")
@Test
public void testDerivedEmptyBaseEmptyChoice() throws Exception {
if (!shouldRunTest("DerivedEmptyBaseEmptyChoice")) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/b02720dd/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
index 61925c1..884f54f 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ParameterProcessor.java
@@ -701,7 +701,7 @@ public class ParameterProcessor extends AbstractProcessor {
if (outputUnlistedParts.size() == 1) {
processReturn(method, outputUnlistedParts.get(0));
- outputPartsMap.remove(outputUnlistedParts.get(0));
+ outputPartsMap.remove((Object)outputUnlistedParts.get(0));
outputUnlistedParts.clear();
} else {
processReturn(method, null);
[2/2] cxf git commit: Update PMD setup for -Psetup.eclipse to
configure PMD for eclipse-pmd from the Eclipse Oxygen marketplace
Posted by dk...@apache.org.
Update PMD setup for -Psetup.eclipse to configure PMD for eclipse-pmd from the Eclipse Oxygen marketplace
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/390231e7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/390231e7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/390231e7
Branch: refs/heads/master
Commit: 390231e777ef697e4442464d6ee6556051dcfd75
Parents: b02720d
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Aug 14 09:31:06 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Aug 14 09:31:06 2017 -0400
----------------------------------------------------------------------
.gitignore | 3 +--
parent/pom.xml | 6 ++++++
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/390231e7/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 86a086e..bc52a62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,8 +8,7 @@
.classpath
.ekstazi
.pmd
-.pmdruleset
-.pmdruleset.xml
+.eclipse-pmd
.project
.ruleset
.settings/
http://git-wip-us.apache.org/repos/asf/cxf/blob/390231e7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f0c1e56..d2f8de1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -308,11 +308,13 @@
<java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
<java.lang.String>net.sf.eclipsecs.core.CheckstyleBuilder</java.lang.String>
<java.lang.String>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</java.lang.String>
+ <java.lang.String>ch.acanda.eclipse.pmd.builder.PMDBuilder</java.lang.String>
</buildcommands>
<projectnatures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
+ <nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
</projectnatures>
<ajdtVersion>none</ajdtVersion>
<additionalConfig>
@@ -325,6 +327,10 @@
<location>/cxf-eclipse-pmd${cxf.pmd.eclipse.ruleset.ext}</location>
</file>
<file>
+ <name>.eclipse-pmd</name>
+ <location>/cxf-eclipse-pmd-new</location>
+ </file>
+ <file>
<name>.ruleset</name>
<location>/cxf-pmd-ruleset${cxf.pmd.eclipse.ruleset.ext}.xml</location>
</file>