Skip to content

Commit 8cc4ef3

Browse files
mp911deodrotbohm
authored andcommitted
DATAMONGO-1992 - Adapt existing tests to immutable object.
Turn immutable id properties to a mutable one to adapt with removed mutation support for final fields.
1 parent 1e49c95 commit 8cc4ef3

File tree

7 files changed

+19
-24
lines changed

7 files changed

+19
-24
lines changed

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

+6-13
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import java.lang.reflect.InvocationTargetException;
3535
import java.math.BigDecimal;
3636
import java.math.BigInteger;
37+
import java.time.Instant;
3738
import java.util.*;
3839
import java.util.stream.Collectors;
3940
import java.util.stream.IntStream;
@@ -85,7 +86,6 @@
8586
import org.springframework.data.mongodb.core.query.Update;
8687
import org.springframework.data.mongodb.test.util.MongoVersion;
8788
import org.springframework.data.mongodb.test.util.MongoVersionRule;
88-
import org.springframework.data.mongodb.util.MongoClientVersion;
8989
import org.springframework.data.util.CloseableIterator;
9090
import org.springframework.test.annotation.DirtiesContext;
9191
import org.springframework.test.context.ContextConfiguration;
@@ -3658,26 +3658,19 @@ static class DocumentWithDBRefCollection {
36583658
}
36593659

36603660
@Data
3661+
@AllArgsConstructor
36613662
static class DocumentWithLazyDBRefsAndConstructorCreation {
36623663

3663-
@Id public final String id;
3664-
3665-
public DocumentWithLazyDBRefsAndConstructorCreation(String id, Sample lazyDbRefProperty,
3666-
List<Sample> lazyDbRefAnnotatedList, Map<String, Sample> lazyDbRefAnnotatedMap) {
3667-
this.id = id;
3668-
this.lazyDbRefProperty = lazyDbRefProperty;
3669-
this.lazyDbRefAnnotatedList = lazyDbRefAnnotatedList;
3670-
this.lazyDbRefAnnotatedMap = lazyDbRefAnnotatedMap;
3671-
}
3664+
@Id public String id;
36723665

36733666
@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) //
3674-
public final Sample lazyDbRefProperty;
3667+
public Sample lazyDbRefProperty;
36753668

36763669
@Field("lazy_db_ref_list") @org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) //
3677-
public final List<Sample> lazyDbRefAnnotatedList;
3670+
public List<Sample> lazyDbRefAnnotatedList;
36783671

36793672
@Field("lazy_db_ref_map") @org.springframework.data.mongodb.core.mapping.DBRef(
3680-
lazy = true) public final Map<String, Sample> lazyDbRefAnnotatedMap;
3673+
lazy = true) public Map<String, Sample> lazyDbRefAnnotatedMap;
36813674
}
36823675

36833676
@EqualsAndHashCode

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
public class Person {
2121

22-
private final ObjectId id;
22+
private ObjectId id;
2323

2424
private String firstName;
2525

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/LineItem.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
*/
2121
public class LineItem {
2222

23-
final String id;
23+
String id;
2424

25-
final String caption;
25+
String caption;
2626

27-
final double price;
27+
double price;
2828

2929
int quantity = 1;
3030

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2079,7 +2079,7 @@ static class ThrowableWrapper {
20792079
@Document
20802080
static class PrimitiveContainer {
20812081

2082-
@Field("property") private final int m_property;
2082+
@Field("property") private int m_property;
20832083

20842084
@PersistenceConstructor
20852085
public PrimitiveContainer(@Value("#root.property") int a_property) {
@@ -2094,7 +2094,7 @@ public int property() {
20942094
@Document
20952095
static class ObjectContainer {
20962096

2097-
@Field("property") private final PrimitiveContainer m_property;
2097+
@Field("property") private PrimitiveContainer m_property;
20982098

20992099
@PersistenceConstructor
21002100
public ObjectContainer(@Value("#root.property") PrimitiveContainer a_property) {

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MappingTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ public void shouldMapFieldsOfIterableEntity() {
519519

520520
static class Container {
521521

522-
@Id final String id;
522+
@Id String id;
523523

524524
public Container() {
525525
id = new ObjectId().toString();
@@ -535,7 +535,7 @@ public Container(String id) {
535535

536536
static class Item {
537537

538-
@Id final String id;
538+
@Id String id;
539539
String value;
540540

541541
public Item() {

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ApplicationContextEventTests.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.springframework.data.mongodb.core.query.Criteria.*;
2121
import static org.springframework.data.mongodb.core.query.Query.*;
2222

23+
import lombok.AllArgsConstructor;
2324
import lombok.Data;
2425

2526
import java.util.Arrays;
@@ -441,10 +442,11 @@ public static class Root {
441442
}
442443

443444
@Data
445+
@AllArgsConstructor
444446
@org.springframework.data.mongodb.core.mapping.Document
445447
public static class Related {
446448

447-
final @Id Long id;
448-
final String description;
449+
@Id Long id;
450+
String description;
449451
}
450452
}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Contact.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
public abstract class Contact {
2929

3030
@Id
31-
protected final String id;
31+
protected String id;
3232

3333
public Contact() {
3434
this.id = new ObjectId().toString();

0 commit comments

Comments
 (0)