Separate number matchers into separate classes

Author: parkertimmins

test/framework/src/main/java/org/elasticsearch/datageneration/matchers/source/FieldSpecificMatcher.java

@@ -51,13 +51,13 @@ static Map<String, FieldSpecificMatcher> matchers(
         return new HashMap<>() {
             {
                 put("keyword", new KeywordMatcher(actualMappings, actualSettings, expectedMappings, expectedSettings));
-                put("long", new NumberMatcher("long", actualMappings, actualSettings, expectedMappings, expectedSettings));
+                put("long", new LongMatcher(actualMappings, actualSettings, expectedMappings, expectedSettings));
                 put("unsigned_long", new UnsignedLongMatcher(actualMappings, actualSettings, expectedMappings, expectedSettings));
-                put("integer", new NumberMatcher("integer", actualMappings, actualSettings, expectedMappings, expectedSettings));
-                put("short", new NumberMatcher("short", actualMappings, actualSettings, expectedMappings, expectedSettings));
-                put("byte", new NumberMatcher("byte", actualMappings, actualSettings, expectedMappings, expectedSettings));
-                put("double", new NumberMatcher("double", actualMappings, actualSettings, expectedMappings, expectedSettings));
-                put("float", new NumberMatcher("float", actualMappings, actualSettings, expectedMappings, expectedSettings));
+                put("integer", new IntegerMatcher(actualMappings, actualSettings, expectedMappings, expectedSettings));
+                put("short", new ShortMatcher(actualMappings, actualSettings, expectedMappings, expectedSettings));
+                put("byte", new ByteMatcher( actualMappings, actualSettings, expectedMappings, expectedSettings));
+                put("double", new DoubleMatcher(actualMappings, actualSettings, expectedMappings, expectedSettings));
+                put("float", new FloatMatcher(actualMappings, actualSettings, expectedMappings, expectedSettings));
                 put("half_float", new HalfFloatMatcher(actualMappings, actualSettings, expectedMappings, expectedSettings));
                 put("scaled_float", new ScaledFloatMatcher(actualMappings, actualSettings, expectedMappings, expectedSettings));
                 put("counted_keyword", new CountedKeywordMatcher(actualMappings, actualSettings, expectedMappings, expectedSettings));
@@ -362,21 +362,19 @@ Object convert(Object value, Object nullValue) {
         }
     }
 
-    class NumberMatcher extends GenericMappingAwareMatcher {
+    abstract class NumberMatcher extends GenericMappingAwareMatcher {
 
-        private final FieldType fieldType;
         private final NumberFieldMapper.NumberType numberType;
 
-        NumberMatcher(
-            String fieldType,
+        private NumberMatcher(
+            FieldType fieldType,
             XContentBuilder actualMappings,
             Settings.Builder actualSettings,
             XContentBuilder expectedMappings,
             Settings.Builder expectedSettings
         ) {
-            super(fieldType, actualMappings, actualSettings, expectedMappings, expectedSettings);
-            this.fieldType = FieldType.tryParse(fieldType);
-            this.numberType = NumberFieldMapper.NumberType.valueOf(this.fieldType.name());
+            super(fieldType.toString(), actualMappings, actualSettings, expectedMappings, expectedSettings);
+            this.numberType = NumberFieldMapper.NumberType.valueOf(fieldType.name());
         }
 
         @Override
@@ -407,22 +405,75 @@ Object convert(Object value, Object nullValue) {
         // When a number mapping is coerced, the expected value will come from the above parser and will have the correct java type.
         // Whereas, if it fits, the actual value will be in an Integer or a Double. To correctly treat expected and actual values as
         // equal the actual value must be cast to the appropriate type.
-        private Object cast(Object value) {
-            if (value instanceof Integer v) {
-                return switch (fieldType) {
-                    case LONG -> v.longValue();
-                    case SHORT -> v.shortValue();
-                    case BYTE -> v.byteValue();
-                    default -> value;
-                };
-            }
-            if (value instanceof Double v) {
-                return fieldType == FieldType.FLOAT ? v.floatValue() : value;
-            }
+        abstract Object cast(Object value);
+    }
+
+    class LongMatcher extends NumberMatcher {
+        LongMatcher(XContentBuilder actualMappings, Settings.Builder actualSettings, XContentBuilder expectedMappings, Settings.Builder expectedSettings) {
+            super(FieldType.LONG, actualMappings, actualSettings, expectedMappings, expectedSettings);
+        }
+
+        @Override
+        protected Object cast(Object value) {
+            return value instanceof Integer v ? v.longValue() : value;
+        }
+    }
+
+    class IntegerMatcher extends NumberMatcher {
+        IntegerMatcher(XContentBuilder actualMappings, Settings.Builder actualSettings, XContentBuilder expectedMappings, Settings.Builder expectedSettings) {
+            super(FieldType.INTEGER, actualMappings, actualSettings, expectedMappings, expectedSettings);
+        }
+
+        @Override
+        protected Object cast(Object value) {
+            return value;
+        }
+    }
+
+    class ShortMatcher extends NumberMatcher {
+        ShortMatcher(XContentBuilder actualMappings, Settings.Builder actualSettings, XContentBuilder expectedMappings, Settings.Builder expectedSettings) {
+            super(FieldType.SHORT, actualMappings, actualSettings, expectedMappings, expectedSettings);
+        }
+
+        @Override
+        protected Object cast(Object value) {
+            return value instanceof Integer v ? v.shortValue() : value;
+        }
+    }
+
+    class ByteMatcher extends NumberMatcher {
+        ByteMatcher(XContentBuilder actualMappings, Settings.Builder actualSettings, XContentBuilder expectedMappings, Settings.Builder expectedSettings) {
+            super(FieldType.BYTE, actualMappings, actualSettings, expectedMappings, expectedSettings);
+        }
+
+        @Override
+        protected Object cast(Object value) {
+            return value instanceof Integer v ? v.byteValue() : value;
+        }
+    }
+
+    class DoubleMatcher extends NumberMatcher {
+        DoubleMatcher(XContentBuilder actualMappings, Settings.Builder actualSettings, XContentBuilder expectedMappings, Settings.Builder expectedSettings) {
+            super(FieldType.DOUBLE, actualMappings, actualSettings, expectedMappings, expectedSettings);
+        }
+
+        @Override
+        protected Object cast(Object value) {
             return value;
         }
     }
 
+    class FloatMatcher extends NumberMatcher {
+        FloatMatcher(XContentBuilder actualMappings, Settings.Builder actualSettings, XContentBuilder expectedMappings, Settings.Builder expectedSettings) {
+            super(FieldType.FLOAT, actualMappings, actualSettings, expectedMappings, expectedSettings);
+        }
+
+        @Override
+        protected Object cast(Object value) {
+            return value instanceof Integer v ? v.floatValue() : value;
+        }
+    }
+
     class BooleanMatcher extends GenericMappingAwareMatcher {
         BooleanMatcher(
             XContentBuilder actualMappings,