[phoebus] add 'in' operator for scan server scripts

Author: DenSinH

app/scan/model/src/main/java/org/csstudio/scan/command/Comparison.java

@@ -43,7 +43,13 @@ public enum Comparison
     INCREASE_BY("to increase by"),
 
     /** Value has decreased by some amount */
-    DECREASE_BY("to decrease by");
+    DECREASE_BY("to decrease by"),
+
+    /** (Discrete) value has to be included in some list (only for TextValueConditions) */
+    IN("in"),
+
+    /** (Discrete) value has to NOT be included in some list (only for TextValueConditions) */
+    NOT_IN("not in");
 
     final private String label;
 

services/scan-server/src/main/java/org/csstudio/scan/server/condition/TextValueCondition.java

@@ -16,6 +16,7 @@
 package org.csstudio.scan.server.condition;
 
 import java.time.Duration;
+import java.util.Arrays;
 import java.util.concurrent.TimeoutException;
 
 import org.csstudio.scan.command.Comparison;
@@ -119,6 +120,12 @@ public void await() throws TimeoutException, Exception
         }
     }
 
+    private boolean containsValue(String value) {
+        return Arrays.stream(desired_value.split(",")).anyMatch(
+                v -> v.strip().equals(value.strip())  // strip input value just to be sure
+        );
+    }
+
     /** Determine if the condition is currently met
      *  @return <code>true</code> if condition is met
      *  @throws Exception on error reading from the device
@@ -140,6 +147,10 @@ public boolean isConditionMet() throws Exception
             return value.compareTo(desired_value) <= 0;
         case BELOW:
             return value.compareTo(desired_value) < 0;
+        case IN:
+            return containsValue(value);
+        case NOT_IN:
+            return !containsValue(value);
         default:
             throw new Error("Condition not implemented for strings: " + comparison);
         }