Skip to content

Commit 53ba6f5

Browse files
mp911dechristophstrobl
authored andcommitted
DATAMONGO-1404 - Polishing.
Add author and since tags. Update license headers. Reformat code. Replace FQCN with import and simple class name. Remove final keyword in test methods. Add tests for numeric values. Update documentation. Original pull request: #353.
1 parent c8df0d6 commit 53ba6f5

File tree

2 files changed

+1
-9
lines changed
  • spring-data-mongodb/src

2 files changed

+1
-9
lines changed

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Update.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.util.Arrays;
2121
import java.util.Collection;
2222
import java.util.Collections;
23-
import java.util.Date;
2423
import java.util.HashSet;
2524
import java.util.LinkedHashMap;
2625
import java.util.List;
@@ -69,13 +68,8 @@ public static Update update(String key, Object value) {
6968
* {@literal $set}. This means fields not given in the {@link Document} will be nulled when executing the update. To
7069
* create an only-updating {@link Update} instance of a {@link Document}, call {@link #set(String, Object)} for each
7170
* value in it.
72-
<<<<<<< HEAD
7371
*
7472
* @param object the source {@link Document} to create the update from.
75-
=======
76-
*
77-
* @param object the source {@link DBObject} to create the update from.
78-
>>>>>>> d610761... DATAMONGO-1404 - Polishing.
7973
* @param exclude the fields to exclude.
8074
* @return
8175
*/

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/UpdateTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -552,9 +552,7 @@ public void shouldSuppressPreviousValueForMin() {
552552
Update update = new Update().min("key", 10);
553553
update.min("key", 99);
554554

555-
update.max("key", 99);
556-
557-
assertThat(update.getUpdateObject(), equalTo(new Document().append("$min9", new Document("key", 99))));
555+
assertThat(update.getUpdateObject(), equalTo(new Document().append("$min", new Document("key", 99))));
558556
}
559557

560558
/**

0 commit comments

Comments
 (0)