From a819a5e9e4bf56604c098ff5c8344b96df125c3d Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 16 May 2024 09:07:37 +0200 Subject: [PATCH] Polishing. Add missing Override annotations. Remove superfluous final keywords. Original Pull Request: #4699 --- .../mongodb/core/DefaultIndexOperations.java | 18 ++++++++++++------ .../core/DefaultReactiveIndexOperations.java | 13 +++++++++---- .../mongodb/core/DefaultScriptOperations.java | 4 ++-- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java index ebac398e26..afe48b7516 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java @@ -20,6 +20,7 @@ import java.util.List; import org.bson.Document; + import org.springframework.dao.DataAccessException; import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.UncategorizedMongoDbException; @@ -54,7 +55,7 @@ public class DefaultIndexOperations implements IndexOperations { private final QueryMapper mapper; private final @Nullable Class type; - private MongoOperations mongoOperations; + private final MongoOperations mongoOperations; /** * Creates a new {@link DefaultIndexOperations}. @@ -114,7 +115,7 @@ public DefaultIndexOperations(MongoOperations mongoOperations, String collection this.type = type; } - public String ensureIndex(final IndexDefinition indexDefinition) { + public String ensureIndex(IndexDefinition indexDefinition) { return execute(collection -> { @@ -148,7 +149,8 @@ private MongoPersistentEntity lookupPersistentEntity(@Nullable Class entit return null; } - public void dropIndex(final String name) { + @Override + public void dropIndex(String name) { execute(collection -> { collection.dropIndex(name); @@ -166,15 +168,18 @@ public void alterIndex(String name, org.springframework.data.mongodb.core.index. Document result = mongoOperations .execute(db -> db.runCommand(new Document("collMod", collectionName).append("index", indexOptions))); - if(NumberUtils.convertNumberToTargetClass(result.get("ok", (Number) 0), Integer.class) != 1) { - throw new UncategorizedMongoDbException("Index '%s' could not be modified. Response was %s".formatted(name, result.toJson()), null); + if (NumberUtils.convertNumberToTargetClass(result.get("ok", (Number) 0), Integer.class) != 1) { + throw new UncategorizedMongoDbException( + "Index '%s' could not be modified. Response was %s".formatted(name, result.toJson()), null); } } + @Override public void dropAllIndexes() { dropIndex("*"); } + @Override public List getIndexInfo() { return execute(new CollectionCallback>() { @@ -223,7 +228,8 @@ private IndexOptions addPartialFilterIfPresent(IndexOptions ops, Document source mapper.getMappedSort((Document) sourceOptions.get(PARTIAL_FILTER_EXPRESSION_KEY), entity)); } - private static IndexOptions addDefaultCollationIfRequired(IndexOptions ops, MongoPersistentEntity entity) { + private static IndexOptions addDefaultCollationIfRequired(IndexOptions ops, + @Nullable MongoPersistentEntity entity) { if (ops.getCollation() != null || entity == null || !entity.hasCollation()) { return ops; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperations.java index 5776619399..c85aa0b88b 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperations.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperations.java @@ -115,8 +115,9 @@ public Mono alterIndex(String name, org.springframework.data.mongodb.core. return Flux.from(db.runCommand(new Document("collMod", collectionName).append("index", indexOptions))) .doOnNext(result -> { - if(NumberUtils.convertNumberToTargetClass(result.get("ok", (Number) 0), Integer.class) != 1) { - throw new UncategorizedMongoDbException("Index '%s' could not be modified. Response was %s".formatted(name, result.toJson()), null); + if (NumberUtils.convertNumberToTargetClass(result.get("ok", (Number) 0), Integer.class) != 1) { + throw new UncategorizedMongoDbException( + "Index '%s' could not be modified. Response was %s".formatted(name, result.toJson()), null); } }); }).then(); @@ -133,14 +134,17 @@ private MongoPersistentEntity lookupPersistentEntity(String collection) { .orElse(null); } - public Mono dropIndex(final String name) { + @Override + public Mono dropIndex(String name) { return mongoOperations.execute(collectionName, collection -> collection.dropIndex(name)).then(); } + @Override public Mono dropAllIndexes() { return dropIndex("*"); } + @Override public Flux getIndexInfo() { return mongoOperations.execute(collectionName, collection -> collection.listIndexes(Document.class)) // @@ -159,7 +163,8 @@ private IndexOptions addPartialFilterIfPresent(IndexOptions ops, Document source queryMapper.getMappedObject((Document) sourceOptions.get(PARTIAL_FILTER_EXPRESSION_KEY), entity)); } - private static IndexOptions addDefaultCollationIfRequired(IndexOptions ops, MongoPersistentEntity entity) { + private static IndexOptions addDefaultCollationIfRequired(IndexOptions ops, + @Nullable MongoPersistentEntity entity) { if (ops.getCollation() != null || entity == null || !entity.hasCollation()) { return ops; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultScriptOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultScriptOperations.java index 127a127436..2fadefdaed 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultScriptOperations.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultScriptOperations.java @@ -85,7 +85,7 @@ public NamedMongoScript register(NamedMongoScript script) { } @Override - public Object execute(final ExecutableMongoScript script, final Object... args) { + public Object execute(ExecutableMongoScript script, Object... args) { Assert.notNull(script, "Script must not be null"); @@ -104,7 +104,7 @@ public Object doInDB(MongoDatabase db) throws MongoException, DataAccessExceptio } @Override - public Object call(final String scriptName, final Object... args) { + public Object call(String scriptName, Object... args) { Assert.hasText(scriptName, "ScriptName must not be null or empty");