simplify EntryBuilder method signatures

Author: dcrissman

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

@@ -35,7 +35,6 @@
 import com.redhat.lightblue.metadata.types.DateType;
 import com.redhat.lightblue.util.JsonDoc;
 import com.redhat.lightblue.util.JsonNodeCursor;
-import com.redhat.lightblue.util.Path;
 import com.unboundid.ldap.sdk.Entry;
 import com.unboundid.util.StaticUtils;
 
@@ -73,8 +72,8 @@ else if(type instanceof BinaryType){
     }
 
     @Override
-    protected void translate(SimpleField field, Path path, JsonNode node, Entry target) {
-        String attributeName = fieldNameTranslator.translateFieldName(path);
+    protected void translate(SimpleField field, JsonNode node, Entry target) {
+        String attributeName = fieldNameTranslator.translateFieldName(field.getFullPath());
 
         if(LdapConstant.ATTRIBUTE_DN.equalsIgnoreCase(attributeName)){
             throw new IllegalArgumentException(
@@ -101,10 +100,10 @@ else if(LightblueUtil.isFieldObjectType(attributeName)
     }
 
     @Override
-    protected void translateSimpleArray(ArrayField field, Path path, List<Object> items, Entry target) {
+    protected void translateSimpleArray(ArrayField field, List<Object> items, Entry target) {
         ArrayElement arrayElement = field.getElement();
         Type arrayElementType = arrayElement.getType();
-        String attributeName = fieldNameTranslator.translateFieldName(path);
+        String attributeName = fieldNameTranslator.translateFieldName(field.getFullPath());
 
         if(arrayElementType instanceof BinaryType){
             List<byte[]> bytes = new ArrayList<byte[]>();
@@ -123,7 +122,7 @@ protected void translateSimpleArray(ArrayField field, Path path, List<Object> it
     }
 
     @Override
-    protected void translateObjectArray(ArrayField field, JsonNodeCursor cursor, Path path, Entry target) {
+    protected void translateObjectArray(ArrayField field, JsonNodeCursor cursor, Entry target) {
         throw new UnsupportedOperationException("Object ArrayField type is not currently supported.");
     }
 

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

@@ -103,23 +103,23 @@ protected void translate(JsonNodeCursor cursor, T target){
         }
 
         if (fieldNode instanceof SimpleField) {
-            translate((SimpleField) fieldNode, path, node, target);
+            translate((SimpleField) fieldNode, node, target);
         }
         else if (fieldNode instanceof ObjectField) {
-            translate((ObjectField) fieldNode, cursor, path, target);
+            translate((ObjectField) fieldNode, cursor, target);
         }
         else if (fieldNode instanceof ArrayField) {
-            translate((ArrayField) fieldNode, cursor, path, target);
+            translate((ArrayField) fieldNode, cursor, target);
         }
         else if (fieldNode instanceof ReferenceField) {
-            translate((ReferenceField) fieldNode, path, node, target);
+            translate((ReferenceField) fieldNode, node, target);
         }
         else{
             throw new UnsupportedOperationException("Field type is not supported: " + fieldNode.getClass().getName());
         }
     }
 
-    private void translate(ArrayField field, JsonNodeCursor cursor, Path path, T target){
+    private void translate(ArrayField field, JsonNodeCursor cursor, T target){
         if(!cursor.firstChild()){
             //TODO: throw exception?
             return;
@@ -132,10 +132,10 @@ private void translate(ArrayField field, JsonNodeCursor cursor, Path path, T tar
             do {
                 items.add(fromJson(arrayElement.getType(), cursor.getCurrentNode()));
             } while (cursor.nextSibling());
-            translateSimpleArray(field, path, items, target);
+            translateSimpleArray(field, items, target);
         }
         else if(arrayElement instanceof ObjectArrayElement){
-            translateObjectArray(field, cursor, path, target);
+            translateObjectArray(field, cursor, target);
         }
         else{
             throw new UnsupportedOperationException("ArrayElement type is not supported: " + arrayElement.getClass().getName());
@@ -144,7 +144,7 @@ else if(arrayElement instanceof ObjectArrayElement){
         cursor.parent();
     }
 
-    protected void translate(ObjectField field, JsonNodeCursor cursor, Path path, T target){
+    protected void translate(ObjectField field, JsonNodeCursor cursor, T target){
         if(!cursor.firstChild()){
             //TODO: throw exception?
             return;
@@ -156,12 +156,12 @@ protected void translate(ObjectField field, JsonNodeCursor cursor, Path path, T
         cursor.parent();
     }
 
-    protected void translate(ReferenceField field, Path path, JsonNode node, T target){
+    protected void translate(ReferenceField field, JsonNode node, T target){
         //Do nothing by default!
     }
 
-    protected abstract void translate(SimpleField field, Path path, JsonNode node, T target);
-    protected abstract void translateSimpleArray(ArrayField field, Path path, List<Object> items, T target);
-    protected abstract void translateObjectArray(ArrayField field, JsonNodeCursor cursor, Path path, T target);
+    protected abstract void translate(SimpleField field, JsonNode node, T target);
+    protected abstract void translateSimpleArray(ArrayField field, List<Object> items, T target);
+    protected abstract void translateObjectArray(ArrayField field, JsonNodeCursor cursor, T target);
 
 }