Removing dependency to apache collections

junkerm · Nov 30, 2018 · 024b096 · 024b096
1 parent 3aa8b7b
commit 024b096
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/bundles/specmate-testspecification/bnd.bnd b/bundles/specmate-testspecification/bnd.bnd
@@ -16,8 +16,7 @@
 	org.sat4j.maxsat,\
 	org.sat4j.pb,\
 	specmate-emfrest-api;version=latest,\
-	specmate-rest;version=latest,\
-	org.apache.commons.collections4
+	specmate-rest;version=latest
 Private-Package: \
 	com.specmate.testspecification.internal.services,\
 	com.specmate.testspecification.internal.testskeleton
diff --git a/...cification/src/com/specmate/testspecification/internal/services/CEGTestCaseGenerator.java b/...cification/src/com/specmate/testspecification/internal/services/CEGTestCaseGenerator.java
@@ -11,7 +11,6 @@
 import java.util.Optional;
 import java.util.Set;
 
-import org.apache.commons.collections4.map.MultiValueMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.eclipse.emf.ecore.EObject;
@@ -546,15 +545,19 @@ private void pushMutualExclusiveConstraints(GateTranslator translator) throws Co
 
 	private Collection<Collection<CEGNode>> getMutualExclusiveNodeSets() {
 		Collection<Collection<CEGNode>> result = new ArrayList<>();
-		MultiValueMap<String, CEGNode> multiMap = new MultiValueMap<String, CEGNode>();
+		Map<String, Set<CEGNode>> multiMap = new HashMap<String, Set<CEGNode>>();
 		for (IModelNode node : nodes) {
 			CEGNode cegNode = (CEGNode) node;
 			if (cegNode.getCondition().trim().startsWith("=")) {
-				multiMap.put(cegNode.getVariable(), cegNode);
+				String variable = cegNode.getVariable();
+				if(!multiMap.containsKey(variable)) {
+					multiMap.put(variable, new HashSet<CEGNode>());
+				}
+				multiMap.get(variable).add(cegNode);
 			}
 		}
 		for (String key : multiMap.keySet()) {
-			result.add(multiMap.getCollection(key));
+			result.add(multiMap.get(key));
 		}
 		return result;
 	}