From ce2f8a7bf5b547e21ab89059e81f9ea9566e1d7b Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 14 May 2020 11:02:06 +0200 Subject: [PATCH] DATAMONGO-2538 - Polishing. Reformat code. Convert utility classes to abstract ones. Original pull request: #861. --- .../data/mongodb/core/query/UntypedExampleMatcher.java | 1 - .../data/mongodb/repository/query/AggregationUtils.java | 3 +-- .../data/mongodb/repository/query/CollationUtils.java | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UntypedExampleMatcher.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UntypedExampleMatcher.java index e75b19406..78101570b 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UntypedExampleMatcher.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UntypedExampleMatcher.java @@ -237,7 +237,6 @@ public class UntypedExampleMatcher implements ExampleMatcher { @Override public int hashCode() { - return ObjectUtils.nullSafeHashCode(delegate); } } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AggregationUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AggregationUtils.java index 970fcbbdb..e71306c35 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AggregationUtils.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AggregationUtils.java @@ -47,12 +47,11 @@ import org.springframework.util.StringUtils; * @author Mark Paluch * @since 2.2 */ -final class AggregationUtils { +abstract class AggregationUtils { private static final ParameterBindingDocumentCodec CODEC = new ParameterBindingDocumentCodec(); private AggregationUtils() { - throw new UnsupportedOperationException("This is a utility class and cannot be instantiated"); } /** diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/CollationUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/CollationUtils.java index 7302f3056..c77c37f65 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/CollationUtils.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/CollationUtils.java @@ -37,13 +37,12 @@ import org.springframework.util.StringUtils; * @author Christoph Strobl * @since 2.2 */ -final class CollationUtils { +abstract class CollationUtils { private static final ParameterBindingDocumentCodec CODEC = new ParameterBindingDocumentCodec(); private static final Pattern PARAMETER_BINDING_PATTERN = Pattern.compile("\\?(\\d+)"); private CollationUtils() { - throw new UnsupportedOperationException("This is a utility class and cannot be instantiated"); } /**