ctf: remove redundant code in util

Change-Id: I4db24325762b054a031925e6fb0bc861a6511429
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/30835
Tested-by: Hudson CI
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>

2 files changed, 7 insertions, 16 deletions

diff --git a/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/ArrayDefinition.java b/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/ArrayDefinition.java
index 9fff73be28..3c0ca255fe 100644
--- a/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/ArrayDefinition.java
+++ b/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/ArrayDefinition.java
@@ -37,7 +37,7 @@ import com.google.common.collect.ImmutableList;
  */
 @NonNullByDefault
 @Deprecated
-public final class ArrayDefinition extends Definition {
+public final class ArrayDefinition extends AbstractArrayDefinition{
 
     // ------------------------------------------------------------------------
     // Attributes
@@ -77,10 +77,7 @@ public final class ArrayDefinition extends Definition {
     // Getters/Setters/Predicates
     // ------------------------------------------------------------------------
 
-    /**
-     * @return the definitions
-     * @since 3.0
-     */
+    @Override
     public List<Definition> getDefinitions() {
         return fDefinitions;
     }
diff --git a/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Utils.java b/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Utils.java
index c0432642be..72c1124124 100644
--- a/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Utils.java
+++ b/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/Utils.java
@@ -123,6 +123,10 @@ public final class Utils {
         if (!intUuidElem.isUnsignedByte()) {
             throw new CTFReaderException("UUID must be a sequence of unsigned bytes"); //$NON-NLS-1$
         }
+        return getUUID(uuidDef, uuidArray);
+    }
+
+    private static UUID getUUID(AbstractArrayDefinition uuidDef, byte[] uuidArray) throws CTFReaderException {
         for (int i = 0; i < uuidArray.length; i++) {
             IntegerDefinition uuidByteDef = (IntegerDefinition) uuidDef.getDefinitions().get(i);
             if (uuidByteDef == null) {
@@ -150,17 +154,7 @@ public final class Utils {
     @Deprecated
     public static UUID getUUIDfromDefinition(org.eclipse.linuxtools.ctf.core.event.types.ArrayDefinition uuidDef) throws CTFReaderException {
         byte[] uuidArray = new byte[16];
-
-        for (int i = 0; i < uuidArray.length; i++) {
-            IntegerDefinition uuidByteDef = (IntegerDefinition) uuidDef.getElem(i);
-            if (uuidByteDef == null) {
-                throw new CTFReaderException("UUID incomplete, only " + i + " bytes available"); //$NON-NLS-1$ //$NON-NLS-2$
-            }
-            uuidArray[i] = (byte) uuidByteDef.getValue();
-        }
-
-        UUID uuid = Utils.makeUUID(uuidArray);
-        return uuid;
+        return getUUID(uuidDef, uuidArray);
     }
 
     /**