cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject git commit: More updates for Java8 support
Date Fri, 30 May 2014 16:05:07 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 9ef02595b -> d6a28f110


More updates for Java8 support


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d6a28f11
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d6a28f11
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d6a28f11

Branch: refs/heads/master
Commit: d6a28f1100bafbcb5f962af59f36209b4f4323b0
Parents: 9ef0259
Author: Daniel Kulp <dkulp@apache.org>
Authored: Fri May 30 12:04:45 2014 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Fri May 30 12:04:45 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/cxf/phase/PhaseInterceptorChainTest.java    | 4 +---
 .../apache/cxf/jaxrs/provider/aegis/AegisJSONProviderTest.java  | 2 +-
 .../java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java    | 5 +++--
 3 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d6a28f11/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
index c09523d..1c8f808 100644
--- a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
+++ b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
@@ -430,14 +430,12 @@ public class PhaseInterceptorChainTest extends Assert {
         return p;
     }
     
-    
-    @SuppressWarnings("unchecked")
     void setUpPhaseInterceptorInvocations(AbstractPhaseInterceptor<Message> p,
             boolean fail, boolean expectFault) {
         p.handleMessage(message);
         if (fail) {
             EasyMock.expectLastCall().andThrow(new RuntimeException());
-            message.setContent(EasyMock.isA(Class.class),
+            message.setContent(EasyMock.eq(Exception.class),
                                EasyMock.isA(Exception.class));
             EasyMock.expectLastCall();
         } else {

http://git-wip-us.apache.org/repos/asf/cxf/blob/d6a28f11/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProviderTest.java
b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProviderTest.java
index 117792f..5fd385b 100644
--- a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProviderTest.java
+++ b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/aegis/AegisJSONProviderTest.java
@@ -87,7 +87,7 @@ public class AegisJSONProviderTest extends Assert {
         AbstractAegisProvider.clearContexts();
         if (setNsMap) {
             Map<String, String> namespaceMap = new HashMap<String, String>();
-            namespaceMap.put("http://fortest.jaxrs.cxf.apache.org", "ns1");
+            namespaceMap.put("http://resources.jaxrs.cxf.apache.org", "ns1");
             namespaceMap.put("http://www.w3.org/2001/XMLSchema-instance", "xsi");
             p.setNamespaceMap(namespaceMap);
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/d6a28f11/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 2f2d95b..4d575bb 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
@@ -375,7 +375,7 @@ public class MAPCodecTest extends Assert {
                     ? VersionTransformer.Names200403.EPR_TYPE : null, 6, unmarshaller);
     }
 
-    private <T> void setUpHeaderDecode(List<Header> headers, String uri, String
name, Class<T> clz,
+    private <T> void setUpHeaderDecode(List<Header> headers, String uri, String
name, Class<?> clz,
                                        int index, Unmarshaller unmarshaller) throws Exception
{
         Element headerElement = control.createMock(Element.class);
         headers.add(new Header(new QName(uri, name), headerElement));
@@ -384,7 +384,8 @@ public class MAPCodecTest extends Assert {
         headerElement.getLocalName();
         EasyMock.expectLastCall().andReturn(name);
         Object v = expectedValues[index];
-        JAXBElement<?> jaxbElement = new JAXBElement<T>(new QName(uri, name),
clz, clz.cast(v));
+        @SuppressWarnings("unchecked")
+        JAXBElement<?> jaxbElement = new JAXBElement<Object>(new QName(uri, name),
(Class<Object>)clz, clz.cast(v));
         unmarshaller.unmarshal(headerElement, clz);
         EasyMock.expectLastCall().andReturn(jaxbElement);
     }


Mime
View raw message