moved validateGeoIpProperty to relevant class

Signed-off-by: Kenrick Yap <[email protected]>
Bit-Quill · Dec 19, 2024 · 406d2c9 · 406d2c9
1 parent e037672
commit 406d2c9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/ppl-spark-integration/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java b/ppl-spark-integration/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java
@@ -457,22 +457,14 @@ public UnresolvedExpression visitGeoIpPropertyList(OpenSearchPPLParser.GeoIpProp
         if (ctx != null) {
             for (OpenSearchPPLParser.GeoIpPropertyContext property : ctx.geoIpProperty()) {
                 String propertyName = property.getText().toUpperCase();
-                validateGeoIpProperty(propertyName);
+                GeoIpCatalystLogicalPlanTranslator.validateGeoIpProperty(propertyName);
                 properties.add(new Literal(propertyName, DataType.STRING));
             }
         }
 
         return new AttributeList(properties.build());
     }
 
-    private static void validateGeoIpProperty(String propertyName) {
-        try {
-            GeoIpCatalystLogicalPlanTranslator.GeoIpProperty.valueOf(propertyName);
-        } catch (NullPointerException | IllegalArgumentException e) {
-            throw new IllegalArgumentException("Invalid properties used.");
-        }
-    }
-
     private List<UnresolvedExpression> timestampFunctionArguments(
             OpenSearchPPLParser.TimestampFunctionCallContext ctx) {
         List<UnresolvedExpression> args =

diff --git a/...ration/src/main/java/org/opensearch/sql/ppl/utils/GeoIpCatalystLogicalPlanTranslator.java b/...ration/src/main/java/org/opensearch/sql/ppl/utils/GeoIpCatalystLogicalPlanTranslator.java
@@ -211,4 +211,12 @@ enum GeoIpProperty {
         TIME_ZONE,
         LOCATION
     }
+
+    public static void validateGeoIpProperty(String propertyName) {
+        try {
+            GeoIpProperty.valueOf(propertyName);
+        } catch (NullPointerException | IllegalArgumentException e) {
+            throw new IllegalArgumentException("Invalid properties used.");
+        }
+    }
 }