feat(spgroup#31): resolve PR comments.

barbosamaatheus · Aug 2, 2021 · febb6e5 · febb6e5
1 parent 229683f
commit febb6e5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 23 deletions.
diff --git a/src/test/java/br/unc/cic/analysis/test/DefinitionFactory.java b/src/test/java/br/unc/cic/analysis/test/DefinitionFactory.java
@@ -15,30 +15,22 @@ public static AbstractMergeConflictDefinition definition(String className, int s
     }
 
     public static AbstractMergeConflictDefinition definition(String className, int sourceLines[], int sinkLines[], boolean recursive) {
-        return new AbstractMergeConflictDefinition(recursive) {
-            @Override
-            protected Map<String, List<Integer>> sourceDefinitions() {
-                Map<String, List<Integer>> res = new HashMap<>();
-                List<Integer> lines = Arrays.stream(sourceLines).boxed().collect(Collectors.toList());
-                res.put(className, lines);
-                return res;
-            }
+        return definition(Arrays.asList(new MarkingClass(className, sourceLines, sinkLines)), recursive);
+    };
 
-            @Override
-            protected Map<String, List<Integer>> sinkDefinitions() {
-                Map<String, List<Integer>> res = new HashMap<>();
-                List<Integer> lines = Arrays.stream(sinkLines).boxed().collect(Collectors.toList());
-                res.put(className, lines);
-                return res;
-            }
-        };
-    }
-    public static AbstractMergeConflictDefinition definition(List<Marking> markings) {
-        return new AbstractMergeConflictDefinition(false) {
+    /**
+     *
+     * @param markingClassList It is a list of tags. Each tag as lines marked as source and as lines marked as sink
+     *                         and the name of the class where the lines were marked.
+     * @param recursive Indicates whether the loading of statements will be done recursively or not.
+     * @return
+     */
+    public static AbstractMergeConflictDefinition definition(List<MarkingClass> markingClassList, boolean recursive) {
+        return new AbstractMergeConflictDefinition(recursive) {
             @Override
             protected Map<String, List<Integer>> sourceDefinitions() {
                 Map<String, List<Integer>> res = new HashMap<>();
-                for(Marking m: markings){
+                for(MarkingClass m: markingClassList){
                     List<Integer> lines = Arrays.stream(m.getSourceLines()).boxed().collect(Collectors.toList());
                     res.put(m.getClassName(), lines);
                 }
@@ -48,7 +40,7 @@ protected Map<String, List<Integer>> sourceDefinitions() {
             @Override
             protected Map<String, List<Integer>> sinkDefinitions() {
                 Map<String, List<Integer>> res = new HashMap<>();
-                for(Marking m: markings) {
+                for(MarkingClass m: markingClassList) {
                     List<Integer> lines = Arrays.stream(m.getSinkLines()).boxed().collect(Collectors.toList());
                     res.put(m.getClassName(), lines);
                 }

diff --git a/...ava/br/unc/cic/analysis/test/Marking.java → ...r/unc/cic/analysis/test/MarkingClass.java b/...ava/br/unc/cic/analysis/test/Marking.java → ...r/unc/cic/analysis/test/MarkingClass.java
@@ -1,11 +1,11 @@
 package br.unc.cic.analysis.test;
 
-public class Marking {
+public class MarkingClass {
     String className;
     int sourceLines[];
     int sinkLines[];
 
-    public Marking(String className, int[] sourceLines, int[] sinkLines) {
+    public MarkingClass(String className, int[] sourceLines, int[] sinkLines) {
         this.className = className;
         this.sourceLines = sourceLines;
         this.sinkLines = sinkLines;