From ee3c1bc0073522500458ac7acf316d16c6183ae0 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Mon, 25 Jun 2012 12:56:07 +0200
Subject: [PATCH] DATAMONGO-467 - Fix identifier handling for Querydsl.

As we try to massage the value of the id property into an ObjectId if possible we need to do so as well when mapping the Querydsl query. Adapted SpringDataMongoDbSerializer accordingly.
---
 .../support/SpringDataMongodbSerializer.java  |  8 +++++++
 .../SpringDataMongodbSerializerUnitTests.java | 23 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java
index e2325294c..ab2961dcb 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java
@@ -19,6 +19,7 @@ import java.util.regex.Pattern;
 
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.util.Assert;
@@ -37,6 +38,7 @@ class SpringDataMongodbSerializer extends MongodbSerializer {
 
 	private final MongoConverter converter;
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+	private final QueryMapper mapper;
 
 	/**
 	 * Creates a new {@link SpringDataMongodbSerializer} for the given {@link MappingContext}.
@@ -49,6 +51,7 @@ class SpringDataMongodbSerializer extends MongodbSerializer {
 
 		this.mappingContext = converter.getMappingContext();
 		this.converter = converter;
+		this.mapper = new QueryMapper(converter);
 	}
 
 	/*
@@ -70,6 +73,11 @@ class SpringDataMongodbSerializer extends MongodbSerializer {
 	 */
 	@Override
 	protected DBObject asDBObject(String key, Object value) {
+
+		if ("_id".equals(key)) {
+			return super.asDBObject(key, mapper.convertId(value));
+		}
+
 		return super.asDBObject(key, value instanceof Pattern ? value : converter.convertToMongoType(value));
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializerUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializerUnitTests.java
index b32d6a114..ec8655077 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializerUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializerUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2011-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.springframework.data.mongodb.repository.support;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
+import org.bson.types.ObjectId;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,6 +34,8 @@ import org.springframework.data.mongodb.repository.QPerson;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
+import com.mysema.query.types.expr.BooleanOperation;
+import com.mysema.query.types.path.PathBuilder;
 import com.mysema.query.types.path.StringPath;
 
 /**
@@ -97,7 +100,25 @@ public class SpringDataMongodbSerializerUnitTests {
 		assertThat(serializer.getKeyForPath(address, address.getMetadata()), is(""));
 	}
 
+	/**
+	 * @see DATAMONGO-467
+	 */
+	@Test
+	public void convertsIdPropertyCorrectly() {
+
+		ObjectId id = new ObjectId();
+
+		PathBuilder<Address> builder = new PathBuilder<Address>(Address.class, "address");
+		StringPath idPath = builder.getString("id");
+
+		DBObject result = (DBObject) serializer.visit((BooleanOperation) idPath.eq(id.toString()), (Void) null);
+		assertThat(result.get("_id"), is(notNullValue()));
+		assertThat(result.get("_id"), is(instanceOf(ObjectId.class)));
+		assertThat(result.get("_id"), is((Object) id));
+	}
+
 	class Address {
+		String id;
 		String street;
 		@Field("zip_code")
 		String zipCode;