Refactorings and fix handling of unsupported operations

Author: gonzalotguerrero

client-java/controller/src/main/java/org/evomaster/client/java/controller/cassandra/calculator/CassandraOperationEvaluator.java

@@ -78,7 +78,7 @@ public Truthness evaluate(CqlQueryOperation op, CassandraRow candidateRow) {
         } else if (op instanceof ContainsKeyOperation<?>) {
             return evaluateContainsKey((ContainsKeyOperation<?>) op, candidateRow);
         } else {
-            return FALSE_TRUTHNESS;
+            throw new IllegalArgumentException("Unsupported operation: " + op.getClass().getName());
         }
     }
 
@@ -168,7 +168,7 @@ private Truthness compareByType(Object rowValue, Object literalValue, Comparison
         } else if (isTemporalType(rowValue)) {
             return compareTemporal(rowValue, literalValue, comparisonType);
         } else if (isCqlDuration(rowValue)) {
-            return compareDuration(rowValue, literalValue, comparisonType);
+            return compareDuration((TemporalAmount) rowValue, literalValue, comparisonType);
         } else {
             throw new IllegalArgumentException("Unsupported row value type: " + rowValue.getClass().getName());
         }
@@ -184,33 +184,33 @@ private Truthness compareNumeric(Object rowValue, Object literalValue, Compariso
     private Truthness compareString(Object rowValue, Object literalValue, ComparisonType comparisonType) {
         if (comparisonType != ComparisonType.EQUALS) {
             throw new IllegalArgumentException("Unsupported operator for string literals: " + comparisonType);
-        } else {
-            String a = (rowValue instanceof InetAddress)
-                    ? ((InetAddress) rowValue).getHostAddress()
-                    : (String) rowValue;
-            String b = (String) literalValue;
-
-            return TruthnessUtils.getStringEqualityTruthness(a, b);
         }
+
+        String a = (rowValue instanceof InetAddress)
+                ? ((InetAddress) rowValue).getHostAddress()
+                : (String) rowValue;
+        String b = (String) literalValue;
+
+        return TruthnessUtils.getStringEqualityTruthness(a, b);
     }
 
     private Truthness compareBoolean(Object rowValue, Object literalValue, ComparisonType comparisonType) {
         if (comparisonType != ComparisonType.EQUALS) {
             throw new IllegalArgumentException("Unsupported operator for boolean literals: " + comparisonType);
-        } else {
-            double x = ((Boolean) rowValue)   ? 1.0 : 0.0;
-            double y = ((Boolean) literalValue) ? 1.0 : 0.0;
-
-            return TruthnessUtils.getEqualityTruthness(x, y);
         }
+
+        double x = ((Boolean) rowValue)   ? 1.0 : 0.0;
+        double y = ((Boolean) literalValue) ? 1.0 : 0.0;
+
+        return TruthnessUtils.getEqualityTruthness(x, y);
     }
 
     private Truthness compareUuid(Object rowValue, Object literalValue, ComparisonType comparisonType) {
         if (comparisonType != ComparisonType.EQUALS) {
             throw new IllegalArgumentException("Unsupported operator for UUID literals: " + comparisonType);
-        } else {
-            return TruthnessUtils.getEqualityTruthness((UUID) rowValue, (UUID) literalValue);
         }
+
+        return TruthnessUtils.getEqualityTruthness((UUID) rowValue, (UUID) literalValue);
     }
 
     private static boolean isTemporalType(Object rowValue) {
@@ -226,7 +226,7 @@ private Truthness compareTemporal(Object rowValue, Object literalValue, Comparis
 
             return getTruthnessForNumeric(comparisonType, x, y);
         } catch (Exception e) {
-            return FALSE_TRUTHNESS;
+            throw new IllegalArgumentException("Failed to compare temporal values: " + e.getMessage(), e);
         }
     }
 
@@ -350,23 +350,26 @@ private static boolean isCqlDuration(Object rowValue) {
         }
     }
 
-    private Truthness compareDuration(Object rowValue, Object literalValue, ComparisonType comparisonType) {
+    private Truthness compareDuration(TemporalAmount rowValue, Object literalValue, ComparisonType comparisonType) {
         if (comparisonType != ComparisonType.EQUALS) {
             throw new IllegalArgumentException("Unsupported operator for duration literals: " + comparisonType);
-        } else {
-            TemporalAmount duration = (TemporalAmount) rowValue;
-            long months = duration.get(ChronoUnit.MONTHS);
-            long days = duration.get(ChronoUnit.DAYS);
-            long nanos = duration.get(ChronoUnit.NANOS);
-
-            CqlDurationLiteral literalDurationValue = CqlDurationLiteralParser.parse((String) literalValue);
-
-            return TruthnessUtils.buildAndAggregationTruthness(
-                    TruthnessUtils.getEqualityTruthness(months, literalDurationValue.months),
-                    TruthnessUtils.getEqualityTruthness(days, literalDurationValue.days),
-                    TruthnessUtils.getEqualityTruthness(nanos, literalDurationValue.nanos)
-            );
         }
+
+        long months = rowValue.get(ChronoUnit.MONTHS);
+        long days = rowValue.get(ChronoUnit.DAYS);
+        long nanos = rowValue.get(ChronoUnit.NANOS);
+
+        CqlDurationLiteral literalDurationValue = CqlDurationLiteralParser.parse((String) literalValue);
+
+        Truthness monthsTruthness = TruthnessUtils.getEqualityTruthness(months, literalDurationValue.months);
+        Truthness daysTruthness = TruthnessUtils.getEqualityTruthness(days, literalDurationValue.days);
+        Truthness nanosTruthness = TruthnessUtils.getEqualityTruthness(nanos, literalDurationValue.nanos);
+
+        return TruthnessUtils.buildAndAggregationTruthness(
+                monthsTruthness,
+                daysTruthness,
+                nanosTruthness
+        );
     }
 
     private Truthness any(Object value, List<?> candidates) {

client-java/controller/src/main/java/org/evomaster/client/java/controller/cassandra/parser/CqlDurationLiteralParser.java

@@ -53,6 +53,8 @@ private CqlDurationLiteralParser() {}
     private static final String ISO_DURATION_PREFIX_UPPER = "P";
     private static final String ISO_DURATION_PREFIX_LOWER = "p";
     private static final String ISO_WEEK_SUFFIX = "W";
+    private static final String MINUS_SIGN = "-";
+    private static final String ISO8601_ALTERNATIVE_DATE_SEPARATOR = "-";
 
     /**
      * Matches the standard Cassandra format: an optional digit sequence followed by a unit
@@ -105,7 +107,7 @@ public static CqlDurationLiteral parse(String stringDuration) {
             if (t.isEmpty()) {
                 throw new IllegalArgumentException("Empty duration literal");
             } else {
-                boolean isNegative = t.startsWith("-");
+                boolean isNegative = t.startsWith(MINUS_SIGN);
                 String unsigned = isNegative ? t.substring(1) : t;
                 if (unsigned.isEmpty()) {
                     throw new IllegalArgumentException("Empty duration literal");
@@ -134,7 +136,7 @@ private static CqlDurationLiteral parseUnsigned(String unsigned) {
             String upper = unsigned.toUpperCase();
             if (upper.endsWith(ISO_WEEK_SUFFIX)) {
                 return parseIso8601WeekPattern(upper);
-            } else if (upper.contains("-")) {
+            } else if (upper.contains(ISO8601_ALTERNATIVE_DATE_SEPARATOR)) {
                 return parseIso8601AlternativePattern(upper);
             } else {
                 return parseIso8601Pattern(upper);