Use lookup instead of Map.get

6 files changed, 17 insertions, 11 deletions

diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypes.java b/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypes.java
index ce4ebac..b8c6817 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypes.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/ContentTypes.java
@@ -6,6 +6,7 @@ import com.google.common.io.Files;
 import java.util.Map;
 import java.util.Optional;
 
+import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
 import static org.zwobble.mammoth.internal.util.MammothMaps.map;
 
 public class ContentTypes {
@@ -31,13 +32,13 @@ public class ContentTypes {
 
     public Optional<String> findContentType(String path) {
         if (overrides.containsKey(path)) {
-            return Optional.ofNullable(overrides.get(path));
+            return lookup(overrides, path);
         } else {
             String extension = Files.getFileExtension(path);
             if (extensionDefaults.containsKey(extension)) {
-                return Optional.ofNullable(extensionDefaults.get(extension));
+                return lookup(extensionDefaults, extension);
             } else {
-                return Optional.ofNullable(imageExtensions.get(extension.toLowerCase()))
+                return lookup(imageExtensions, extension.toLowerCase())
                     .map(imageType -> "image/" + imageType);
             }
         }
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java b/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java
index 7229ad5..5db03d4 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/InMemoryDocxFile.java
@@ -13,6 +13,8 @@ import java.util.Optional;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
+import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
+
 public class InMemoryDocxFile implements DocxFile {
     public static DocxFile fromStream(InputStream stream) throws IOException {
         ZipInputStream zipStream = new ZipInputStream(stream);
@@ -36,7 +38,7 @@ public class InMemoryDocxFile implements DocxFile {
 
     @Override
     public Optional<InputStream> tryGetInputStream(String name) throws IOException {
-        return Optional.ofNullable(entries.get(name))
+        return lookup(entries, name)
             .map(ByteArrayInputStream::new);
     }
 
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/Numbering.java b/src/main/java/org/zwobble/mammoth/internal/docx/Numbering.java
index f61b5db..9208c82 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/Numbering.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/Numbering.java
@@ -5,6 +5,7 @@ import org.zwobble.mammoth.internal.documents.NumberingLevel;
 import java.util.Map;
 import java.util.Optional;
 
+import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
 import static org.zwobble.mammoth.internal.util.MammothMaps.map;
 
 public class Numbering {
@@ -17,7 +18,7 @@ public class Numbering {
     }
 
     public Optional<NumberingLevel> findLevel(String numId, String level) {
-        return Optional.ofNullable(numbering.get(numId))
-            .flatMap(levels -> Optional.ofNullable(levels.get(level)));
+        return lookup(numbering, numId)
+            .flatMap(levels -> lookup(levels, level));
     }
 }
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
index 0ee480d..083f116 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/NumberingXml.java
@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.Optional;
 
 import static com.google.common.collect.Maps.immutableEntry;
+import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
 import static org.zwobble.mammoth.internal.util.MammothMaps.toMap;
 
 public class NumberingXml {
@@ -51,6 +52,6 @@ public class NumberingXml {
         // TODO: in python-mammoth, we allow None here. Check whether that's actually possible or not
         String numId = numElement.getAttribute("w:numId");
         String abstractNumId = numElement.findChild("w:abstractNumId").getAttribute("w:val");
-        return immutableEntry(numId, Optional.ofNullable(abstractNums.get(abstractNumId)).get());
+        return immutableEntry(numId, lookup(abstractNums, abstractNumId).get());
     }
 }
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/Relationships.java b/src/main/java/org/zwobble/mammoth/internal/docx/Relationships.java
index d019b57..b1f2279 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/Relationships.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/Relationships.java
@@ -1,8 +1,8 @@
 package org.zwobble.mammoth.internal.docx;
 
 import java.util.Map;
-import java.util.Optional;
 
+import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
 import static org.zwobble.mammoth.internal.util.MammothMaps.map;
 
 public class Relationships {
@@ -15,6 +15,6 @@ public class Relationships {
     }
 
     public Relationship findRelationshipById(String id) {
-        return Optional.ofNullable(relationships.get(id)).get();
+        return lookup(relationships, id).get();
     }
 }
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/Styles.java b/src/main/java/org/zwobble/mammoth/internal/docx/Styles.java
index d5e32e8..5b9b131 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/Styles.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/Styles.java
@@ -5,6 +5,7 @@ import org.zwobble.mammoth.internal.documents.Style;
 import java.util.Map;
 import java.util.Optional;
 
+import static org.zwobble.mammoth.internal.util.MammothMaps.lookup;
 import static org.zwobble.mammoth.internal.util.MammothMaps.map;
 
 public class Styles {
@@ -19,10 +20,10 @@ public class Styles {
     }
 
     public Optional<Style> findParagraphStyleById(String id) {
-        return Optional.ofNullable(paragraphStyles.get(id));
+        return lookup(paragraphStyles, id);
     }
 
     public Optional<Style> findCharacterStyleById(String id) {
-        return Optional.ofNullable(characterStyles.get(id));
+        return lookup(characterStyles, id);
     }
 }