LdapFieldNameTranslator#translateAttributeName now returns a Path

dcrissman · dcrissman · commit 459ff20128ad · 2015-01-28T08:31:20.000-05:00
diff --git a/lightblue-ldap-common/src/main/java/com/redhat/lightblue/common/ldap/LdapFieldNameTranslator.java b/lightblue-ldap-common/src/main/java/com/redhat/lightblue/common/ldap/LdapFieldNameTranslator.java
@@ -39,6 +39,6 @@ public interface LdapFieldNameTranslator {
      * @param attributeName - ldap attribute name
      * @return metadata fieldName or the attributeName back at you if no mapping is present.
      */
-    public String translateAttributeName(String attributeName);
+    public Path translateAttributeName(String attributeName);
 
 }
diff --git a/lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/LdapCRUDController.java b/lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/LdapCRUDController.java
@@ -125,12 +125,10 @@ public CRUDInsertionResponse insert(CRUDOperationContext ctx,
                 }
             }
 
-            JsonNode rootNode = document.getRoot();
-
-            String uniqueFieldName = fieldNameTranslator.translateAttributeName(store.getUniqueAttribute());
-            JsonNode uniqueNode = rootNode.get(uniqueFieldName);
+            Path uniqueFieldPath = fieldNameTranslator.translateAttributeName(store.getUniqueAttribute());
+            JsonNode uniqueNode = document.get(uniqueFieldPath);
             if(uniqueNode == null){
-                throw new IllegalArgumentException(uniqueFieldName + " is a required field");
+                throw new IllegalArgumentException(store.getUniqueAttribute() + " is a required field");
             }
 
             String dn = createDN(store, uniqueNode.asText());
@@ -281,18 +279,18 @@ public void beforeUpdateEntityInfo(Metadata m, EntityInfo ei, boolean newEntity)
              */
             @Override
             public void beforeCreateNewSchema(Metadata m, EntityMetadata md) {
-                LdapFieldNameTranslator property = getLdapFieldNameTranslator(md);
+                LdapFieldNameTranslator ldapNameTranslator = getLdapFieldNameTranslator(md);
 
                 Fields fields = md.getEntitySchema().getFields();
-                String dnFieldName = property.translateAttributeName(LdapConstant.ATTRIBUTE_DN);
-                if(!fields.has(dnFieldName)){
-                    fields.addNew(new SimpleField(dnFieldName, StringType.TYPE));
+                Path dnFieldPath = ldapNameTranslator.translateAttributeName(LdapConstant.ATTRIBUTE_DN);
+                if(!fields.has(dnFieldPath.toString())){
+                    fields.addNew(new SimpleField(dnFieldPath.toString(), StringType.TYPE));
                 }
 
-                String objectClassFieldName = property.translateAttributeName(LdapConstant.ATTRIBUTE_OBJECT_CLASS);
-                if(!fields.has(objectClassFieldName)){
-                    fields.addNew(new ArrayField(objectClassFieldName, new SimpleArrayElement(StringType.TYPE)));
-                    fields.addNew(new SimpleField(LightblueUtil.createArrayCountFieldName(objectClassFieldName), IntegerType.TYPE));
+                Path objectClassFieldPath = ldapNameTranslator.translateAttributeName(LdapConstant.ATTRIBUTE_OBJECT_CLASS);
+                if(!fields.has(objectClassFieldPath.toString())){
+                    fields.addNew(new ArrayField(objectClassFieldPath.toString(), new SimpleArrayElement(StringType.TYPE)));
+                    fields.addNew(new SimpleField(LightblueUtil.createArrayCountFieldName(objectClassFieldPath.toString()), IntegerType.TYPE));
                 }
             }
 
@@ -435,7 +433,7 @@ private void projectChanges(Projection projection, CRUDOperationContext ctx, Map
                         ),
                         md);
 
-        String dnFieldName = fieldNameTranslator.translateAttributeName(LdapConstant.ATTRIBUTE_DN);
+        Path dnFieldPath = fieldNameTranslator.translateAttributeName(LdapConstant.ATTRIBUTE_DN);
 
         for(Entry<DocCtx, String> insertedDn : documentToDnMap.entrySet()){
             DocCtx document = insertedDn.getKey();
@@ -445,7 +443,7 @@ private void projectChanges(Projection projection, CRUDOperationContext ctx, Map
             // If only dn is in the projection, then no need to query LDAP.
             if((requiredAttributeNames.size() == 1) && requiredAttributeNames.contains(LdapConstant.ATTRIBUTE_DN)){
                 ObjectNode node = factory.objectNode();
-                node.set(dnFieldName, StringType.TYPE.toJson(factory, dn));
+                node.set(dnFieldPath.toString(), StringType.TYPE.toJson(factory, dn));
                 projectionResponseJson = new DocCtx(new JsonDoc(node));
             }
             //TODO: else fetch entity from LDAP and project results.
diff --git a/lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/model/TrivialLdapFieldNameTranslator.java b/lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/model/TrivialLdapFieldNameTranslator.java
@@ -35,8 +35,8 @@ public String translateFieldName(Path path) {
     }
 
     @Override
-    public String translateAttributeName(String attributeName) {
-        return attributeName;
+    public Path translateAttributeName(String attributeName) {
+        return new Path(attributeName);
     }
 
 }
diff --git a/lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/translator/ResultTranslator.java b/lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/translator/ResultTranslator.java
@@ -57,13 +57,13 @@ public class ResultTranslator {
     private final JsonNodeFactory factory;
     private final EntityMetadata md;
     private final LdapFieldNameTranslator fieldNameTranslator;
-    private final String fieldNameDN;
+    private final Path dnPath;
 
     public ResultTranslator(JsonNodeFactory factory, EntityMetadata md, LdapFieldNameTranslator fieldNameTranslator){
         this.factory = factory;
         this.md = md;
         this.fieldNameTranslator = fieldNameTranslator;
-        fieldNameDN = fieldNameTranslator.translateAttributeName(LdapConstant.ATTRIBUTE_DN);
+        dnPath = fieldNameTranslator.translateAttributeName(LdapConstant.ATTRIBUTE_DN);
     }
 
     public DocCtx translate(SearchResultEntry entry){
@@ -72,7 +72,7 @@ public DocCtx translate(SearchResultEntry entry){
 
         if (cursor.firstChild()) {
             ObjectNode node = toJson(entry, cursor, fields);
-            node.set(fieldNameDN, StringType.TYPE.toJson(factory, entry.getDN()));
+            node.set(dnPath.toString(), StringType.TYPE.toJson(factory, entry.getDN()));
             return new DocCtx(new JsonDoc(node));
         }
 
@@ -85,15 +85,14 @@ private ObjectNode toJson(SearchResultEntry entry, FieldCursor fieldCursor, Fiel
         String entityName = md.getEntityInfo().getName();
 
         do {
-            FieldTreeNode field = fieldCursor.getCurrentNode();
-            String fieldName = field.getName();
+            Path fieldPath = fieldCursor.getCurrentPath();
 
-            if(fieldNameDN.equalsIgnoreCase(fieldName)){
+            if(dnPath.matches(fieldPath)){
                 //DN is not handled as a normal attribute, can be skipped.
                 continue;
             }
-            else if(LightblueUtil.isFieldObjectType(fieldName)){
-                node.set(fieldName, StringType.TYPE.toJson(factory, entityName));
+            else if(LightblueUtil.isFieldObjectType(fieldPath.toString())){
+                node.set(fieldPath.toString(), StringType.TYPE.toJson(factory, entityName));
             }
             else{
                 appendToJsonNode(entry, fieldCursor, node, fields);
diff --git a/lightblue-ldap-crud/src/test/java/com/redhat/lightblue/crud/ldap/model/TrivialLdapFieldNameTranslatorTest.java b/lightblue-ldap-crud/src/test/java/com/redhat/lightblue/crud/ldap/model/TrivialLdapFieldNameTranslatorTest.java
@@ -35,7 +35,7 @@ public void testTranslateFieldName(){
     @Test
     public void testTranslateAttributeName(){
         String attributeName = "fakeAttributeName";
-        assertEquals(attributeName, new TrivialLdapFieldNameTranslator().translateAttributeName(attributeName));
+        assertEquals(attributeName, new TrivialLdapFieldNameTranslator().translateAttributeName(attributeName).toString());
     }
 
 }
diff --git a/lightblue-ldap-metadata/src/main/java/com/redhat/lightblue/metadata/ldap/model/LdapMetadata.java b/lightblue-ldap-metadata/src/main/java/com/redhat/lightblue/metadata/ldap/model/LdapMetadata.java
@@ -61,13 +61,13 @@ public String translateFieldName(Path path){
     }
 
     @Override
-    public String translateAttributeName(String attributeName){
+    public Path translateAttributeName(String attributeName){
         for(Entry<String, String> f2a : fieldsToAttributes.entrySet()){
             if(f2a.getValue().equalsIgnoreCase(attributeName)){
-                return f2a.getKey();
+                return new Path(f2a.getKey());
             }
         }
-        return attributeName;
+        return new Path(attributeName);
     }
 
     /**
diff --git a/lightblue-ldap-metadata/src/test/java/com/redhat/lightblue/metadata/ldap/model/LdapMetadataTest.java b/lightblue-ldap-metadata/src/test/java/com/redhat/lightblue/metadata/ldap/model/LdapMetadataTest.java
@@ -36,22 +36,22 @@ public void testTranslateFieldName(){
         String fieldName = "fakeFieldName";
         String attributeName = "fakeAttributeName";
 
-        LdapMetadata property = new LdapMetadata();
-        property.addFieldToAttribute(fieldName, attributeName);
-        property.addFieldToAttribute("anotherField", "anotherAttribute");
+        LdapMetadata metadata = new LdapMetadata();
+        metadata.addFieldToAttribute(fieldName, attributeName);
+        metadata.addFieldToAttribute("anotherField", "anotherAttribute");
 
-        assertEquals(attributeName, property.translateFieldName(new Path(fieldName)));
+        assertEquals(attributeName, metadata.translateFieldName(new Path(fieldName)));
     }
 
     @Test
     public void testTranslateFieldName_WithPath(){
         String fieldName = "fakePath.fakeFieldName";
         String attributeName = "fakeAttributeName";
 
-        LdapMetadata property = new LdapMetadata();
-        property.addFieldToAttribute(fieldName, attributeName);
+        LdapMetadata metadata = new LdapMetadata();
+        metadata.addFieldToAttribute(fieldName, attributeName);
 
-        assertEquals(attributeName, property.translateFieldName(new Path(fieldName)));
+        assertEquals(attributeName, metadata.translateFieldName(new Path(fieldName)));
     }
 
     @Test
@@ -60,10 +60,10 @@ public void testTranslateFieldName_WithPath_MatchesOnTail(){
         String pathedFieldName = "fakePath." + fieldName;
         String attributeName = "fakeAttributeName";
 
-        LdapMetadata property = new LdapMetadata();
-        property.addFieldToAttribute(fieldName, attributeName);
+        LdapMetadata metadata = new LdapMetadata();
+        metadata.addFieldToAttribute(fieldName, attributeName);
 
-        assertEquals(attributeName, property.translateFieldName(new Path(pathedFieldName)));
+        assertEquals(attributeName, metadata.translateFieldName(new Path(pathedFieldName)));
     }
 
     @Test
@@ -78,29 +78,41 @@ public void testTranslateAttributeName(){
         String fieldName = "fakeFieldName";
         String attributeName = "fakeAttributeName";
 
-        LdapMetadata property = new LdapMetadata();
-        property.addFieldToAttribute(fieldName, attributeName);
-        property.addFieldToAttribute("anotherField", "anotherAttribute");
+        LdapMetadata metadata = new LdapMetadata();
+        metadata.addFieldToAttribute(fieldName, attributeName);
+        metadata.addFieldToAttribute("anotherField", "anotherAttribute");
 
-        assertEquals(fieldName, property.translateAttributeName(attributeName));
+        assertEquals(fieldName, metadata.translateAttributeName(attributeName).toString());
+    }
+
+    @Test
+    public void testTranslateAttributeName_WithPath(){
+        String fieldName = "somePath.fakeFieldName";
+        String attributeName = "fakeAttributeName";
+
+        LdapMetadata metadata = new LdapMetadata();
+        metadata.addFieldToAttribute(fieldName, attributeName);
+        metadata.addFieldToAttribute("anotherField", "anotherAttribute");
+
+        assertEquals(fieldName, metadata.translateAttributeName(attributeName).toString());
     }
 
     @Test
     public void testTranslateAttributeName_ValueNotPresent(){
         String attributeName = "fakeAttributeName";
 
-        assertEquals(attributeName, new LdapMetadata().translateAttributeName(attributeName));
+        assertEquals(attributeName, new LdapMetadata().translateAttributeName(attributeName).toString());
     }
 
     @Test
     public void testGetFieldsToAttributes_AssertImmutable(){
-        LdapMetadata property = new LdapMetadata();
-        property.addFieldToAttribute("anotherField", "anotherAttribute");
+        LdapMetadata metadata = new LdapMetadata();
+        metadata.addFieldToAttribute("anotherField", "anotherAttribute");
 
-        Map<String, String> fieldsToAttributes = property.getFieldsToAttributes();
+        Map<String, String> fieldsToAttributes = metadata.getFieldsToAttributes();
         assertNotNull(fieldsToAttributes);
-        assertMapEquivalent(fieldsToAttributes, property.getFieldsToAttributes());
-        assertNotSame(fieldsToAttributes, property.getFieldsToAttributes());
+        assertMapEquivalent(fieldsToAttributes, metadata.getFieldsToAttributes());
+        assertNotSame(fieldsToAttributes, metadata.getFieldsToAttributes());
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,6 @@ public interface LdapFieldNameTranslator {`
`39`	`39`	`* @param attributeName - ldap attribute name`
`40`	`40`	`* @return metadata fieldName or the attributeName back at you if no mapping is present.`
`41`	`41`	`*/`
`42`		`- public String translateAttributeName(String attributeName);`
	`42`	`+ public Path translateAttributeName(String attributeName);`
`43`	`43`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ public String translateFieldName(Path path) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@Override`
`38`		`- public String translateAttributeName(String attributeName) {`
`39`		`- return attributeName;`
	`38`	`+ public Path translateAttributeName(String attributeName) {`
	`39`	`+ return new Path(attributeName);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public void testTranslateFieldName(){`
`35`	`35`	`@Test`
`36`	`36`	`public void testTranslateAttributeName(){`
`37`	`37`	`String attributeName = "fakeAttributeName";`
`38`		`- assertEquals(attributeName, new TrivialLdapFieldNameTranslator().translateAttributeName(attributeName));`
	`38`	`+ assertEquals(attributeName, new TrivialLdapFieldNameTranslator().translateAttributeName(attributeName).toString());`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,13 +61,13 @@ public String translateFieldName(Path path){`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`@Override`
`64`		`- public String translateAttributeName(String attributeName){`
	`64`	`+ public Path translateAttributeName(String attributeName){`
`65`	`65`	`for(Entry<String, String> f2a : fieldsToAttributes.entrySet()){`
`66`	`66`	`if(f2a.getValue().equalsIgnoreCase(attributeName)){`
`67`		`- return f2a.getKey();`
	`67`	`+ return new Path(f2a.getKey());`
`68`	`68`	`}`
`69`	`69`	`}`
`70`		`- return attributeName;`
	`70`	`+ return new Path(attributeName);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/**`