DATAMONGO-1485 - Consider potential custom conversion for enums in Querydsl paths.

We now take potential registered converters for enums into account when serializing path expressions via SpringDataMongodbSerializer.

Original pull request: #388.

Author: christophstrobl

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

@@ -26,6 +26,7 @@
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 
 import com.mongodb.DBObject;
 import com.mongodb.DBRef;
@@ -74,6 +75,20 @@ public SpringDataMongodbSerializer(MongoConverter converter) {
 		this.mapper = new QueryMapper(converter);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see com.querydsl.mongodb.MongodbSerializer#visit(com.querydsl.core.types.Constant, java.lang.Void)
+	 */
+	@Override
+	public Object visit(Constant<?> expr, Void context) {
+
+		if (!ClassUtils.isAssignable(Enum.class, expr.getType())) {
+			return super.visit(expr, context);
+		}
+
+		return converter.convertToMongoType(expr.getConstant());
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see com.mysema.query.mongodb.MongodbSerializer#getKeyForPath(com.mysema.query.types.Path, com.mysema.query.types.PathMetadata)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2014 the original author or authors.
+ * Copyright 2011-2016 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.
@@ -19,18 +19,24 @@
 import static org.junit.Assert.*;
 import static org.springframework.data.mongodb.core.DBObjectTestUtils.*;
 
+import java.util.Collections;
+
 import org.bson.types.ObjectId;
 import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.convert.WritingConverter;
+import org.springframework.data.mongodb.core.convert.CustomConversions;
 import org.springframework.data.mongodb.core.convert.DbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.repository.Person.Sex;
 import org.springframework.data.mongodb.repository.QAddress;
 import org.springframework.data.mongodb.repository.QPerson;
 
@@ -171,10 +177,52 @@ public void shouldConvertCollectionOfObjectIdEvenWhenNestedInOperatorDbObject()
 		assertThat($in, Matchers.<Object> arrayContaining(firstId, secondId));
 	}
 
+	/**
+	 * @see DATAMONGO-1485
+	 */
+	@Test
+	public void takesCustomConversionForEnumsIntoAccount() {
+
+		MongoMappingContext context = new MongoMappingContext();
+
+		MappingMongoConverter converter = new MappingMongoConverter(dbFactory, context);
+		converter.setCustomConversions(new CustomConversions(Collections.singletonList(new SexTypeWriteConverter())));
+		converter.afterPropertiesSet();
+
+		this.converter = converter;
+		this.serializer = new SpringDataMongodbSerializer(this.converter);
+
+		Object mappedPredicate = this.serializer.handle(QPerson.person.sex.eq(Sex.FEMALE));
+
+		assertThat(mappedPredicate, is(instanceOf(DBObject.class)));
+		assertThat(((DBObject) mappedPredicate).get("sex"), is((Object) "f"));
+	}
+
 	class Address {
 		String id;
 		String street;
 		@Field("zip_code") String zipCode;
 		@Field("bar") String[] foo;
 	}
+
+	@WritingConverter
+	public class SexTypeWriteConverter implements Converter<Sex, String> {
+
+		@Override
+		public String convert(Sex source) {
+
+			if (source == null) {
+				return null;
+			}
+
+			switch (source) {
+				case MALE:
+					return "m";
+				case FEMALE:
+					return "f";
+				default:
+					throw new IllegalArgumentException("o_O");
+			}
+		}
+	}
 }