HZN-826: Handle attribute type of key is null properly

OpenNMS · Jun 29, 2016 · 059039f · 059039f
1 parent 2d5047d
commit 059039f
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/features/graphml/src/main/java/org/opennms/features/graphml/model/GraphMLReader.java b/features/graphml/src/main/java/org/opennms/features/graphml/model/GraphMLReader.java
@@ -30,6 +30,7 @@
 
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -168,6 +169,12 @@ private static void addProperties(GraphMLElement graphElement, String elementId,
             if (keyType == null) {
                 throw new InvalidGraphException("Accessing not existing attribute with key " + eachDataElement.getKey());
             }
+            if (keyType.getAttrType() == null) {
+                throw new InvalidGraphException("Key with id='" + keyType.getId() + "' and " +
+                        "attribute name '" + keyType.getAttrName() + "' is null. " +
+                        "This is usually caused by an invalid attribute type value. " +
+                        "The following values are supported: " + Arrays.stream(KeyTypeType.values()).map(k -> k.value()).collect(Collectors.joining(", ")));
+            }
             Object value = typeCastValue(eachDataElement.getContent(), keyType.getAttrType());
             graphElement.setProperty(keyType.getAttrName(), value);
         }