You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by mc...@apache.org on 2008/12/08 13:17:03 UTC
svn commit: r724331 - in /tuscany/java/sca/itest:
callback-api/src/main/java/org/apache/tuscany/sca/test/
callback-basic/src/main/java/org/apache/tuscany/sca/test/
callback-complex-type/src/main/java/org/apache/tuscany/sca/test/
callback-id/src/main/ja...
Author: mcombellack
Date: Mon Dec 8 04:17:02 2008
New Revision: 724331
URL: http://svn.apache.org/viewvc?rev=724331&view=rev
Log:
Removed unnessary return statelements from methods where the last statement in the method was return
Modified:
tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
Modified: tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java?rev=724331&r1=724330&r2=724331&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java (original)
+++ tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java Mon Dec 8 04:17:02 2008
@@ -51,8 +51,6 @@
callback = this.getCallBackInterface();
callback.callBackMessage("Who's There");
System.out.println("CallBackApiServiceImpl response sent");
- return;
-
}
/**
@@ -66,8 +64,6 @@
System.out.println("CallBackApiServiceImpl message received: " + aString);
callbackRef.getService().callBackMessage("Who's There");
System.out.println("CallBackApiServiceImpl response sent");
- return;
-
}
/**
@@ -88,8 +84,6 @@
System.out.println("CallBackApiServiceImpl response sent");
callback.callBackIncrement("Who's There 3");
System.out.println("CallBackApiServiceImpl response sent");
- return;
-
}
/**
@@ -98,11 +92,7 @@
* @param aString String passed by a function call
*/
public void noCallBack(String aString) {
-
System.out.println("CallBackApiServiceImpl message received: " + aString);
-
- return;
-
}
/**
Modified: tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java?rev=724331&r1=724330&r2=724331&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java Mon Dec 8 04:17:02 2008
@@ -44,8 +44,6 @@
// Test3 is where the target calls back multiple times to the client.
test1c();
-
- return;
}
private void test1a() {
@@ -73,8 +71,6 @@
private void test1b() {
aCallBackService.noCallBack("No Reply Desired");
Assert.assertEquals("CallBackBasicITest - test1b", 1, 1);
-
- return;
}
private void test1c() {
@@ -96,7 +92,6 @@
}
Assert.assertEquals("CallBackBasicITest - test1c", 3, this.getCallBackCount());
- return;
}
public String getReturnMessage() {
Modified: tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java?rev=724331&r1=724330&r2=724331&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java (original)
+++ tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java Mon Dec 8 04:17:02 2008
@@ -32,7 +32,6 @@
System.out.println("CallBackBasicServiceImpl message received: " + aString);
callback.callBackMessage("Who's There");
System.out.println("CallBackBasicServiceImpl response sent");
- return;
}
@@ -45,7 +44,6 @@
System.out.println("CallBackBasicServiceImpl response sent");
callback.callBackIncrement("Who's There 3");
System.out.println("CallBackBasicServiceImpl response sent");
- return;
}
@@ -53,7 +51,6 @@
System.out.println("CallBackBasicServiceImpl message received: " + aString);
// System.out.println("CallBackBasicServiceImpl No response desired");
- return;
}
}
Modified: tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java?rev=724331&r1=724330&r2=724331&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java Mon Dec 8 04:17:02 2008
@@ -53,7 +53,6 @@
// Test12c is where the target calls back multiple times to the client.
test12c();
- return;
}
private void test12a() {
@@ -81,7 +80,6 @@
private void test12b() {
aCallBackService.noCallBack("No Reply Desired");
Assert.assertEquals("CallBackBasicITest - test12b -", 1, 1);
- return;
}
private void test12c() {
@@ -103,7 +101,6 @@
}
Assert.assertEquals("CallBackBasicITest - test12c -", 3, this.getCallBackCount());
- return;
}
public String getReturnMessage() {
Modified: tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java?rev=724331&r1=724330&r2=724331&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java (original)
+++ tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java Mon Dec 8 04:17:02 2008
@@ -35,7 +35,6 @@
System.out.println("CallBackCTypeServiceImpl message received: " + aString);
callback.callBackMessage("Who's There");
System.out.println("CallBackCTypeServiceImpl response sent");
- return;
}
@@ -48,7 +47,6 @@
System.out.println("CallBackCTypeServiceImpl response sent");
callback.callBackIncrement("Who's There 3");
System.out.println("CallBackCTypeServiceImpl response sent");
- return;
}
@@ -56,7 +54,6 @@
System.out.println("CallBackCTypeServiceImpl message received: " + aString);
System.out.println("CallBackCTypeServiceImpl No response desired");
- return;
}
}
Modified: tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java?rev=724331&r1=724330&r2=724331&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java Mon Dec 8 04:17:02 2008
@@ -52,7 +52,6 @@
// callbackID returned during callback.
test11b();
- return;
}
private void test11a() {
Modified: tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java?rev=724331&r1=724330&r2=724331&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java (original)
+++ tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java Mon Dec 8 04:17:02 2008
@@ -41,7 +41,6 @@
callback.callBackMessage("Who's There");
System.out.println("CallBackIdServiceImpl response sent");
- return;
}
Modified: tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java?rev=724331&r1=724330&r2=724331&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java Mon Dec 8 04:17:02 2008
@@ -141,7 +141,6 @@
*/
private void registerForFastCallback() {
aCallBackService.registerForEvent("FAST");
- return;
}
/**
@@ -156,7 +155,6 @@
*/
private void unregisterForFastCallback() {
aCallBackService.unregisterForEvent("FAST");
- return;
}
/**
Modified: tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java?rev=724331&r1=724330&r2=724331&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java (original)
+++ tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java Mon Dec 8 04:17:02 2008
@@ -32,7 +32,6 @@
//
System.out.println("CallBackSetCallbackBadCallback: callback called");
Assert.fail("CallBackSetCallbackBadCallback: callback called");
- return;
}
}
Modified: tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java?rev=724331&r1=724330&r2=724331&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java Mon Dec 8 04:17:02 2008
@@ -72,8 +72,6 @@
*/
test10();
-
- return;
}
private void test4() {
Modified: tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java?rev=724331&r1=724330&r2=724331&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java Mon Dec 8 04:17:02 2008
@@ -64,8 +64,6 @@
* case.
*/
test9();
-
- return;
}
private void test7() {