add ability for uniqueAttribute to be aliased

Author: dcrissman

lightblue-ldap-common/src/main/java/com/redhat/lightblue/common/ldap/LdapDataStore.java

@@ -53,11 +53,11 @@ public void setBaseDN(String baseDN) {
         this.baseDN = baseDN;
     }
 
-    public String getUniqueField() {
+    public String getUniqueAttribute() {
         return uniqueField;
     }
 
-    public void setUniqueField(String uniqueField) {
+    public void setUniqueAttribute(String uniqueField) {
         this.uniqueField = uniqueField;
     }
 

lightblue-ldap-crud/src/main/java/com/redhat/lightblue/crud/ldap/LdapCRUDController.java

@@ -127,9 +127,10 @@ public CRUDInsertionResponse insert(CRUDOperationContext ctx,
 
             JsonNode rootNode = document.getRoot();
 
-            JsonNode uniqueNode = rootNode.get(store.getUniqueField());
+            String uniqueAttributeName = property.translateAttributeName(store.getUniqueAttribute());
+            JsonNode uniqueNode = rootNode.get(uniqueAttributeName);
             if(uniqueNode == null){
-                throw new IllegalArgumentException(store.getUniqueField() + " is a required field");
+                throw new IllegalArgumentException(uniqueAttributeName + " is a required field");
             }
 
             String dn = createDN(store, uniqueNode.asText());
@@ -351,7 +352,7 @@ private LdapMetadataProperty getLdapMetadataProperty(EntityMetadata md){
      * @return a string representation of the DN.
      */
     private String createDN(LdapDataStore store, String uniqueValue){
-        return store.getUniqueField() + "=" + uniqueValue + "," + store.getBaseDN();
+        return store.getUniqueAttribute() + "=" + uniqueValue + "," + store.getBaseDN();
     }
 
     /**

lightblue-ldap-integration-test/src/test/java/com/redhat/lightblue/crud/ldap/ITCaseLdapCRUDController_WithProperties_Test.java

@@ -94,9 +94,14 @@ public void test2FindCustomerWithProperties() throws Exception{
         JsonNode entityData = response.getEntityData();
         assertNotNull(entityData);
         JSONAssert.assertEquals(
-                "[{\"id\":\"uid=frodo.baggins," + BASEDB_CUSTOMERS
-                + "\",\"firstName\":\"Frodo\",\"lastName\":\"Baggins\",\"cn\":\"Frodo Baggins\",\"interfaces#\":4,\"interfaces\":[\"top\",\"person\",\"organizationalPerson\",\"inetOrgPerson\"]}]",
-                entityData.toString(), true);
+                "[{\"id\":\"uid=frodo.baggins," + BASEDB_CUSTOMERS + "\","
+                        + "\"customerId\":\"frodo.baggins\","
+                        + "\"firstName\":\"Frodo\","
+                        + "\"lastName\":\"Baggins\","
+                        + "\"cn\":\"Frodo Baggins\","
+                        + "\"interfaces#\":4,"
+                        + "\"interfaces\":[\"top\",\"person\",\"organizationalPerson\",\"inetOrgPerson\"]}]",
+                        entityData.toString(), true);
     }
 
 }

lightblue-ldap-integration-test/src/test/resources/crud/find/customer-find-single.json

@@ -3,6 +3,7 @@
     "entityVersion": "1.0.0",
     "projection": [
         {"field": "id"},
+        {"field": "customerId"},
         {"field": "firstName"},
         {"field": "lastName"},
         {"field": "cn"},

lightblue-ldap-integration-test/src/test/resources/crud/insert/customer-insert-single.json

@@ -6,7 +6,7 @@
     },
     "data": {
         "interfaces": ["top", "person", "organizationalPerson", "inetOrgPerson"],
-        "uid": "frodo.baggins",
+        "customerId": "frodo.baggins",
         "firstName": "Frodo",
         "lastName": "Baggins",
         "cn": "Frodo Baggins"

lightblue-ldap-integration-test/src/test/resources/metadata/customer-metadata.json

@@ -13,6 +13,10 @@
                     "field": "id",
                     "attribute": "dn"
                 },
+                {
+                    "field": "customerId",
+                    "attribute": "uid"
+                },
                 {
                     "field": "firstName",
                     "attribute": "givenName"
@@ -44,7 +48,7 @@
              "find": ["anyone"]
         },
         "fields": {
-            "uid": {"type": "string"},
+            "customerId": {"type": "string"},
             "firstName": {"type": "string"},
             "lastName": {"type": "string"},
             "cn": {"type": "string"}

lightblue-ldap-metadata/src/main/java/com/redhat/lightblue/metadata/ldap/parser/LdapDataStoreParser.java

@@ -46,7 +46,7 @@ public LdapDataStore parse(String name, MetadataParser<T> p, T node) {
         LdapDataStore dataStore = new LdapDataStore();
         dataStore.setDatabase(p.getRequiredStringProperty(node, DATABASE));
         dataStore.setBaseDN(p.getRequiredStringProperty(node, BASEDN));
-        dataStore.setUniqueField(p.getRequiredStringProperty(node, UNIQUE_FIELD));
+        dataStore.setUniqueAttribute(p.getRequiredStringProperty(node, UNIQUE_FIELD));
 
         return dataStore;
     }
@@ -60,7 +60,7 @@ public void convert(MetadataParser<T> p, T emptyNode, DataStore store) {
         LdapDataStore ds = (LdapDataStore) store;
         p.putString(emptyNode, DATABASE, ds.getDatabase());
         p.putString(emptyNode, BASEDN, ds.getBaseDN());
-        p.putString(emptyNode, UNIQUE_FIELD, ds.getUniqueField());
+        p.putString(emptyNode, UNIQUE_FIELD, ds.getUniqueAttribute());
     }
 
     @Override

lightblue-ldap-metadata/src/test/java/com/redhat/lightblue/metadata/ldap/parser/LdapDataStoreParserTest.java

@@ -67,7 +67,7 @@ public void testParse() throws IOException{
         assertNotNull(store);
         assertEquals(DATABASE, store.getDatabase());
         assertEquals(BASE_DN, store.getBaseDN());
-        assertEquals(UNIQUE_ATTRIBUTE, store.getUniqueField());
+        assertEquals(UNIQUE_ATTRIBUTE, store.getUniqueAttribute());
     }
 
     @Test
@@ -83,7 +83,7 @@ public void testConvert() throws IOException, JSONException{
         LdapDataStore store = new LdapDataStore();
         store.setDatabase(DATABASE);
         store.setBaseDN(BASE_DN);
-        store.setUniqueField(UNIQUE_ATTRIBUTE);
+        store.setUniqueAttribute(UNIQUE_ATTRIBUTE);
 
         JsonNode node = json("{}");