Skip to content

Commit 1e49c95

Browse files
DATAMONGO-1848 - Polishing.
Prefix types with Querydsl and update visibility to allow construction of custom queries using SpringDataMongodbQuery. Reintroduce generics for JoinBuilder usage, fix warnings and nullability issues. Also add BsonValue types to simple types and use native BsonRegularExpression for regex conversion. Add tests for "in" on dbref, exception translation, any embedded, join and lifecycle events related to DATAMONGO-362, DATAMONGO-595, DATAMONGO-700, DATAMONGO-1434, DATAMONGO-1810 and DATAMONGO-2010. Original Pull Request: spring-projects#579
1 parent 7d06f2b commit 1e49c95

17 files changed

+778
-593
lines changed

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoSimpleTypes.java

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,13 @@
2222
import java.util.UUID;
2323
import java.util.regex.Pattern;
2424

25-
import org.bson.BsonObjectId;
25+
import org.bson.*;
2626
import org.bson.types.Binary;
2727
import org.bson.types.CodeWScope;
2828
import org.bson.types.CodeWithScope;
2929
import org.bson.types.Decimal128;
3030
import org.bson.types.ObjectId;
3131
import org.springframework.data.mapping.model.SimpleTypeHolder;
32-
import org.springframework.data.mongodb.util.MongoClientVersion;
33-
import org.springframework.util.ClassUtils;
3432

3533
import com.mongodb.DBRef;
3634

@@ -62,6 +60,24 @@ public abstract class MongoSimpleTypes {
6260
simpleTypes.add(Binary.class);
6361
simpleTypes.add(UUID.class);
6462
simpleTypes.add(Decimal128.class);
63+
64+
simpleTypes.add(BsonBinary.class);
65+
simpleTypes.add(BsonBoolean.class);
66+
simpleTypes.add(BsonDateTime.class);
67+
simpleTypes.add(BsonDbPointer.class);
68+
simpleTypes.add(BsonDecimal128.class);
69+
simpleTypes.add(BsonDocument.class);
70+
simpleTypes.add(BsonDocument.class);
71+
simpleTypes.add(BsonDouble.class);
72+
simpleTypes.add(BsonInt32.class);
73+
simpleTypes.add(BsonInt64.class);
74+
simpleTypes.add(BsonJavaScript.class);
75+
simpleTypes.add(BsonJavaScriptWithScope.class);
76+
simpleTypes.add(BsonObjectId.class);
77+
simpleTypes.add(BsonRegularExpression.class);
78+
simpleTypes.add(BsonString.class);
79+
simpleTypes.add(BsonTimestamp.class);
80+
6581
MONGO_SIMPLE_TYPES = Collections.unmodifiableSet(simpleTypes);
6682
}
6783

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/AbstractMongodbQuery.java

Lines changed: 0 additions & 181 deletions
This file was deleted.

0 commit comments

Comments
 (0)