Changeset 5251

Timestamp:

2011-12-09 15:11:55 (19 months ago)

Author:

evert

Message:

Stop using the deprecated isMultivalue and isHierarchical calls in the Tester tool.

Location:

trunk/apps/tester/src/main/java/org/lilyproject/tools/tester

Files:

• ReadAction.java (modified) (2 diffs)
• TestFieldType.java (modified) (2 diffs)

trunk/apps/tester/src/main/java/org/lilyproject/tools/tester/ReadAction.java

@@ -8 +8 @@
 import javax.naming.OperationNotSupportedException;
 
+import org.apache.commons.lang.ArrayUtils;
 import org.codehaus.jackson.JsonNode;
 import org.lilyproject.repository.api.*;
@@ -68 +69 @@
             ValueType valueType = fieldType.getValueType();
             if (valueType.getDeepestValueType() instanceof BlobValueType) {
-                if (valueType.isMultiValue()) {
-                    List<Object> multivalues = (List<Object>)(entry.getValue());
-                    int multivalueIndex = randomIndex(multivalues.size());
-                    if (valueType.isHierarchical()) {
-                        Object[] hierarchyValues = ((HierarchyPath)(multivalues.get(multivalueIndex))).getElements();
-                        int hierarchyIndex = randomIndex(hierarchyValues.length);
-                        Blob blob = (Blob)hierarchyValues[hierarchyIndex];
-                        InputStream inputStream = testActionContext.repository.getInputStream(readRecord, fieldName, multivalueIndex, hierarchyIndex);
-                        readBlobBytes(blob, inputStream);
-                    } else {
-                        Blob blob = (Blob)(multivalues.get(multivalueIndex));
-                        InputStream inputStream = testActionContext.repository.getInputStream(readRecord.getId(), readRecord.getVersion(), fieldName, multivalueIndex, null);
-                        readBlobBytes(blob, inputStream);
-                    }
-                } else if (valueType.isHierarchical()) {
-                    Object[] hierarchyValues = ((HierarchyPath)(entry.getValue())).getElements();
-                    int hierarchyIndex = randomIndex(hierarchyValues.length);
-                    Blob blob = (Blob)hierarchyValues[hierarchyIndex];
-                    BlobAccess blobAccess = testActionContext.repository.getBlob(readRecord.getId(), readRecord.getVersion(), fieldName, null, hierarchyIndex);
-                    InputStream inputStream = blobAccess.getInputStream();
-                    readBlobBytes(blob, inputStream);
-                } else {
-                    Set<Object> values = valueType.getValues(entry.getValue());
-                    Blob blob = (Blob)values.toArray()[0];
-                    InputStream inputStream = testActionContext.repository.getInputStream(readRecord, fieldName);
-                    readBlobBytes(blob, inputStream);
-                }
+                readBlobs(readRecord, fieldName, entry.getValue(), valueType);
             }
-            
         }
     }
     
+    private void readBlobs(Record readRecord, QName fieldName, Object value, ValueType valueType, int... indexes)
+            throws RepositoryException, InterruptedException, IOException {
+        if (valueType.getBaseName().equals("LIST")) {
+            List<Object> multivalues = (List<Object>) (value);
+            int multivalueIndex = randomIndex(multivalues.size());
+            Object subValue = (multivalues.get(multivalueIndex));
+            indexes = ArrayUtils.add(indexes, multivalueIndex);
+            readBlobs(readRecord, fieldName, subValue, valueType.getNestedValueType(), indexes);
+        } else if (valueType.getBaseName().equals("PATH")) {
+            Object[] hierarchyValues = ((HierarchyPath) (value)).getElements();
+            int hierarchyIndex = randomIndex(hierarchyValues.length);
+            Object subValue = hierarchyValues[hierarchyIndex];
+            indexes = ArrayUtils.add(indexes, hierarchyIndex);
+            readBlobs(readRecord, fieldName, subValue, valueType.getNestedValueType(), indexes);
+        } else {
+            Blob blob = (Blob) value;
+            InputStream inputStream = testActionContext.repository.getInputStream(readRecord, fieldName, indexes);
+            readBlobBytes(blob, inputStream);
+        }
+    }
+
     private int randomIndex(int arrayLength) {
         return (int)(Math.random() * arrayLength);

trunk/apps/tester/src/main/java/org/lilyproject/tools/tester/TestFieldType.java

@@ -270 +270 @@
         } else {
             Object value = record.getField(fieldType.getName());
-            return updateMultiValue(testAction, value);
-        }
-    }
-    
-    private ActionResult updateMultiValue(TestAction testAction, Object value) {
-        if (fieldType.getValueType().isMultiValue()) {
-            List<Object> values = (List<Object>)value;
+            return updateLinkValue(testAction, value, fieldType.getValueType());
+        }
+    }
+    
+    private ActionResult updateLinkValue(TestAction testAction, Object value, ValueType valueType) {
+        if (valueType.getBaseName().equals("LIST")) {
+            List<Object> values = (List<Object>) value;
             int index = (int) (Math.random() * values.size());
-            ActionResult result = updateHierarchical(testAction, values.get(index));
+            ActionResult result = updateLinkValue(testAction, values.get(index), valueType.getNestedValueType());
             if (result.success && result.object != null) {
                 values.add(index, result.object);
                 return new ActionResult(true, values, result.duration);
             }
-            return updateHierarchical(testAction, values.get(index));
-        } else {
-            return updateHierarchical(testAction, value);
-        }
-    }
-    
-    private ActionResult updateHierarchical(TestAction testAction, Object value) {
-        if (fieldType.getValueType().isHierarchical()) {
-            HierarchyPath path = (HierarchyPath)value;
+            return result;
+        } else if (valueType.getBaseName().equals("PATH")) {
+            HierarchyPath path = (HierarchyPath) value;
             Object[] values = path.getElements();
             int index = (int) (Math.random() * values.length);
             // LinkedRecordTypeName should only be given in case of link fields
-            ActionResult result = updateLink(testAction, (Link)values[index]);
+            ActionResult result = updateLinkValue(testAction, values[index], valueType.getNestedValueType());
             if (result.success && result.object != null) {
                 values[index] = result.object;
@@ -302 +296 @@
             return result;
         } else {
-            return updateLink(testAction, (Link)value);
+            return updateLink(testAction, (Link) value);
         }
     }