Ensure consistent type in ternary for C# compilation

3 files changed, 11 insertions, 3 deletions

diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/DisabledFileReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/DisabledFileReader.java
index 03386d4..a225192 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/DisabledFileReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/DisabledFileReader.java
@@ -4,6 +4,10 @@ import java.io.IOException;
 import java.io.InputStream;
 
 public class DisabledFileReader implements FileReader {
+    public static final FileReader INSTANCE = new DisabledFileReader();
+
+    private DisabledFileReader() {}
+
     @Override
     public InputStream getInputStream(String uri) throws IOException {
         throw new IOException("could not open external image '" + uri + "': external file access is disabled");
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
index 495646f..5102b33 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/DocumentReader.java
@@ -34,8 +34,8 @@ public class DocumentReader {
         ContentTypes contentTypes = readContentTypes(zipFile);
 
         FileReader fileReader = externalFileAccess
-            ? new PathRelativeFileReader(path)
-            : new DisabledFileReader();
+            ? PathRelativeFileReader.relativeTo(path)
+            : DisabledFileReader.INSTANCE;
 
         PartWithBodyReader partReader = new PartWithBodyReader(zipFile, contentTypes, fileReader, numbering, styles);
         return InternalResult.flatMap(
diff --git a/src/main/java/org/zwobble/mammoth/internal/docx/PathRelativeFileReader.java b/src/main/java/org/zwobble/mammoth/internal/docx/PathRelativeFileReader.java
index ebee416..da149b2 100644
--- a/src/main/java/org/zwobble/mammoth/internal/docx/PathRelativeFileReader.java
+++ b/src/main/java/org/zwobble/mammoth/internal/docx/PathRelativeFileReader.java
@@ -8,9 +8,13 @@ import java.nio.file.Path;
 import java.util.Optional;
 
 public class PathRelativeFileReader implements FileReader {
+    public static FileReader relativeTo(Optional<Path> path) {
+        return new PathRelativeFileReader(path);
+    }
+
     private final Optional<Path> path;
 
-    public PathRelativeFileReader(Optional<Path> path) {
+    private PathRelativeFileReader(Optional<Path> path) {
         this.path = path;
     }