cleanups

idegtiarenko · Dec 4, 2024 · 1979ba4 · 1979ba4
1 parent ec27e20
commit 1979ba4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 44 deletions.
diff --git a/...l-core/src/main/java/org/elasticsearch/xpack/esql/core/planner/ExpressionTranslators.java b/...l-core/src/main/java/org/elasticsearch/xpack/esql/core/planner/ExpressionTranslators.java
@@ -107,9 +107,7 @@ protected Query asQuery(Not not, TranslatorHandler handler) {
         }
 
         public static Query doTranslate(Not not, TranslatorHandler handler) {
-            Query wrappedQuery = handler.asQuery(not.field());
-            Query q = wrappedQuery.negate(not.source());
-            return q;
+            return handler.asQuery(not.field()).negate(not.source());
         }
     }
 

diff --git a/...lugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/util/CollectionUtils.java b/...lugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/util/CollectionUtils.java
@@ -30,12 +30,8 @@ public static <T> List<T> combine(List<? extends T> left, List<? extends T> righ
         }
 
         List<T> list = new ArrayList<>(left.size() + right.size());
-        if (left.isEmpty() == false) {
-            list.addAll(left);
-        }
-        if (right.isEmpty() == false) {
-            list.addAll(right);
-        }
+        list.addAll(left);
+        list.addAll(right);
         return list;
     }
 

diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/type/DataTypes.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/type/DataTypes.java
@@ -112,41 +112,21 @@ public static DataType fromEs(String name) {
     }
 
     public static DataType fromJava(Object value) {
-        if (value == null) {
-            return NULL;
-        }
-        if (value instanceof Integer) {
-            return INTEGER;
-        }
-        if (value instanceof Long) {
-            return LONG;
-        }
-        if (value instanceof BigInteger) {
-            return UNSIGNED_LONG;
-        }
-        if (value instanceof Boolean) {
-            return BOOLEAN;
-        }
-        if (value instanceof Double) {
-            return DOUBLE;
-        }
-        if (value instanceof Float) {
-            return FLOAT;
-        }
-        if (value instanceof Byte) {
-            return BYTE;
-        }
-        if (value instanceof Short) {
-            return SHORT;
-        }
-        if (value instanceof ZonedDateTime) {
-            return DATETIME;
-        }
-        if (value instanceof String || value instanceof Character) {
-            return KEYWORD;
-        }
-
-        return null;
+        return switch (value) {
+            case null -> NULL;
+            case Integer i -> INTEGER;
+            case Long l -> LONG;
+            case BigInteger bigInteger -> UNSIGNED_LONG;
+            case Boolean b -> BOOLEAN;
+            case Double v -> DOUBLE;
+            case Float v -> FLOAT;
+            case Byte b -> BYTE;
+            case Short s -> SHORT;
+            case ZonedDateTime zonedDateTime -> DATETIME;
+            case String s -> KEYWORD;
+            case Character c -> KEYWORD;
+            default -> null;
+        };
     }
 
     public static boolean isUnsupported(DataType from) {