Use instanceof instead of isAssignableFrom

Signed-off-by: Daniel Widdis <[email protected]>
opensearch-project · Jul 22, 2024 · 5bc8c4d · 5bc8c4d
1 parent 37737e7
commit 5bc8c4d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...ine-common/src/main/java/org/opensearch/search/pipeline/common/SortResponseProcessor.java b/...ine-common/src/main/java/org/opensearch/search/pipeline/common/SortResponseProcessor.java
@@ -174,10 +174,10 @@ private List<Object> getSortedValues(List<Object> values) {
 
     @SuppressWarnings("unchecked")
     private Comparable<Object> downcastToComparable(Object obj) {
-        if (obj == null) {
-            throw new IllegalArgumentException("field [" + sortField + "] contains a null value.]");
-        } else if (Comparable.class.isAssignableFrom(obj.getClass())) {
+        if (obj instanceof Comparable) {
             return (Comparable<Object>) obj;
+        } else if (obj == null) {
+            throw new IllegalArgumentException("field [" + sortField + "] contains a null value.]");
         } else {
             throw new IllegalArgumentException("field [" + sortField + "] of type [" + obj.getClass().getName() + "] is not comparable.]");
         }

diff --git a/...ne-common/src/main/java/org/opensearch/search/pipeline/common/SplitResponseProcessor.java b/...ne-common/src/main/java/org/opensearch/search/pipeline/common/SplitResponseProcessor.java
@@ -111,7 +111,7 @@ public SearchResponse processResponse(SearchRequest request, SearchResponse resp
                     throw new IllegalArgumentException("field [" + splitField + "] is null, cannot split.");
                 }
                 Object val = docField.getValue();
-                if (val == null || !String.class.isAssignableFrom(val.getClass())) {
+                if (!(val instanceof String)) {
                     throw new IllegalArgumentException("field [" + splitField + "] is not a string, cannot split");
                 }
                 Object[] strings = ((String) val).split(separator, preserveTrailing ? -1 : 0);