Repository: cxf
Updated Branches:
  refs/heads/master 344feb533 -> 958bb235f


http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
----------------------------------------------------------------------
diff --git 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
index 5fe933f..cdab619 100644
--- 
a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
+++ 
b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DeliveryAssuranceOnewayTest.java
@@ -499,17 +499,16 @@ public class DeliveryAssuranceOnewayTest extends 
AbstractBusClientServerTestBase
                     CALL_ARGS.add(s);
                 }
                 return null;
-            } else {
-                synchronized (CALL_ARGS) {
-                    CALL_ARGS.add(s);
-                }
-                String resp =
-                    "<greetMeResponse "
-                        + 
"xmlns=\"http://cxf.apache.org/greeter_control/types\";>"
-                        + "<responseType>" + s.toUpperCase() + 
"</responseType>"
-                    + "</greetMeResponse>";
-                return new StreamSource(new StringReader(resp));
             }
+            synchronized (CALL_ARGS) {
+                CALL_ARGS.add(s);
+            }
+            String resp =
+                "<greetMeResponse "
+                    + "xmlns=\"http://cxf.apache.org/greeter_control/types\";>"
+                    + "<responseType>" + s.toUpperCase() + "</responseType>"
+                + "</greetMeResponse>";
+            return new StreamSource(new StringReader(resp));
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/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 7c46b1e..df10692 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
@@ -333,17 +333,16 @@ public class MessageCallbackOnewayTest extends 
AbstractBusClientServerTestBase {
                     CALL_ARGS.add(s);
                 }
                 return null;
-            } else {
-                synchronized (CALL_ARGS) {
-                    CALL_ARGS.add(s);
-                }
-                String resp =
-                    "<greetMeResponse "
-                        + 
"xmlns=\"http://cxf.apache.org/greeter_control/types\";>"
-                        + "<responseType>" + s.toUpperCase() + 
"</responseType>"
-                    + "</greetMeResponse>";
-                return new StreamSource(new StringReader(resp));
             }
+            synchronized (CALL_ARGS) {
+                CALL_ARGS.add(s);
+            }
+            String resp =
+                "<greetMeResponse "
+                    + "xmlns=\"http://cxf.apache.org/greeter_control/types\";>"
+                    + "<responseType>" + s.toUpperCase() + "</responseType>"
+                + "</greetMeResponse>";
+            return new StreamSource(new StringReader(resp));
         }
     }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/KeystorePasswordCallback.java
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/KeystorePasswordCallback.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/KeystorePasswordCallback.java
index 975a2b0..55f275e 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/KeystorePasswordCallback.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/common/KeystorePasswordCallback.java
@@ -64,9 +64,8 @@ public class KeystorePasswordCallback implements 
CallbackHandler {
                 if (pass != null) {
                     pc.setPassword(pass);
                     return;
-                } else {
-                    pc.setPassword("password");
                 }
+                pc.setPassword("password");
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
index 66c5b0f..e4b833d 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServiceTest.java
@@ -529,9 +529,8 @@ public class JavaFirstPolicyServiceTest extends 
AbstractBusClientServerTestBase
                                                                  
"PolicyReference");
         if (policyReference != null) {
             return policyReference.getAttributeNS(null, "URI");
-        } else {
-            return null;
         }
+        return null;
     }
 
     private String getOperationPolicyReferenceId(Element operationElement, 
String policyNamespace) {
@@ -539,9 +538,8 @@ public class JavaFirstPolicyServiceTest extends 
AbstractBusClientServerTestBase
                                                                  
"PolicyReference");
         if (policyReference != null) {
             return policyReference.getAttributeNS(null, "URI");
-        } else {
-            return null;
         }
+        return null;
     }
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstUriDomainExpression.java
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstUriDomainExpression.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstUriDomainExpression.java
index 4c19292..939a2c0 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstUriDomainExpression.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstUriDomainExpression.java
@@ -61,9 +61,8 @@ public class JavaFirstUriDomainExpression implements 
DomainExpression {
     public boolean appliesTo(BindingOperationInfo boi) {
         if ("usernamepassword".equals(url)) {
             return 
"doOperationLevelPolicy".equals(boi.getName().getLocalPart());
-        } else {
-            return false;
         }
+        return false;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
index 3bd9501..dca6c8c 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java
@@ -182,9 +182,8 @@ public class WSSecurity10Test extends 
AbstractBusClientServerTestBase {
         try {
             if ("UserNameOverTransport".equals(portPrefix)) {
                 return new URL("https://localhost:"; + port + "/" + portPrefix 
+ "?wsdl");
-            } else {
-                return new URL("http://localhost:"; + port + "/" + portPrefix + 
"?wsdl");
             }
+            return new URL("http://localhost:"; + port + "/" + portPrefix + 
"?wsdl");
         } catch (MalformedURLException mue) {
             return null;
         }

http://git-wip-us.apache.org/repos/asf/cxf/blob/db11547c/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
index dd2b3bb..4069aac 100644
--- 
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
+++ 
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
@@ -126,21 +126,20 @@ public class WSSecurity112Test extends WSSecurity11Common 
{
                 {new TestParam("XD-ES", StaxServer12.PORT, false)},
                 {new TestParam("XD-SEES", StaxServer12.PORT, false)},
             });
-        } else {
-            return Arrays.asList(new TestParam[][] {
-                {new TestParam("X", Server12Restricted.PORT, false)},
-                {new TestParam("X-NoTimestamp", Server12Restricted.PORT, 
false)},
-                {new TestParam("XD", Server12Restricted.PORT, false)},
-                {new TestParam("XD-ES", Server12Restricted.PORT, false)},
-                {new TestParam("XD-SEES", Server12Restricted.PORT, false)},
-
-                {new TestParam("X", StaxServer12Restricted.PORT, false)},
-                {new TestParam("X-NoTimestamp", StaxServer12Restricted.PORT, 
false)},
-                {new TestParam("XD", StaxServer12Restricted.PORT, false)},
-                {new TestParam("XD-ES", StaxServer12Restricted.PORT, false)},
-                {new TestParam("XD-SEES", StaxServer12Restricted.PORT, false)},
-            });
         }
+        return Arrays.asList(new TestParam[][] {
+            {new TestParam("X", Server12Restricted.PORT, false)},
+            {new TestParam("X-NoTimestamp", Server12Restricted.PORT, false)},
+            {new TestParam("XD", Server12Restricted.PORT, false)},
+            {new TestParam("XD-ES", Server12Restricted.PORT, false)},
+            {new TestParam("XD-SEES", Server12Restricted.PORT, false)},
+
+            {new TestParam("X", StaxServer12Restricted.PORT, false)},
+            {new TestParam("X-NoTimestamp", StaxServer12Restricted.PORT, 
false)},
+            {new TestParam("XD", StaxServer12Restricted.PORT, false)},
+            {new TestParam("XD-ES", StaxServer12Restricted.PORT, false)},
+            {new TestParam("XD-SEES", StaxServer12Restricted.PORT, false)},
+        });
     }
 
     @org.junit.AfterClass

Reply via email to