Pass list of Relationship instances into Relationships

1 files changed, 13 insertions, 9 deletions

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 c1dd511..d4d6f2e 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/Relationships.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/Relationships.java
@@ -1,21 +1,25 @@
 package org.zwobble.mammoth.internal.docx;
 
+import java.util.List;
 import java.util.Map;
 
-import static org.zwobble.mammoth.internal.util.Maps.lookup;
-import static org.zwobble.mammoth.internal.util.Maps.map;
+import static org.zwobble.mammoth.internal.util.Lists.list;
+import static org.zwobble.mammoth.internal.util.Maps.*;
 
 public class Relationships {
-    public static final Relationships EMPTY = new Relationships(map());
+    public static final Relationships EMPTY = new Relationships(list());
 
-    private final Map<String, Relationship> relationships;
+    private final Map<String, String> targetsByRelationshipId;
 
-    public Relationships(Map<String, Relationship> relationships) {
-        this.relationships = relationships;
+    public Relationships(List<Relationship> relationships) {
+        this.targetsByRelationshipId = toMap(relationships, relationship -> entry(
+            relationship.getRelationshipId(),
+            relationship.getTarget()
+        ));
     }
 
-    public Relationship findRelationshipById(String id) {
-        return lookup(relationships, id)
-            .orElseThrow(() -> new RuntimeException("Could not find relationship '" + id + "'"));
+    public String findTargetByRelationshipId(String relationshipId) {
+        return lookup(targetsByRelationshipId, relationshipId)
+            .orElseThrow(() -> new RuntimeException("Could not find relationship '" + relationshipId + "'"));
     }
 }