Merge pull request #1270 from finos/1220-duplicate-constraint-error

1220 duplicate constraint error
finos · Sep 2, 2019 · fe43491 · fe43491
2 parents 4396398 + b4c685e
commit fe43491
Show file tree

Hide file tree

Showing 2 changed files with 129 additions and 153 deletions.
diff --git a/generator/src/main/java/com/scottlogic/deg/generator/restrictions/TextualRestrictions.java b/generator/src/main/java/com/scottlogic/deg/generator/restrictions/TextualRestrictions.java
@@ -100,12 +100,7 @@ public MergeResult<StringRestrictions> intersect(StringRestrictions other){
      * @return Whether this restrictions type is contradictory
      */
     private boolean isContradictory() {
-        if (matchingRegex.isEmpty() && containingRegex.isEmpty()){
-            return false; //no regular expressions exist that can contradict
-        }
-
-        StringGenerator generator = createGenerator();
-        return generator instanceof NoStringsStringGenerator;
+        return createGenerator() instanceof NoStringsStringGenerator;
     }
 
     /**