use common component

Author: idegtiarenko

server/src/main/java/org/elasticsearch/common/lucene/BytesRefs.java

@@ -23,8 +23,8 @@ public static String toString(Object value) {
         if (value == null) {
             return null;
         }
-        if (value instanceof BytesRef) {
-            return ((BytesRef) value).utf8ToString();
+        if (value instanceof BytesRef bytesRef) {
+            return bytesRef.utf8ToString();
         }
         return value.toString();
     }
@@ -36,8 +36,8 @@ public static BytesRef toBytesRef(Object value) {
         if (value == null) {
             return null;
         }
-        if (value instanceof BytesRef) {
-            return (BytesRef) value;
+        if (value instanceof BytesRef bytesRef) {
+            return bytesRef;
         }
         return new BytesRef(value.toString());
     }

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/Foldables.java

@@ -6,6 +6,7 @@
  */
 package org.elasticsearch.xpack.esql.core.expression;
 
+import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.xpack.esql.core.QlIllegalArgumentException;
 
 public abstract class Foldables {
@@ -16,4 +17,11 @@ public static Object valueOf(FoldContext ctx, Expression e) {
         }
         throw new QlIllegalArgumentException("Cannot determine value for {}", e);
     }
+
+    public static String stringLiteralValueOf(Expression expression, String message) {
+        if (expression instanceof Literal literal && literal.value() instanceof BytesRef bytesRef) {
+            return bytesRef.utf8ToString();
+        }
+        throw new QlIllegalArgumentException(message);
+    }
 }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/EnrichPolicyResolver.java

@@ -17,7 +17,6 @@
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.lucene.BytesRefs;
 import org.elasticsearch.common.util.CollectionUtils;
 import org.elasticsearch.common.util.Maps;
 import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
@@ -38,11 +37,8 @@
 import org.elasticsearch.xpack.core.ClientHelper;
 import org.elasticsearch.xpack.core.enrich.EnrichMetadata;
 import org.elasticsearch.xpack.core.enrich.EnrichPolicy;
-import org.elasticsearch.xpack.esql.EsqlIllegalArgumentException;
 import org.elasticsearch.xpack.esql.action.EsqlExecutionInfo;
 import org.elasticsearch.xpack.esql.analysis.EnrichResolution;
-import org.elasticsearch.xpack.esql.core.expression.Expression;
-import org.elasticsearch.xpack.esql.core.expression.Literal;
 import org.elasticsearch.xpack.esql.core.type.DataType;
 import org.elasticsearch.xpack.esql.core.type.EsField;
 import org.elasticsearch.xpack.esql.core.util.StringUtils;
@@ -63,7 +59,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static org.elasticsearch.common.logging.LoggerMessageFormat.format;
+import static org.elasticsearch.xpack.esql.core.expression.Foldables.stringLiteralValueOf;
 import static org.elasticsearch.xpack.esql.session.EsqlCCSUtils.markClusterWithFinalStateAndNoShards;
 
 /**
@@ -107,14 +103,7 @@ public EnrichPolicyResolver(
 
     public record UnresolvedPolicy(String name, Enrich.Mode mode) {
         public static UnresolvedPolicy from(Enrich e) {
-            return new UnresolvedPolicy(asString(e.policyName()), e.mode());
-        }
-
-        private static String asString(Expression expression) {
-            if (expression instanceof Literal literal) {
-                return BytesRefs.toString(literal.value());
-            }
-            throw new EsqlIllegalArgumentException(format(null, "Enrich policy must be a constant string"));
+            return new UnresolvedPolicy(stringLiteralValueOf(e.policyName(), "Enrich policy must be a constant string"), e.mode());
         }
     }