diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappedDocument.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappedDocument.java index df7bda92a..dee860657 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappedDocument.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappedDocument.java @@ -83,7 +83,7 @@ public class MappedDocument { return Filters.eq(ID_FIELD, document.get(ID_FIELD)); } - public MappedUpdate updateWithoutId() { + public UpdateDefinition updateWithoutId() { return new MappedUpdate(Update.fromDocument(document, ID_FIELD)); } @@ -94,7 +94,7 @@ public class MappedDocument { * @author Christoph Strobl * @since 2.2 */ - public class MappedUpdate implements UpdateDefinition { + class MappedUpdate implements UpdateDefinition { private final Update delegate; @@ -122,11 +122,11 @@ public class MappedDocument { /* * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.UpdateDefinition#incVersion(java.lang.String) + * @see org.springframework.data.mongodb.core.query.UpdateDefinition#inc(java.lang.String) */ @Override - public void incVersion(String version) { - delegate.incVersion(version); + public void inc(String version) { + delegate.inc(version); } /* diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java index 76762c197..13c2606e3 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java @@ -1386,7 +1386,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware, MappedDocument mapped = source.toMappedDocument(mongoConverter); maybeEmitEvent(new BeforeSaveEvent<>(toSave, mapped.getDocument(), collectionName)); - MappedUpdate update = mapped.updateWithoutId(); + UpdateDefinition update = mapped.updateWithoutId(); UpdateResult result = doUpdate(collectionName, query, update, toSave.getClass(), false, false); @@ -1622,7 +1622,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware, if (persistentEntity != null && persistentEntity.hasVersionProperty()) { String versionFieldName = persistentEntity.getRequiredVersionProperty().getFieldName(); if (!update.modifies(versionFieldName)) { - update.incVersion(versionFieldName); + update.inc(versionFieldName); } } } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java index 494db1151..3e32f780b 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java @@ -1674,7 +1674,7 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati if (persistentEntity != null && persistentEntity.hasVersionProperty()) { String versionFieldName = persistentEntity.getRequiredVersionProperty().getFieldName(); if (!update.modifies(versionFieldName)) { - update.incVersion(versionFieldName); + update.inc(versionFieldName); } } } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Update.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Update.java index c972105d5..a9c52ea4c 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Update.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Update.java @@ -157,10 +157,10 @@ public class Update implements UpdateDefinition { /* * (non-Javadoc) - * @see org.springframework.data.mongodb.core.query.UpdateDefinition#incVersion() + * @see org.springframework.data.mongodb.core.query.UpdateDefinition#inc() */ @Override - public void incVersion(String key) { + public void inc(String key) { inc(key, 1L); } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UpdateDefinition.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UpdateDefinition.java index 9e3240dce..7918d0d74 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UpdateDefinition.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UpdateDefinition.java @@ -21,6 +21,7 @@ import org.bson.Document; * Interface fixing must have operations for {@literal updates} as implemented via {@link Update}. * * @author Christoph Strobl + * @author Mark Paluch * @since 2.2 */ public interface UpdateDefinition { @@ -47,9 +48,9 @@ public interface UpdateDefinition { boolean modifies(String key); /** - * Bump the version of a given {@literal key} by {@code 1}. + * Increment the value of a given {@literal key} by {@code 1}. * * @param key must not be {@literal null}. */ - void incVersion(String key); + void inc(String key); }