JAVA-2325: Handle normalization field in collation document in legacy API

jyemin · jyemin · commit 8ece39503b72 · 2016-09-28T16:32:28.000-04:00
diff --git a/driver/src/main/com/mongodb/DBObjectCollationHelper.java b/driver/src/main/com/mongodb/DBObjectCollationHelper.java
@@ -16,10 +16,10 @@
 
 package com.mongodb;
 
+import com.mongodb.client.model.Collation;
 import com.mongodb.client.model.CollationAlternate;
 import com.mongodb.client.model.CollationCaseFirst;
 import com.mongodb.client.model.CollationMaxVariable;
-import com.mongodb.client.model.Collation;
 import com.mongodb.client.model.CollationStrength;
 
 final class DBObjectCollationHelper {
@@ -91,6 +91,14 @@ static Collation createCollationFromOptions(final DBObject options) {
                     builder.collationMaxVariable(CollationMaxVariable.fromString((String) maxVariable));
                 }
             }
+            if (collation.get("normalization") != null) {
+                Object normalization = collation.get("normalization");
+                if (!(normalization instanceof Boolean)) {
+                    throw new IllegalArgumentException("collation 'normalization' should be a Boolean");
+                } else {
+                    builder.normalization((Boolean) normalization);
+                }
+            }
             if (collation.get("backwards") != null) {
                 Object backwards = collation.get("backwards");
                 if (!(backwards instanceof Boolean)) {
diff --git a/driver/src/test/unit/com/mongodb/DBObjectCollationHelperSpecification.groovy b/driver/src/test/unit/com/mongodb/DBObjectCollationHelperSpecification.groovy
@@ -16,10 +16,10 @@
 
 package com.mongodb
 
+import com.mongodb.client.model.Collation
 import com.mongodb.client.model.CollationAlternate
 import com.mongodb.client.model.CollationCaseFirst
 import com.mongodb.client.model.CollationMaxVariable
-import com.mongodb.client.model.Collation
 import com.mongodb.client.model.CollationStrength
 import spock.lang.Specification
 
@@ -40,10 +40,11 @@ class DBObjectCollationHelperSpecification extends Specification {
                 .numericOrdering(true)
                 .collationAlternate(CollationAlternate.SHIFTED)
                 .collationMaxVariable(CollationMaxVariable.SPACE)
+                .normalization(true)
                 .backwards(true)
                 .build()                         | '''{locale: "en", caseLevel: true, caseFirst: "off", strength: 5,
                                                                   numericOrdering: true, alternate: "shifted",
-                                                                  maxVariable: "space", backwards: true}'''
+                                                                  maxVariable: "space", normalization: true, backwards: true}'''
     }
 
     def 'should return null if no options are set'() {
@@ -66,6 +67,7 @@ class DBObjectCollationHelperSpecification extends Specification {
                     '{ locale: "en", numericOrdering: 1}',
                     '{ locale: "en", alternate: true}',
                     '{ locale: "en", maxVariable: true}',
+                    '{ locale: "en", normalization: 1}',
                     '{ locale: "en", backwards: 1}']
     }
 }
