Removed redundant modifiers (such as public, final, etc) as these are not needed for interfaces

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

30 files changed, 105 insertions, 105 deletions

diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
index de17ba2f0d..11996c82d7 100644
--- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
+++ b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
@@ -28,11 +28,11 @@ public interface CallBackApiCallBack {
     /**
      * This function is defined in CallBackApiClientImpl
      */
-    public void callBackMessage(String aString);
+    void callBackMessage(String aString);
 
     /**
      * This function is defined in CallBackApiClientImpl
      */
-    public void callBackIncrement(String aString);
+    void callBackIncrement(String aString);
 
 }
diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
index 5fd4a71466..71709410b6 100644
--- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
+++ b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
@@ -25,6 +25,6 @@ public interface CallBackApiClient {
     /**
      * This function is defined in CallBackApiClientImpl
      */
-    public void run();
+    void run();
 
 }
diff --git a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
index 33de1e7739..cef9418988 100644
--- a/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
+++ b/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
@@ -30,21 +30,21 @@ public interface CallBackApiService {
     /**
      * This function is defined in CallBackApiServiceImpl
      */
-    public void knockKnock(String aString);
+    void knockKnock(String aString);
 
     /**
      * This function is defined in CallBackApiServiceImpl
      */
-    public void knockKnockByRef(String aString);
+    void knockKnockByRef(String aString);
 
     /**
      * This function is defined in CallBackApiServiceImpl
      */
-    public void noCallBack(String aString);
+    void noCallBack(String aString);
 
     /**
      * This function is defined in CallBackApiServiceImpl
      */
-    public void multiCallBack(String aString);
+    void multiCallBack(String aString);
 
 }
diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
index 5e9d3d6821..c1fb05c036 100644
--- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
@@ -26,8 +26,8 @@ import org.osoa.sca.annotations.Remotable;
  */
 public interface CallBackBasicCallBack {
 
-    public void callBackMessage(String aString);
+    void callBackMessage(String aString);
 
-    public void callBackIncrement(String aString);
+    void callBackIncrement(String aString);
 
 }
diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
index 9f4019f28c..fbda3a6d9f 100644
--- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
@@ -23,6 +23,6 @@ import org.osoa.sca.annotations.Remotable;
 @Remotable
 public interface CallBackBasicClient {
 
-    public void run();
+    void run();
 
 }
diff --git a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
index bd41fa7037..5b3bacd1a2 100644
--- a/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ b/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
@@ -28,10 +28,10 @@ import org.osoa.sca.annotations.Remotable;
  */
 public interface CallBackBasicService {
 
-    public void knockKnock(String aString);
+    void knockKnock(String aString);
 
-    public void noCallBack(String aString);
+    void noCallBack(String aString);
 
-    public void multiCallBack(String aString);
+    void multiCallBack(String aString);
 
 }
diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
index 9fddb850ba..e8ab5c8205 100644
--- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
+++ b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
@@ -26,8 +26,8 @@ import org.osoa.sca.annotations.Remotable;
  */
 public interface CallBackCTypeCallBack {
 
-    public void callBackMessage(String aString);
+    void callBackMessage(String aString);
 
-    public void callBackIncrement(String aString);
+    void callBackIncrement(String aString);
 
 }
diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
index 739983c277..9f2af0f3dc 100644
--- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
+++ b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
@@ -23,6 +23,6 @@ import org.osoa.sca.annotations.Remotable;
 @Remotable
 public interface CallBackCTypeClient {
 
-    public void run();
+    void run();
 
 }
diff --git a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
index ffbf4f35fa..d3e207de18 100644
--- a/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
+++ b/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
@@ -27,10 +27,10 @@ import org.osoa.sca.annotations.Remotable;
  */
 public interface CallBackCTypeService {
 
-    public void knockKnock(String aString);
+    void knockKnock(String aString);
 
-    public void noCallBack(String aString);
+    void noCallBack(String aString);
 
-    public void multiCallBack(String aString);
+    void multiCallBack(String aString);
 
 }
diff --git a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
index b14560a8c3..2c90dfa84d 100644
--- a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
+++ b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
@@ -26,6 +26,6 @@ import org.osoa.sca.annotations.Remotable;
  */
 public interface CallBackIdCallBack {
 
-    public void callBackMessage(String aString);
+    void callBackMessage(String aString);
 
 }
diff --git a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
index a9e551f8b4..cd1461b3c6 100644
--- a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
+++ b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
@@ -23,6 +23,6 @@ import org.osoa.sca.annotations.Remotable;
 @Remotable
 public interface CallBackIdClient {
 
-    public void run();
+    void run();
 
 }
diff --git a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
index 18c592a1c1..a0231ce458 100644
--- a/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
+++ b/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
@@ -28,6 +28,6 @@ import org.osoa.sca.annotations.Remotable;
  */
 public interface CallBackIdService {
 
-    public void knockKnock(String aString);
+    void knockKnock(String aString);
 
 }
diff --git a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
index 3b9599f53f..8012fceb98 100644
--- a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
+++ b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
@@ -27,8 +27,8 @@ import org.osoa.sca.annotations.Callback;
  */
 public interface CallBackSetCalbackService {
 
-    public void knockKnock(String aString);
+    void knockKnock(String aString);
 
-    public boolean setCallbackIllegally(String aString);
+    boolean setCallbackIllegally(String aString);
 
 }
diff --git a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
index ad0e0603a3..a15bcd90ae 100644
--- a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
+++ b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
@@ -24,8 +24,8 @@ package org.apache.tuscany.sca.test;
  */
 public interface CallBackSetCallbackCallback {
 
-    public void callBackMessage(String aString);
+    void callBackMessage(String aString);
 
-    public void callBackIncrement(String aString);
+    void callBackIncrement(String aString);
 
 }
diff --git a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
index 94cb6aa73b..1161a5bf40 100644
--- a/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
+++ b/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
@@ -23,6 +23,6 @@ import org.osoa.sca.annotations.Remotable;
 @Remotable
 public interface CallBackSetCallbackClient {
 
-    public void run();
+    void run();
 
 }
diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
index a704fd0ece..b2096b28e7 100644
--- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
+++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
@@ -27,8 +27,8 @@ import org.osoa.sca.annotations.Conversational;
  */
 public interface CallBackSetCallbackConvCallback {
 
-    public void callBackMessage(String aString);
+    void callBackMessage(String aString);
 
-    public void callBackIncrement(String aString);
+    void callBackIncrement(String aString);
 
 }
diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
index 013424bf5e..2a5fcd9bb2 100644
--- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
+++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
@@ -23,6 +23,6 @@ import org.osoa.sca.annotations.Remotable;
 @Remotable
 public interface CallBackSetCallbackConvClient {
 
-    public void run();
+    void run();
 
 }
diff --git a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
index 692b6dfc35..7a7b47d04e 100644
--- a/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
+++ b/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
@@ -29,8 +29,8 @@ import org.osoa.sca.annotations.Conversational;
  */
 public interface CallBackSetCallbackConvService {
 
-    public void knockKnock(String aString);
+    void knockKnock(String aString);
 
-    public void setCallbackIllegally(String aString);
+    void setCallbackIllegally(String aString);
 
 }
diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
index 089c2eb58c..fff6320e76 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
@@ -31,19 +31,19 @@ import org.osoa.sca.annotations.Remotable;
 @Conversational

 public interface ConversationalCallback {

 

-    public void init();

+    void init();

 

-    public void destroy();

+    void destroy();

 

-    public void initializeCount(int count);

+    void initializeCount(int count);

 

-    public void incrementCount();

+    void incrementCount();

 

-    public int retrieveCount();

+    int retrieveCount();

 

-    public void businessException() throws Exception;

+    void businessException() throws Exception;

 

     @EndsConversation

-    public String endConversation();

+    String endConversation();

 

 }

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
index d4086d63d9..d9d989c830 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
@@ -30,37 +30,37 @@ import org.osoa.sca.annotations.Remotable;
 @Remotable

 public interface ConversationalClient {

 

-    public int runConversationFromInjectedReference();

+    int runConversationFromInjectedReference();

 

-    public int runConversationFromInjectedReference2();

+    int runConversationFromInjectedReference2();

 

-    public int runConversationFromServiceReference();

+    int runConversationFromServiceReference();

 

-    public int runConversationWithUserDefinedConversationId();

+    int runConversationWithUserDefinedConversationId();

 

-    public String runConversationCheckUserDefinedConversationId();

+    String runConversationCheckUserDefinedConversationId();

 

-    public int runConversationCheckingScope();

+    int runConversationCheckingScope();

 

-    public int runConversationWithCallback();

+    int runConversationWithCallback();

 

-    public int runConversationHavingPassedReference();

+    int runConversationHavingPassedReference();

 

-    public String runConversationBusinessException();

+    String runConversationBusinessException();

 

-    public String runConversationBusinessExceptionCallback();

+    String runConversationBusinessExceptionCallback();

 

-    public int runConversationCallingEndedConversation();

+    int runConversationCallingEndedConversation();

 

-    public int runConversationCallingEndedConversationCallback();

+    int runConversationCallingEndedConversationCallback();

 

-    public String runConversationCallingEndedConversationCheckConversationId();

+    String runConversationCallingEndedConversationCheckConversationId();

 

-    public String runConversationCallingEndedConversationCallbackCheckConversationId();

+    String runConversationCallingEndedConversationCallbackCheckConversationId();

 

-    public int runConversationAgeTimeout();

+    int runConversationAgeTimeout();

 

-    public int runConversationIdleTimeout();

+    int runConversationIdleTimeout();

 

-    public int runConversationPrincipleError();

+    int runConversationPrincipleError();

 }

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
index 44a7be9a7a..3de73e4f42 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
@@ -31,6 +31,6 @@ import org.osoa.sca.annotations.Remotable;
 @Remotable

 public interface ConversationalReferenceClient {

 

-    public void incrementCount(CallableReference<ConversationalService> conversationalService);

+    void incrementCount(CallableReference<ConversationalService> conversationalService);

 

 }

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
index b24dc70a70..2aba0799bc 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
@@ -33,29 +33,29 @@ import org.osoa.sca.annotations.Remotable;
 @Callback(ConversationalCallback.class)

 public interface ConversationalService {

 

-    public void init();

+    void init();

 

-    public void destroy();

+    void destroy();

 

-    public void initializeCount(int count);

+    void initializeCount(int count);

 

-    public void incrementCount();

+    void incrementCount();

 

-    public int retrieveCount();

+    int retrieveCount();

 

-    public void businessException() throws Exception;

+    void businessException() throws Exception;

 

-    public void initializeCountCallback(int count);

+    void initializeCountCallback(int count);

 

-    public void incrementCountCallback();

+    void incrementCountCallback();

 

-    public int retrieveCountCallback();

+    int retrieveCountCallback();

 

-    public void businessExceptionCallback() throws Exception;

+    void businessExceptionCallback() throws Exception;

 

     @EndsConversation

-    public String endConversation();

+    String endConversation();

 

-    public String endConversationCallback();

+    String endConversationCallback();

 

 }

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
index 2dc3c3e604..9fb4a0b473 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
@@ -33,29 +33,29 @@ import org.osoa.sca.annotations.Remotable;
 @Callback(NonConversationalCallback.class)

 public interface ConversationalServiceNonConversationalCallback {

 

-    public void init();

+    void init();

 

-    public void destroy();

+    void destroy();

 

-    public void initializeCount(int count);

+    void initializeCount(int count);

 

-    public void incrementCount();

+    void incrementCount();

 

-    public int retrieveCount();

+    int retrieveCount();

 

-    public void businessException() throws Exception;

+    void businessException() throws Exception;

 

-    public void initializeCountCallback(int count);

+    void initializeCountCallback(int count);

 

-    public void incrementCountCallback();

+    void incrementCountCallback();

 

-    public int retrieveCountCallback();

+    int retrieveCountCallback();

 

-    public void businessExceptionCallback() throws Exception;

+    void businessExceptionCallback() throws Exception;

 

     @EndsConversation

-    public String endConversation();

+    String endConversation();

 

-    public String endConversationCallback();

+    String endConversationCallback();

 

 }

diff --git a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
index d7b2248165..d356b7d20a 100644
--- a/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ b/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
@@ -28,18 +28,18 @@ import org.osoa.sca.annotations.Remotable;
 @Remotable

 public interface NonConversationalCallback {

 

-    public void init();

+    void init();

 

-    public void destroy();

+    void destroy();

 

-    public void initializeCount(int count);

+    void initializeCount(int count);

 

-    public void incrementCount();

+    void incrementCount();

 

-    public int retrieveCount();

+    int retrieveCount();

 

-    public void businessException() throws Exception;

+    void businessException() throws Exception;

 

-    public String endConversation();

+    String endConversation();

 

 }

diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
index 5740e053a9..112aefc747 100644
--- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
+++ b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java
@@ -21,12 +21,12 @@ package org.apache.tuscany.sca.test.exceptions;
 
 public interface ExceptionHandler {
 
-    public void testing();
+    void testing();
 
-    public Checked getTheBad();
+    Checked getTheBad();
 
-    public String getTheGood();
+    String getTheGood();
 
-    public UnChecked getTheUgly();
+    UnChecked getTheUgly();
 
 }
diff --git a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
index bbf0f3c0e1..ace219991b 100644
--- a/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
+++ b/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
@@ -24,14 +24,14 @@ package org.apache.tuscany.sca.test.exceptions;
  * @version $Rev$ $Date$
  */
 public interface ExceptionThrower {
-    public static final Checked BAD = new Checked("theBad");
-    public static final UnChecked UGLY = new UnChecked("theUgly");
-    public static final String SO_THEY_SAY = "All is good that ends good.";
+    Checked BAD = new Checked("theBad");
+    UnChecked UGLY = new UnChecked("theUgly");
+    String SO_THEY_SAY = "All is good that ends good.";
 
-    public String theGood() throws Checked;
+    String theGood() throws Checked;
 
-    public String theBad() throws Checked;
+    String theBad() throws Checked;
 
-    public String theUgly() throws Checked;
+    String theUgly() throws Checked;
 
 }
diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
index 132b3ecc97..f4131593d5 100644
--- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
+++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
@@ -23,8 +23,8 @@ package org.apache.tuscany.sca.itest.interfaces;
  */
 public interface LocalCallbackInterface {
 
-    public void callbackMethod(String str);
+    void callbackMethod(String str);
 
-    public void modifyParameter(ParameterObject po);
+    void modifyParameter(ParameterObject po);
 
 }
diff --git a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
index e2b70313ed..703e1fd111 100644
--- a/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
+++ b/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java
@@ -27,7 +27,7 @@ import org.osoa.sca.annotations.Remotable;
 @Remotable
 public interface RemoteCallbackInterface {
 
-    public void callbackMethod(String str);
+    void callbackMethod(String str);
 
-    public void modifyParameter(ParameterObject po);
+    void modifyParameter(ParameterObject po);
 }
diff --git a/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
index 85b5717c00..1f589b44f4 100644
--- a/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
+++ b/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
@@ -26,7 +26,7 @@ package org.apache.tuscany.sca.test.opoverload;
 
 //@AllowsPassByReference
 public interface OverloadASourceTarget {
-    final String opName = "operationA:";
+    String opName = "operationA:";
 
     /**
      * Method with no parameters
diff --git a/java/sca/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/java/sca/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
index 028cea6304..1f98343834 100644
--- a/java/sca/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
+++ b/java/sca/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
@@ -31,8 +31,8 @@ import org.junit.Test;
 
 public class ScopeTestCase {
 
-    final static int numThreads = 4; // number of threads to drive each scope container
-    final static int iterations = 200; // number of iterations per thread
+    static final int numThreads = 4; // number of threads to drive each scope container
+    static final int iterations = 200; // number of iterations per thread
     private Node node;
 
     // Test scope containers.