Merge "Fix basic code issues in controlloop"

3 files changed, 17 insertions, 17 deletions

diff --git a/controlloop/common/actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/ActorService.java b/controlloop/common/actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/ActorService.java
index b0b7eb566..aeb536c57 100644
--- a/controlloop/common/actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/ActorService.java
+++ b/controlloop/common/actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/ActorService.java
@@ -35,7 +35,7 @@ public class ActorService {
     private static ActorService service;
 
     // USed to load actors
-    private ServiceLoader<Actor> loader;
+    private final ServiceLoader<Actor> loader;
 
     private ActorService() {
         loader = ServiceLoader.load(Actor.class);
diff --git a/controlloop/common/actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/spi/Actor.java b/controlloop/common/actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/spi/Actor.java
index 46cc6f643..47e02a5cb 100644
--- a/controlloop/common/actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/spi/Actor.java
+++ b/controlloop/common/actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/spi/Actor.java
@@ -24,12 +24,12 @@ import java.util.List;
 
 public interface Actor {
 
-    public String actor();
+    String actor();
 
-    public List<String> recipes();
+    List<String> recipes();
 
-    public List<String> recipeTargets(String recipe);
+    List<String> recipeTargets(String recipe);
 
-    public List<String> recipePayloads(String recipe);
+    List<String> recipePayloads(String recipe);
 
 }
diff --git a/controlloop/common/actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/TestActor.java b/controlloop/common/actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/TestActor.java
index 0fd00e12a..af04cc138 100644
--- a/controlloop/common/actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/TestActor.java
+++ b/controlloop/common/actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/TestActor.java
@@ -33,28 +33,28 @@ public class TestActor implements Actor {
 
     @Override
     public List<String> recipes() {
-        List<String> recipieList = new ArrayList<>();
-        recipieList.add("Dorothy");
-        recipieList.add("Wizard");
+        List<String> recipeList = new ArrayList<>();
+        recipeList.add("Dorothy");
+        recipeList.add("Wizard");
 
-        return recipieList;
+        return recipeList;
     }
 
     @Override
     public List<String> recipeTargets(String recipe) {
-        List<String> recipieTargetList = new ArrayList<>();
-        recipieTargetList.add("Wicked Witch");
-        recipieTargetList.add("Wizard of Oz");
+        List<String> recipeTargetList = new ArrayList<>();
+        recipeTargetList.add("Wicked Witch");
+        recipeTargetList.add("Wizard of Oz");
 
-        return recipieTargetList;
+        return recipeTargetList;
     }
 
     @Override
     public List<String> recipePayloads(String recipe) {
-        List<String> recipiePayloadList = new ArrayList<>();
-        recipiePayloadList.add("Dorothy");
-        recipiePayloadList.add("Toto");
+        List<String> recipePayloadList = new ArrayList<>();
+        recipePayloadList.add("Dorothy");
+        recipePayloadList.add("Toto");
 
-        return recipiePayloadList;
+        return recipePayloadList;
     }
 }