mindol1004/spring-data-mongodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DATAMONGO-1394 - Polishing.

Browse Source 
Some internal refactorings to avoid deeply nested if-clauses.

Original pull request: #373.
This commit is contained in:
Oliver Gierke
2016-07-27 10:52:54 +02:00
parent c14c42fb0c
commit 9a385599af
2 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java
View File

@@ -130,23 +130,29 @@ class SpringDataMongodbSerializer extends MongodbSerializer {
return converter.toDBRef(constant, getPropertyForPotentialDbRef(path));
}
/*
* (non-Javadoc)
* @see com.querydsl.mongodb.MongodbSerializer#asDBKey(com.querydsl.core.types.Operation, int)
*/
@Override
protected String asDBKey(Operation<?> expr, int index) {
Expression<?> arg = expr.getArg(index);
if (arg instanceof Path) {
Path<?> path = (Path<?>) arg;
if (isReference(path)) {
MongoPersistentProperty property = getPropertyFor(path);
if (property.isIdProperty()) {
return super.asDBKey(expr, index).replaceAll("." + ID_KEY + "$", "");
}
}
String key = super.asDBKey(expr, index);
if (!(arg instanceof Path)) {
return key;
}
return super.asDBKey(expr, index);
Path<?> path = (Path<?>) arg;
if (!isReference(path)) {
return key;
}
MongoPersistentProperty property = getPropertyFor(path);
return property.isIdProperty() ? key.replaceAll("." + ID_KEY + "$", "") : key;
}
/*
@@ -155,18 +161,14 @@ class SpringDataMongodbSerializer extends MongodbSerializer {
*/
protected Object convert(Path<?> path, Constant<?> constant) {
if (isReference(path)) {
MongoPersistentProperty property = getPropertyFor(path);
if (property.isIdProperty()) {
return asReference(constant.getConstant(), path.getMetadata().getParent());
}
return asReference(constant.getConstant(), path);
if (!isReference(path)) {
return super.convert(path, constant);
}
return super.convert(path, constant);
MongoPersistentProperty property = getPropertyFor(path);
return property.isIdProperty() ? asReference(constant.getConstant(), path.getMetadata().getParent())
: asReference(constant.getConstant(), path);
}
private MongoPersistentProperty getPropertyFor(Path<?> path) {
@@ -196,10 +198,12 @@ class SpringDataMongodbSerializer extends MongodbSerializer {
}
MongoPersistentProperty property = getPropertyFor(path);
if (property != null && property.isIdProperty() && path.getMetadata() != null
&& path.getMetadata().getParent() != null) {
return getPropertyFor(path.getMetadata().getParent());
PathMetadata metadata = path.getMetadata();
if (property != null && property.isIdProperty() && metadata != null && metadata.getParent() != null) {
return getPropertyFor(metadata.getParent());
}
return property;
}
}

1
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/QuerydslRepositorySupportTests.java
View File

@@ -103,5 +103,4 @@ public class QuerydslRepositorySupportTests {
assertThat(queryUsingIdField.fetchOne(), equalTo(person));
assertThat(queryUsingIdField.fetchOne(), equalTo(queryUsingRefObject.fetchOne()));
}
}