Use lookup instead of Map.get

2 files changed, 9 insertions, 7 deletions

diff --git a/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java b/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java
index 157d638..a0ed784 100644
--- a/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/XmlElement.java
@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.Optional;
 
 import static com.google.common.collect.Iterables.*;
+import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
 
 public class XmlElement implements XmlNode, XmlElementLike {
     private final String name;
@@ -35,7 +36,7 @@ public class XmlElement implements XmlNode, XmlElementLike {
 
     @Override
     public Optional<String> getAttributeOrNone(String name) {
-        return Optional.ofNullable(attributes.get(name));
+        return lookup(attributes, name);
     }
 
     public List<XmlNode> getChildren() {
diff --git a/src/main/java/org/zwobble/mammoth/internal/xml/parsing/XmlParser.java b/src/main/java/org/zwobble/mammoth/internal/xml/parsing/XmlParser.java
index 566dbd6..b196dbd 100644
--- a/src/main/java/org/zwobble/mammoth/internal/xml/parsing/XmlParser.java
+++ b/src/main/java/org/zwobble/mammoth/internal/xml/parsing/XmlParser.java
@@ -1,16 +1,17 @@
 package org.zwobble.mammoth.internal.xml.parsing;
 
-import java.io.InputStream;
-import java.util.ArrayDeque;
-import java.util.Deque;
-import java.util.Map;
-
 import com.google.common.base.Strings;
 import com.google.common.collect.BiMap;
 import org.zwobble.mammoth.internal.xml.XmlElement;
 import org.zwobble.mammoth.internal.xml.XmlTextNode;
 
+import java.io.InputStream;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.Map;
+
 import static java.util.stream.Collectors.toMap;
+import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
 
 public class XmlParser {
     private final BiMap<String, String> namespaces;
@@ -58,7 +59,7 @@ public class XmlParser {
             if (Strings.isNullOrEmpty(name.getUri())) {
                 return name.getLocalName();                
             } else if (namespaces.containsValue(name.getUri())) {
-                return namespaces.inverse().get(name.getUri()) + ":" + name.getLocalName();
+                return lookup(namespaces.inverse(), name.getUri()).get() + ":" + name.getLocalName();
             } else {
                 return "{" + name.getUri() + "}" + name.getLocalName();
             }