Moved FieldType to the bottom of the file

carlosdelest · Dec 11, 2023 · 4b06655 · 4b06655
1 parent c0c1125
commit 4b06655
Showing 1 changed file with 35 additions and 39 deletions.
diff --git a/...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/mapper/SemanticTextFieldMapper.java b/...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/mapper/SemanticTextFieldMapper.java
@@ -40,6 +40,40 @@ private static SemanticTextFieldMapper toType(FieldMapper in) {
         return (SemanticTextFieldMapper) in;
     }
 
+    public static final TypeParser PARSER = new TypeParser((n, c) -> new Builder(n), notInMultiFields(CONTENT_TYPE));
+
+    private final String modelId;
+
+    private SemanticTextFieldMapper(String simpleName, MappedFieldType mappedFieldType, String modelId, CopyTo copyTo) {
+        super(simpleName, mappedFieldType, MultiFields.empty(), copyTo);
+        this.modelId = modelId;
+    }
+
+    public String getModelId() {
+        return modelId;
+    }
+
+    @Override
+    public FieldMapper.Builder getMergeBuilder() {
+        return new Builder(simpleName()).init(this);
+    }
+
+    @Override
+    protected void parseCreateField(DocumentParserContext context) throws IOException {
+        // Just parses text - no indexing is performed
+        context.parser().textOrNull();
+    }
+
+    @Override
+    protected String contentType() {
+        return CONTENT_TYPE;
+    }
+
+    @Override
+    public SemanticTextFieldType fieldType() {
+        return (SemanticTextFieldType) super.fieldType();
+    }
+
     public static class Builder extends FieldMapper.Builder {
 
         private final Parameter<String> modelId = Parameter.stringParam("model_id", false, m -> toType(m).fieldType().modelId, null)
@@ -71,14 +105,11 @@ public SemanticTextFieldMapper build(MapperBuilderContext context) {
                 name(),
                 new SemanticTextFieldType(name(), modelId.getValue(), meta.getValue()),
                 modelId.getValue(),
-                copyTo,
-                this
+                copyTo
             );
         }
     }
 
-    public static final TypeParser PARSER = new TypeParser((n, c) -> new Builder(n), notInMultiFields(CONTENT_TYPE));
-
     public static class SemanticTextFieldType extends SimpleMappedFieldType implements InferenceModelFieldType {
 
         private final String modelId;
@@ -113,39 +144,4 @@ public IndexFieldData.Builder fielddataBuilder(FieldDataContext fieldDataContext
             throw new IllegalArgumentException("[semantic_text] fields do not support sorting, scripting or aggregating");
         }
     }
-
-    private final String modelId;
-
-    private final Builder builder;
-
-    private SemanticTextFieldMapper(String simpleName, MappedFieldType mappedFieldType, String modelId, CopyTo copyTo, Builder builder) {
-        super(simpleName, mappedFieldType, MultiFields.empty(), copyTo);
-        this.builder = builder;
-        this.modelId = modelId;
-    }
-
-    public String getModelId() {
-        return modelId;
-    }
-
-    @Override
-    public FieldMapper.Builder getMergeBuilder() {
-        return new Builder(simpleName()).init(this);
-    }
-
-    @Override
-    protected void parseCreateField(DocumentParserContext context) throws IOException {
-        // Just parses text - no indexing is performed
-        context.parser().textOrNull();
-    }
-
-    @Override
-    protected String contentType() {
-        return CONTENT_TYPE;
-    }
-
-    @Override
-    public SemanticTextFieldType fieldType() {
-        return (SemanticTextFieldType) super.fieldType();
-    }
 }