Defer resolution of abstract nums until necessary

1 files changed, 20 insertions, 5 deletions

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 5ee09db..2680cfa 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/Numbering.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/Numbering.java
@@ -9,16 +9,31 @@ import static org.zwobble.mammoth.internal.util.Maps.lookup;
 import static org.zwobble.mammoth.internal.util.Maps.map;
 
 public class Numbering {
-    public static final Numbering EMPTY = new Numbering(map());
+    public static class Num {
+        private final Optional<String> abstractNumId;
 
-    private final Map<String, Map<String, NumberingLevel>> numbering;
+        public Num(Optional<String> abstractNumId) {
+            this.abstractNumId = abstractNumId;
+        }
+    }
+
+    public static final Numbering EMPTY = new Numbering(map(), map());
+
+    private final Map<String, Map<String, NumberingLevel>> abstractNums;
+    private final Map<String, Num> nums;
 
-    public Numbering(Map<String, Map<String, NumberingLevel>> numbering) {
-        this.numbering = numbering;
+    public Numbering(
+        Map<String, Map<String, NumberingLevel>> abstractNums,
+        Map<String, Num> nums
+    ) {
+        this.abstractNums = abstractNums;
+        this.nums = nums;
     }
 
     public Optional<NumberingLevel> findLevel(String numId, String level) {
-        return lookup(numbering, numId)
+        return lookup(nums, numId)
+            .flatMap(num -> num.abstractNumId)
+            .flatMap(abstractNumId -> lookup(this.abstractNums, abstractNumId))
             .flatMap(levels -> lookup(levels, level));
     }
 }