You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/04/24 09:40:49 UTC

[cxf] branch master updated: More sample work

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new d2c42f9  More sample work
d2c42f9 is described below

commit d2c42f97c86d7ffb1c471e6003d6de6b37f26add
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Apr 24 10:39:56 2018 +0100

    More sample work
---
 .../demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java  | 8 ++++----
 .../demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java  | 8 ++++----
 .../java/demo/hwDispatch/server/GreeterSoapMessageProvider.java  | 6 +++---
 .../src/main/java/demo/handlers/common/LoggingHandler.java       | 5 -----
 .../src/main/java/demo/handlers/common/SmallNumberHandler.java   | 9 ++-------
 5 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
index ef0512a..652e33f 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
@@ -47,10 +47,10 @@ public class GreeterDOMSourceMessageProvider implements Provider<DOMSource> {
             soapReq.writeTo(System.out);
             System.out.println("\n");
 
-            InputStream is = getClass().getResourceAsStream("/GreetMeDocLiteralResp2.xml");
-            SOAPMessage greetMeResponse = factory.createMessage(null, is);
-            is.close();
-
+            SOAPMessage greetMeResponse = null;
+            try (InputStream is = getClass().getResourceAsStream("/GreetMeDocLiteralResp2.xml")) {
+                greetMeResponse = factory.createMessage(null, is);
+            }
             response.setNode(greetMeResponse.getSOAPPart());
         } catch (Exception ex) {
             ex.printStackTrace();
diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
index 061e527..8c77d10 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
@@ -48,10 +48,10 @@ public class GreeterDOMSourcePayloadProvider implements Provider<DOMSource> {
             transformer.transform(request, result);
             System.out.println("\n");
 
-            InputStream is = getClass().getResourceAsStream("/GreetMeDocLiteralResp3.xml");
-
-            SOAPMessage greetMeResponse = MessageFactory.newInstance().createMessage(null, is);
-            is.close();
+            SOAPMessage greetMeResponse = null;
+            try (InputStream is = getClass().getResourceAsStream("/GreetMeDocLiteralResp3.xml")) {
+                greetMeResponse = MessageFactory.newInstance().createMessage(null, is);
+            }
             response.setNode(greetMeResponse.getSOAPBody().extractContentAsDocument());
         } catch (Exception ex) {
             ex.printStackTrace();
diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterSoapMessageProvider.java b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterSoapMessageProvider.java
index 36ba113..6c623ee 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterSoapMessageProvider.java
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterSoapMessageProvider.java
@@ -42,9 +42,9 @@ public class GreeterSoapMessageProvider implements Provider<SOAPMessage> {
         try {
             System.out.println("Incoming Client Request as a SOAPMessage");
             MessageFactory factory = MessageFactory.newInstance();
-            InputStream is = getClass().getResourceAsStream("/GreetMeDocLiteralResp1.xml");
-            response = factory.createMessage(null, is);
-            is.close();
+            try (InputStream is = getClass().getResourceAsStream("/GreetMeDocLiteralResp1.xml")) {
+                response = factory.createMessage(null, is);
+            }
         } catch (Exception ex) {
             ex.printStackTrace();
         }
diff --git a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/LoggingHandler.java b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/LoggingHandler.java
index 3eaf0f5..4109402 100644
--- a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/LoggingHandler.java
+++ b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/LoggingHandler.java
@@ -21,7 +21,6 @@ package demo.handlers.common;
 
 
 import java.io.PrintStream;
-import java.util.Map;
 import java.util.Set;
 
 import javax.xml.namespace.QName;
@@ -46,10 +45,6 @@ public class LoggingHandler implements SOAPHandler<SOAPMessageContext> {
         out = ps;
     }
 
-    public void init(Map c) {
-        System.out.println("LoggingHandler : init() Called....");
-    }
-
     public Set<QName> getHeaders() {
         return null;
     }
diff --git a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/SmallNumberHandler.java b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/SmallNumberHandler.java
index cd9d017..63f5546 100644
--- a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/SmallNumberHandler.java
+++ b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/SmallNumberHandler.java
@@ -19,7 +19,6 @@
 
 package demo.handlers.common;
 
-import java.util.Map;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
@@ -60,7 +59,7 @@ public class SmallNumberHandler implements LogicalHandler<LogicalMessageContext>
                 JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
                 Object payload = msg.getPayload(jaxbContext);
                 if (payload instanceof JAXBElement) {
-                    payload = ((JAXBElement)payload).getValue();
+                    payload = ((JAXBElement<?>)payload).getValue();
                 }
 
                 if (payload instanceof AddNumbers) {
@@ -88,7 +87,7 @@ public class SmallNumberHandler implements LogicalHandler<LogicalMessageContext>
 
                         payload = msg.getPayload(jaxbContext);
                         if (payload instanceof JAXBElement) {
-                            payload = ((JAXBElement)payload).getValue();
+                            payload = ((JAXBElement<?>)payload).getValue();
                         }
 
                         AddNumbersResponse resp2 = (AddNumbersResponse)payload;
@@ -121,10 +120,6 @@ public class SmallNumberHandler implements LogicalHandler<LogicalMessageContext>
         System.out.println("LogicalHandler close called");
     }
 
-    public void init(Map config) {
-        System.out.println("LogicalHandler init called");
-    }
-
     public void destroy() {
         System.out.println("LogicalHandler close called");
     }

-- 
To stop receiving notification emails like this one, please contact
coheigea@apache.org.