Polishing.

Replace calls to deprecated methods. Remove unsed variables. Optimize imports.

Author: rolag-it

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingDocumentCodec.java

@@ -15,12 +15,11 @@
  */
 package org.springframework.data.mongodb.util.json;
 
-import static java.util.Arrays.*;
-import static org.bson.assertions.Assertions.*;
-import static org.bson.codecs.configuration.CodecRegistries.*;
+import static java.util.Arrays.asList;
+import static org.bson.assertions.Assertions.notNull;
+import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -38,7 +37,17 @@
 import org.bson.BsonWriter;
 import org.bson.Document;
 import org.bson.Transformer;
-import org.bson.codecs.*;
+import org.bson.codecs.BsonTypeClassMap;
+import org.bson.codecs.BsonTypeCodecMap;
+import org.bson.codecs.BsonValueCodecProvider;
+import org.bson.codecs.Codec;
+import org.bson.codecs.CollectibleCodec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.DocumentCodecProvider;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.IdGenerator;
+import org.bson.codecs.ObjectIdGenerator;
+import org.bson.codecs.ValueCodecProvider;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.json.JsonParseException;
 import org.springframework.data.mapping.model.SpELExpressionEvaluator;
@@ -174,7 +183,7 @@ public Document decode(@Nullable String json, Object[] values) {
 
 	public Document decode(@Nullable String json, ParameterBindingContext bindingContext) {
 
-		if (StringUtils.isEmpty(json)) {
+		if (!StringUtils.hasText(json)) {
 			return new Document();
 		}
 
@@ -195,7 +204,7 @@ public Document decode(@Nullable String json, ParameterBindingContext bindingCon
 	public ExpressionDependencies captureExpressionDependencies(@Nullable String json, ValueProvider valueProvider,
 			ExpressionParser expressionParser) {
 
-		if (StringUtils.isEmpty(json)) {
+		if (!StringUtils.hasText(json)) {
 			return ExpressionDependencies.none();
 		}
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingJsonReader.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb.util.json;
 
-import static java.lang.String.*;
+import static java.lang.String.format;
 
 import java.text.DateFormat;
 import java.text.ParsePosition;
@@ -29,14 +29,24 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.bson.*;
+import org.bson.AbstractBsonReader;
+import org.bson.BsonBinary;
+import org.bson.BsonBinarySubType;
+import org.bson.BsonContextType;
+import org.bson.BsonDbPointer;
+import org.bson.BsonInvalidOperationException;
+import org.bson.BsonReaderMark;
+import org.bson.BsonRegularExpression;
+import org.bson.BsonTimestamp;
+import org.bson.BsonType;
+import org.bson.BsonUndefined;
+import org.bson.Document;
 import org.bson.internal.Base64;
 import org.bson.json.JsonParseException;
 import org.bson.types.Decimal128;
 import org.bson.types.MaxKey;
 import org.bson.types.MinKey;
 import org.bson.types.ObjectId;
-
 import org.springframework.data.spel.EvaluationContextProvider;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
@@ -71,7 +81,6 @@ public class ParameterBindingJsonReader extends AbstractBsonReader {
 	private final JsonScanner scanner;
 	private JsonToken pushedToken;
 	Object currentValue;
-	private Mark mark;
 
 	/**
 	 * Constructs a new instance with the given JSON string.

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/util/json/ParameterBindingJsonReaderUnitTests.java

@@ -193,7 +193,6 @@ void bindQuotedDateAsDate() {
 	@Test // DATAMONGO-2315
 	void bindStringAsDate() {
 
-		Date date = new Date();
 		Document target = parse("{ 'end_date' : { $gte : { $date : ?0 } } }", "2019-07-04T12:19:23.000Z");
 
 		assertThat(target).isEqualTo(Document.parse("{ 'end_date' : { $gte : { $date : '2019-07-04T12:19:23.000Z' } } } "));