code format

aerospike · May 12, 2024 · 42324fa · 42324fa
1 parent 9ceaba3
commit 42324fa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.../java/org/springframework/data/aerospike/repository/query/AerospikeQueryCreatorUtils.java b/.../java/org/springframework/data/aerospike/repository/query/AerospikeQueryCreatorUtils.java
@@ -164,8 +164,10 @@ private static boolean typeDoesNotRequireConversion(Object obj, FilterOperation
 
     private static boolean isComparisonOperation(FilterOperation filterOperation) {
         return switch (filterOperation) {
-            case EQ, NOTEQ, LT, LTEQ, GT, GTEQ, BETWEEN: yield true;
-            default: yield false;
+            case EQ, NOTEQ, LT, LTEQ, GT, GTEQ, BETWEEN:
+                yield true;
+            default:
+                yield false;
         };
     }
 
@@ -243,8 +245,7 @@ protected static void validateTypes(MappingAerospikeConverter converter, Class<?
 
     private static boolean propertyTypeAndFirstParamAssignableToNumber(Class<?> propertyType,
                                                                        List<Object> queryParameters) {
-        return queryParameters != null
-            && queryParameters.size() > 0
+        return !queryParameters.isEmpty()
             && isAssignable(Number.class, propertyType)
             && isAssignableValue(Number.class, queryParameters.get(0));
     }

diff --git a/...main/java/org/springframework/data/aerospike/repository/query/CollectionQueryCreator.java b/...main/java/org/springframework/data/aerospike/repository/query/CollectionQueryCreator.java
@@ -92,9 +92,7 @@ private void validateCollectionQueryComparison(List<Object> queryParameters, Str
             throw new IllegalArgumentException(queryPartDescription + ": invalid argument type, expecting Collection");
         }
 
-        if (queryParameters.stream().anyMatch(param -> !(param instanceof List<?>))) {
-            throw new IllegalArgumentException(queryPartDescription + ": only Lists can be compared");
-        }
+        validateListType(queryParameters, queryPartDescription);
     }
 
     private void validateCollectionQueryBetween(List<Object> queryParameters, String queryPartDescription) {
@@ -117,6 +115,10 @@ private void validateCollectionQueryBetween(List<Object> queryParameters, String
                 "to be of the same class");
         }
 
+        validateListType(queryParameters, queryPartDescription);
+    }
+
+    private void validateListType(List<Object> queryParameters, String queryPartDescription) {
         if (queryParameters.stream().anyMatch(param -> !(param instanceof List<?>))) {
             throw new IllegalArgumentException(queryPartDescription + ": only Lists can be compared");
         }