Restoring compatibility of the ConverterIfc

ezylang · Jun 30, 2024 · e546854 · e546854
1 parent 4c4a8b6
commit e546854
Show file tree

Hide file tree

Showing 20 changed files with 65 additions and 72 deletions.
diff --git a/src/main/java/com/ezylang/evalex/data/conversion/ArrayConverter.java b/src/main/java/com/ezylang/evalex/data/conversion/ArrayConverter.java
@@ -39,7 +39,7 @@ public EvaluationValue convert(Object object, ExpressionConfiguration configurat
   }
 
   @Override
-  public boolean canConvert(Object object, ExpressionConfiguration configuration) {
+  public boolean canConvert(Object object) {
     return object instanceof List || object.getClass().isArray();
   }
 

diff --git a/src/main/java/com/ezylang/evalex/data/conversion/BinaryConverter.java b/src/main/java/com/ezylang/evalex/data/conversion/BinaryConverter.java
@@ -31,7 +31,7 @@ public EvaluationValue convert(Object object, ExpressionConfiguration configurat
   }
 
   @Override
-  public boolean canConvert(Object object, ExpressionConfiguration configuration) {
-    return configuration.isBinaryAllowed();
+  public boolean canConvert(Object object) {
+    return true;
   }
 }
diff --git a/src/main/java/com/ezylang/evalex/data/conversion/BooleanConverter.java b/src/main/java/com/ezylang/evalex/data/conversion/BooleanConverter.java
@@ -26,7 +26,7 @@ public EvaluationValue convert(Object object, ExpressionConfiguration configurat
   }
 
   @Override
-  public boolean canConvert(Object object, ExpressionConfiguration configuration) {
+  public boolean canConvert(Object object) {
     return object instanceof Boolean;
   }
 }
diff --git a/src/main/java/com/ezylang/evalex/data/conversion/ConverterIfc.java b/src/main/java/com/ezylang/evalex/data/conversion/ConverterIfc.java
@@ -34,10 +34,9 @@ public interface ConverterIfc {
    * Checks, if a given object can be converted by this converter.
    *
    * @param object The object to convert.
-   * @param configuration The current expression configuration.
    * @return <code>true</code> if the object can be converted, false otherwise.
    */
-  boolean canConvert(Object object, ExpressionConfiguration configuration);
+  boolean canConvert(Object object);
 
   default IllegalArgumentException illegalArgument(Object object) {
     return new IllegalArgumentException(

diff --git a/src/main/java/com/ezylang/evalex/data/conversion/DateTimeConverter.java b/src/main/java/com/ezylang/evalex/data/conversion/DateTimeConverter.java
@@ -89,7 +89,7 @@ private Instant parseToInstant(String value, ZoneId zoneId, DateTimeFormatter fo
   }
 
   @Override
-  public boolean canConvert(Object object, ExpressionConfiguration configuration) {
+  public boolean canConvert(Object object) {
     return (object instanceof Instant
         || object instanceof ZonedDateTime
         || object instanceof OffsetDateTime

diff --git a/src/main/java/com/ezylang/evalex/data/conversion/DefaultEvaluationValueConverter.java b/src/main/java/com/ezylang/evalex/data/conversion/DefaultEvaluationValueConverter.java
@@ -48,7 +48,6 @@
  *   <tr><td>ASTNode</td><td>ASTNode</td></tr>
  *   <tr><td>List&lt;?&gt;</td><td>ArrayConverter - each entry will be converted</td></tr>
  *   <tr><td>Map&lt?,?&gt;</td><td>StructureConverter - each entry will be converted</td></tr>
- *   <tr><td>Other types</td><td>BinaryConverter</td></tr>
  * </table>
  *
  * <i>* Be careful with conversion problems when using float or double, which are fractional
@@ -65,8 +64,7 @@ public class DefaultEvaluationValueConverter implements EvaluationValueConverter
           new DurationConverter(),
           new ExpressionNodeConverter(),
           new ArrayConverter(),
-          new StructureConverter(),
-          new BinaryConverter());
+          new StructureConverter());
 
   @Override
   public EvaluationValue convertObject(Object object, ExpressionConfiguration configuration) {
@@ -80,11 +78,15 @@ public EvaluationValue convertObject(Object object, ExpressionConfiguration conf
     }
 
     for (ConverterIfc converter : converters) {
-      if (converter.canConvert(object, configuration)) {
+      if (converter.canConvert(object)) {
         return converter.convert(object, configuration);
       }
     }
 
+    if (configuration.isBinaryAllowed()) {
+      return EvaluationValue.binaryValue(object);
+    }
+
     throw new IllegalArgumentException(
         "Unsupported data type '" + object.getClass().getName() + "'");
   }

diff --git a/src/main/java/com/ezylang/evalex/data/conversion/DurationConverter.java b/src/main/java/com/ezylang/evalex/data/conversion/DurationConverter.java
@@ -27,7 +27,7 @@ public EvaluationValue convert(Object object, ExpressionConfiguration configurat
   }
 
   @Override
-  public boolean canConvert(Object object, ExpressionConfiguration configuration) {
+  public boolean canConvert(Object object) {
     return object instanceof Duration;
   }
 }
diff --git a/src/main/java/com/ezylang/evalex/data/conversion/ExpressionNodeConverter.java b/src/main/java/com/ezylang/evalex/data/conversion/ExpressionNodeConverter.java
@@ -27,7 +27,7 @@ public EvaluationValue convert(Object object, ExpressionConfiguration configurat
   }
 
   @Override
-  public boolean canConvert(Object object, ExpressionConfiguration configuration) {
+  public boolean canConvert(Object object) {
     return object instanceof ASTNode;
   }
 }
diff --git a/src/main/java/com/ezylang/evalex/data/conversion/NumberConverter.java b/src/main/java/com/ezylang/evalex/data/conversion/NumberConverter.java
@@ -51,7 +51,7 @@ public EvaluationValue convert(Object object, ExpressionConfiguration configurat
   }
 
   @Override
-  public boolean canConvert(Object object, ExpressionConfiguration configuration) {
+  public boolean canConvert(Object object) {
     return (object instanceof BigDecimal
         || object instanceof BigInteger
         || object instanceof Double

diff --git a/src/main/java/com/ezylang/evalex/data/conversion/StringConverter.java b/src/main/java/com/ezylang/evalex/data/conversion/StringConverter.java
@@ -37,7 +37,7 @@ public EvaluationValue convert(Object object, ExpressionConfiguration configurat
   }
 
   @Override
-  public boolean canConvert(Object object, ExpressionConfiguration configuration) {
+  public boolean canConvert(Object object) {
     return (object instanceof CharSequence || object instanceof Character);
   }
 }
diff --git a/src/main/java/com/ezylang/evalex/data/conversion/StructureConverter.java b/src/main/java/com/ezylang/evalex/data/conversion/StructureConverter.java
@@ -33,7 +33,7 @@ public EvaluationValue convert(Object object, ExpressionConfiguration configurat
   }
 
   @Override
-  public boolean canConvert(Object object, ExpressionConfiguration configuration) {
+  public boolean canConvert(Object object) {
     return object instanceof Map;
   }
 }
diff --git a/src/test/java/com/ezylang/evalex/data/conversion/ArrayConverterTest.java b/src/test/java/com/ezylang/evalex/data/conversion/ArrayConverterTest.java
@@ -218,18 +218,18 @@ void testStringArray() {
 
   @Test
   void testCanConvert() {
-    assertThat(converter.canConvert(new String[] {"1", "2", "3"}, defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(Collections.EMPTY_LIST, defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(Arrays.asList(1, 2, 3), defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(new Integer[] {1, 2, 3}, defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(new int[] {1, 2, 3}, defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(new double[] {1.0, 2.0, 3.0}, defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(new boolean[] {true, false}, defaultConfiguration)).isTrue();
+    assertThat(converter.canConvert(new String[] {"1", "2", "3"})).isTrue();
+    assertThat(converter.canConvert(Collections.EMPTY_LIST)).isTrue();
+    assertThat(converter.canConvert(Arrays.asList(1, 2, 3))).isTrue();
+    assertThat(converter.canConvert(new Integer[] {1, 2, 3})).isTrue();
+    assertThat(converter.canConvert(new int[] {1, 2, 3})).isTrue();
+    assertThat(converter.canConvert(new double[] {1.0, 2.0, 3.0})).isTrue();
+    assertThat(converter.canConvert(new boolean[] {true, false})).isTrue();
   }
 
   @Test
   void testCanNotConvert() {
-    assertThat(converter.canConvert(new BigDecimal(1), defaultConfiguration)).isFalse();
+    assertThat(converter.canConvert(new BigDecimal(1))).isFalse();
   }
 
   @Test

diff --git a/src/test/java/com/ezylang/evalex/data/conversion/BinaryConverterTest.java b/src/test/java/com/ezylang/evalex/data/conversion/BinaryConverterTest.java
@@ -23,31 +23,23 @@
 
 class BinaryConverterTest {
 
-  private final ExpressionConfiguration configurationAllowed =
-      ExpressionConfiguration.builder().binaryAllowed(true).build();
-
-  private final ExpressionConfiguration configurationNotAllowed =
-      ExpressionConfiguration.builder().binaryAllowed(false).build();
+  private final ExpressionConfiguration defaultConfiguration =
+      ExpressionConfiguration.defaultConfiguration();
 
   private final BinaryConverter converter = new BinaryConverter();
 
   @Test
   void testObject() {
     Object object = new Object();
 
-    EvaluationValue converted = converter.convert(object, configurationAllowed);
+    EvaluationValue converted = converter.convert(object, defaultConfiguration);
 
     assertThat(converted.getDataType()).isEqualTo(EvaluationValue.DataType.BINARY);
     assertThat(converted.getValue()).isSameAs(object);
   }
 
   @Test
   void testCanConvert() {
-    assertThat(converter.canConvert(new Object(), configurationAllowed)).isTrue();
-  }
-
-  @Test
-  void testCanNotConvert() {
-    assertThat(converter.canConvert(new Object(), configurationNotAllowed)).isFalse();
+    assertThat(converter.canConvert(new Object())).isTrue();
   }
 }
diff --git a/src/test/java/com/ezylang/evalex/data/conversion/BooleanConverterTest.java b/src/test/java/com/ezylang/evalex/data/conversion/BooleanConverterTest.java
@@ -47,14 +47,14 @@ void testBooleanFalse() {
 
   @Test
   void testCanConvert() {
-    assertThat(converter.canConvert(true, defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(Boolean.valueOf("false"), defaultConfiguration)).isTrue();
+    assertThat(converter.canConvert(true)).isTrue();
+    assertThat(converter.canConvert(Boolean.valueOf("false"))).isTrue();
   }
 
   @Test
   void testCanNotConvert() {
-    assertThat(converter.canConvert("true", defaultConfiguration)).isFalse();
-    assertThat(converter.canConvert(new BigDecimal(1), defaultConfiguration)).isFalse();
+    assertThat(converter.canConvert("true")).isFalse();
+    assertThat(converter.canConvert(new BigDecimal(1))).isFalse();
   }
 
   @Test

diff --git a/src/test/java/com/ezylang/evalex/data/conversion/DateTimeConverterTest.java b/src/test/java/com/ezylang/evalex/data/conversion/DateTimeConverterTest.java
@@ -128,19 +128,19 @@ void testCalendar() {
 
   @Test
   void testCanConvert() {
-    assertThat(converter.canConvert(Instant.now(), defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(ZonedDateTime.now(), defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(OffsetDateTime.now(), defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(LocalDate.now(), defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(LocalDateTime.now(), defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(new Date(), defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(Calendar.getInstance(), defaultConfiguration)).isTrue();
+    assertThat(converter.canConvert(Instant.now())).isTrue();
+    assertThat(converter.canConvert(ZonedDateTime.now())).isTrue();
+    assertThat(converter.canConvert(OffsetDateTime.now())).isTrue();
+    assertThat(converter.canConvert(LocalDate.now())).isTrue();
+    assertThat(converter.canConvert(LocalDateTime.now())).isTrue();
+    assertThat(converter.canConvert(new Date())).isTrue();
+    assertThat(converter.canConvert(Calendar.getInstance())).isTrue();
   }
 
   @Test
   void testCanNotConvert() {
-    assertThat(converter.canConvert("hello", defaultConfiguration)).isFalse();
-    assertThat(converter.canConvert(new BigDecimal(1), defaultConfiguration)).isFalse();
+    assertThat(converter.canConvert("hello")).isFalse();
+    assertThat(converter.canConvert(new BigDecimal(1))).isFalse();
   }
 
   @Test

diff --git a/src/test/java/com/ezylang/evalex/data/conversion/DurationConverterTest.java b/src/test/java/com/ezylang/evalex/data/conversion/DurationConverterTest.java
@@ -42,12 +42,12 @@ void testDuration() {
 
   @Test
   void testCanConvert() {
-    assertThat(converter.canConvert(Duration.ofMinutes(10), defaultConfiguration)).isTrue();
+    assertThat(converter.canConvert(Duration.ofMinutes(10))).isTrue();
   }
 
   @Test
   void testCanNotConvert() {
-    assertThat(converter.canConvert("hello", defaultConfiguration)).isFalse();
-    assertThat(converter.canConvert(new BigDecimal(10), defaultConfiguration)).isFalse();
+    assertThat(converter.canConvert("hello")).isFalse();
+    assertThat(converter.canConvert(new BigDecimal(10))).isFalse();
   }
 }
diff --git a/src/test/java/com/ezylang/evalex/data/conversion/ExpressionNodeConverterTest.java b/src/test/java/com/ezylang/evalex/data/conversion/ExpressionNodeConverterTest.java
@@ -45,12 +45,12 @@ void testDuration() {
 
   @Test
   void testCanConvert() {
-    assertThat(converter.canConvert(testNode, defaultConfiguration)).isTrue();
+    assertThat(converter.canConvert(testNode)).isTrue();
   }
 
   @Test
   void testCanNotConvert() {
-    assertThat(converter.canConvert("hello", defaultConfiguration)).isFalse();
-    assertThat(converter.canConvert(new BigDecimal(10), defaultConfiguration)).isFalse();
+    assertThat(converter.canConvert("hello")).isFalse();
+    assertThat(converter.canConvert(new BigDecimal(10))).isFalse();
   }
 }
diff --git a/src/test/java/com/ezylang/evalex/data/conversion/NumberConverterTest.java b/src/test/java/com/ezylang/evalex/data/conversion/NumberConverterTest.java
@@ -109,20 +109,20 @@ void testByte() {
 
   @Test
   void testCanConvert() {
-    assertThat(converter.canConvert(new BigDecimal(8), defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(new BigInteger("5"), defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(Double.parseDouble("3.0"), defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(Float.parseFloat("2.0"), defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(3, defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(3L, defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(Short.parseShort("79"), defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert(Byte.parseByte("2"), defaultConfiguration)).isTrue();
+    assertThat(converter.canConvert(new BigDecimal(8))).isTrue();
+    assertThat(converter.canConvert(new BigInteger("5"))).isTrue();
+    assertThat(converter.canConvert(Double.parseDouble("3.0"))).isTrue();
+    assertThat(converter.canConvert(Float.parseFloat("2.0"))).isTrue();
+    assertThat(converter.canConvert(3)).isTrue();
+    assertThat(converter.canConvert(3L)).isTrue();
+    assertThat(converter.canConvert(Short.parseShort("79"))).isTrue();
+    assertThat(converter.canConvert(Byte.parseByte("2"))).isTrue();
   }
 
   @Test
   void testCanNotConvert() {
-    assertThat(converter.canConvert("hello", defaultConfiguration)).isFalse();
-    assertThat(converter.canConvert(true, defaultConfiguration)).isFalse();
+    assertThat(converter.canConvert("hello")).isFalse();
+    assertThat(converter.canConvert(true)).isFalse();
   }
 
   @Test

diff --git a/src/test/java/com/ezylang/evalex/data/conversion/StringConverterTest.java b/src/test/java/com/ezylang/evalex/data/conversion/StringConverterTest.java
@@ -48,14 +48,14 @@ void testCharacter() {
 
   @Test
   void testCanConvert() {
-    assertThat(converter.canConvert("Hello", defaultConfiguration)).isTrue();
-    assertThat(converter.canConvert('P', defaultConfiguration)).isTrue();
+    assertThat(converter.canConvert("Hello")).isTrue();
+    assertThat(converter.canConvert('P')).isTrue();
   }
 
   @Test
   void testCanNotConvert() {
-    assertThat(converter.canConvert(new BigDecimal(3), defaultConfiguration)).isFalse();
-    assertThat(converter.canConvert(true, defaultConfiguration)).isFalse();
+    assertThat(converter.canConvert(new BigDecimal(3))).isFalse();
+    assertThat(converter.canConvert(true)).isFalse();
   }
 
   @Test

diff --git a/src/test/java/com/ezylang/evalex/data/conversion/StructureConverterTest.java b/src/test/java/com/ezylang/evalex/data/conversion/StructureConverterTest.java
@@ -66,12 +66,12 @@ void testMapEmpty() {
 
   @Test
   void testCanConvert() {
-    assertThat(converter.canConvert(Collections.EMPTY_MAP, defaultConfiguration)).isTrue();
+    assertThat(converter.canConvert(Collections.EMPTY_MAP)).isTrue();
   }
 
   @Test
   void testCanNotConvert() {
-    assertThat(converter.canConvert(new int[] {1, 2, 3}, defaultConfiguration)).isFalse();
-    assertThat(converter.canConvert(new BigDecimal(1), defaultConfiguration)).isFalse();
+    assertThat(converter.canConvert(new int[] {1, 2, 3})).isFalse();
+    assertThat(converter.canConvert(new BigDecimal(1))).isFalse();
   }
 }