Add more PR review feedback

margarit-h · margarit-h · commit 17bd91d4bf5a · 2022-12-05T19:56:48.000-08:00
Signed-off-by: Margarit Hakobyan &lt;margarith@bitquilltech.com&gt;
diff --git a/core/src/main/java/org/opensearch/sql/expression/text/TextFunction.java b/core/src/main/java/org/opensearch/sql/expression/text/TextFunction.java
@@ -251,7 +251,9 @@ private DefaultFunctionResolver locate() {
    */
   private DefaultFunctionResolver position() {
     return define(BuiltinFunctionName.POSITION.getName(),
-            impl(nullMissingHandling(TextFunction::exprPosition), INTEGER, STRING, STRING));
+            impl(nullMissingHandling(
+                    (SerializableBiFunction<ExprValue, ExprValue, ExprValue>)
+                            TextFunction::exprLocate), INTEGER, STRING, STRING));
   }
 
   /**
@@ -326,10 +328,6 @@ private static ExprValue exprLocate(ExprValue subStr, ExprValue str, ExprValue p
         str.stringValue().indexOf(subStr.stringValue(), pos.integerValue() - 1) + 1);
   }
 
-  private static ExprValue exprPosition(ExprValue subStr, ExprValue str) {
-    return exprLocate(subStr, str);
-  }
-
   private static ExprValue exprReplace(ExprValue str, ExprValue from, ExprValue to) {
     return new ExprStringValue(str.stringValue().replaceAll(from.stringValue(), to.stringValue()));
   }

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,9 @@ private DefaultFunctionResolver locate() {`
`251`	`251`	`*/`
`252`	`252`	`private DefaultFunctionResolver position() {`
`253`	`253`	`return define(BuiltinFunctionName.POSITION.getName(),`
`254`		`- impl(nullMissingHandling(TextFunction::exprPosition), INTEGER, STRING, STRING));`
	`254`	`+ impl(nullMissingHandling(`
	`255`	`+ (SerializableBiFunction<ExprValue, ExprValue, ExprValue>)`
	`256`	`+ TextFunction::exprLocate), INTEGER, STRING, STRING));`
`255`	`257`	`}`
`256`	`258`
`257`	`259`	`/**`
`@@ -326,10 +328,6 @@ private static ExprValue exprLocate(ExprValue subStr, ExprValue str, ExprValue p`
`326`	`328`	`str.stringValue().indexOf(subStr.stringValue(), pos.integerValue() - 1) + 1);`
`327`	`329`	`}`
`328`	`330`
`329`		`- private static ExprValue exprPosition(ExprValue subStr, ExprValue str) {`
`330`		`- return exprLocate(subStr, str);`
`331`		`- }`
`332`		`-`
`333`	`331`	`private static ExprValue exprReplace(ExprValue str, ExprValue from, ExprValue to) {`
`334`	`332`	`return new ExprStringValue(str.stringValue().replaceAll(from.stringValue(), to.stringValue()));`
`335`	`333`	`}`