Removed unnessary return statelements from methods where the last statement in the method was return

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@724331 13f79535-47bb-0310-9956-ffa450edef68

11 files changed, 0 insertions, 33 deletions

diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
index 61e2c7ee8f..42ca10aa2d 100644
--- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
+++ b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
@@ -51,8 +51,6 @@ public class CallBackApiServiceImpl implements CallBackApiService {
         callback = this.getCallBackInterface();
         callback.callBackMessage("Who's There");
         System.out.println("CallBackApiServiceImpl response sent");
-        return;
-
     }
 
     /**
@@ -66,8 +64,6 @@ public class CallBackApiServiceImpl implements CallBackApiService {
         System.out.println("CallBackApiServiceImpl message received: " + aString);
         callbackRef.getService().callBackMessage("Who's There");
         System.out.println("CallBackApiServiceImpl response sent");
-        return;
-
     }
 
     /**
@@ -88,8 +84,6 @@ public class CallBackApiServiceImpl implements CallBackApiService {
         System.out.println("CallBackApiServiceImpl response sent");
         callback.callBackIncrement("Who's There 3");
         System.out.println("CallBackApiServiceImpl response sent");
-        return;
-
     }
 
     /**
@@ -98,11 +92,7 @@ public class CallBackApiServiceImpl implements CallBackApiService {
      * @param aString String passed by a function call
      */
     public void noCallBack(String aString) {
-
         System.out.println("CallBackApiServiceImpl message received: " + aString);
-
-        return;
-
     }
 
     /**
diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
index 08d8afcf63..5cb87510b8 100644
--- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
@@ -44,8 +44,6 @@ public class CallBackBasicClientImpl implements CallBackBasicClient, CallBackBas
 
         // Test3 is where the target calls back multiple times to the client.
         test1c();
-
-        return;
     }
 
     private void test1a() {
@@ -73,8 +71,6 @@ public class CallBackBasicClientImpl implements CallBackBasicClient, CallBackBas
     private void test1b() {
         aCallBackService.noCallBack("No Reply Desired");
         Assert.assertEquals("CallBackBasicITest - test1b", 1, 1);
-
-        return;
     }
 
     private void test1c() {
@@ -96,7 +92,6 @@ public class CallBackBasicClientImpl implements CallBackBasicClient, CallBackBas
         }
 
         Assert.assertEquals("CallBackBasicITest - test1c", 3, this.getCallBackCount());
-        return;
     }
 
     public String getReturnMessage() {
diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
index 4ca2dc9af9..83b909ef37 100644
--- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
@@ -32,7 +32,6 @@ public class CallBackBasicServiceImpl implements CallBackBasicService {
         System.out.println("CallBackBasicServiceImpl message received: " + aString);
         callback.callBackMessage("Who's There");
         System.out.println("CallBackBasicServiceImpl response sent");
-        return;
 
     }
 
@@ -45,7 +44,6 @@ public class CallBackBasicServiceImpl implements CallBackBasicService {
         System.out.println("CallBackBasicServiceImpl response sent");
         callback.callBackIncrement("Who's There 3");
         System.out.println("CallBackBasicServiceImpl response sent");
-        return;
 
     }
 
@@ -53,7 +51,6 @@ public class CallBackBasicServiceImpl implements CallBackBasicService {
 
         System.out.println("CallBackBasicServiceImpl message received: " + aString);
         // System.out.println("CallBackBasicServiceImpl No response desired");
-        return;
 
     }
 }
diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
index 93bb65b2d1..afccce516e 100644
--- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
+++ b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
@@ -53,7 +53,6 @@ public class CallBackCTypeClientImpl implements CallBackCTypeClient, CallBackCTy
         // Test12c is where the target calls back multiple times to the client.
         test12c();
 
-        return;
     }
 
     private void test12a() {
@@ -81,7 +80,6 @@ public class CallBackCTypeClientImpl implements CallBackCTypeClient, CallBackCTy
     private void test12b() {
         aCallBackService.noCallBack("No Reply Desired");
         Assert.assertEquals("CallBackBasicITest - test12b -", 1, 1);
-        return;
     }
 
     private void test12c() {
@@ -103,7 +101,6 @@ public class CallBackCTypeClientImpl implements CallBackCTypeClient, CallBackCTy
         }
 
         Assert.assertEquals("CallBackBasicITest - test12c -", 3, this.getCallBackCount());
-        return;
     }
 
     public String getReturnMessage() {
diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
index dc31ed156b..5691b9d747 100644
--- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
+++ b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
@@ -35,7 +35,6 @@ public class CallBackCTypeServiceImpl implements CallBackCTypeService {
         System.out.println("CallBackCTypeServiceImpl message received: " + aString);
         callback.callBackMessage("Who's There");
         System.out.println("CallBackCTypeServiceImpl response sent");
-        return;
 
     }
 
@@ -48,7 +47,6 @@ public class CallBackCTypeServiceImpl implements CallBackCTypeService {
         System.out.println("CallBackCTypeServiceImpl response sent");
         callback.callBackIncrement("Who's There 3");
         System.out.println("CallBackCTypeServiceImpl response sent");
-        return;
 
     }
 
@@ -56,7 +54,6 @@ public class CallBackCTypeServiceImpl implements CallBackCTypeService {
 
         System.out.println("CallBackCTypeServiceImpl message received: " + aString);
         System.out.println("CallBackCTypeServiceImpl No response desired");
-        return;
 
     }
 }
diff --git a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
index afcccdbc02..4c57a433cd 100644
--- a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
+++ b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
@@ -52,7 +52,6 @@ public class CallBackIdClientImpl implements CallBackIdClient, CallBackIdCallBac
         // callbackID returned during callback.
         test11b();
 
-        return;
     }
 
     private void test11a() {
diff --git a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
index 8b0a4b69cf..d21767167c 100644
--- a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
+++ b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
@@ -41,7 +41,6 @@ public class CallBackIdServiceImpl implements CallBackIdService {
 
         callback.callBackMessage("Who's There");
         System.out.println("CallBackIdServiceImpl response sent");
-        return;
 
     }
 
diff --git a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
index a57416ead8..c6cc285bcc 100644
--- a/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
+++ b/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
@@ -141,7 +141,6 @@ public class CallBackSeparateThreadClientImpl implements CallBackSeparateThreadC
      */
     private void registerForFastCallback() {
         aCallBackService.registerForEvent("FAST");
-        return;
     }
 
     /**
@@ -156,7 +155,6 @@ public class CallBackSeparateThreadClientImpl implements CallBackSeparateThreadC
      */
     private void unregisterForFastCallback() {
         aCallBackService.unregisterForEvent("FAST");
-        return;
     }
 
     /**
diff --git a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
index 1a9e3ab35a..f80401836e 100644
--- a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
+++ b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
@@ -32,7 +32,6 @@ public class CallBackSetCallbackBadCallback {
         //
         System.out.println("CallBackSetCallbackBadCallback: callback called");
         Assert.fail("CallBackSetCallbackBadCallback: callback called");
-        return;
     }
 
 }
diff --git a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
index 33d69c3921..98eb44de84 100644
--- a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
+++ b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
@@ -72,8 +72,6 @@ public class CallBackSetCallbackClientImpl implements CallBackSetCallbackClient
          */
 
         test10();
-
-        return;
     }
 
     private void test4() {
diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
index cc9894fe3d..35f64d1344 100644
--- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
+++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
@@ -64,8 +64,6 @@ public class CallBackSetCallbackConvClientImpl implements CallBackSetCallbackCon
          * case.
          */
         test9();
-
-        return;
     }
 
     private void test7() {