From 1df44df965c53d552add2c8d9da168b5cbc524ea Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 3 Aug 2025 08:25:46 +0100 Subject: Extract HasGetChildren from HasChildren for better safety --- src/main/java/org/zwobble/mammoth/internal/conversion/RawText.java | 4 ++-- .../java/org/zwobble/mammoth/internal/documents/HasChildren.java | 3 +-- .../org/zwobble/mammoth/internal/documents/HasGetChildren.java | 7 +++++++ 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 src/main/java/org/zwobble/mammoth/internal/documents/HasGetChildren.java diff --git a/src/main/java/org/zwobble/mammoth/internal/conversion/RawText.java b/src/main/java/org/zwobble/mammoth/internal/conversion/RawText.java index c2bdff7..e784840 100644 --- a/src/main/java/org/zwobble/mammoth/internal/conversion/RawText.java +++ b/src/main/java/org/zwobble/mammoth/internal/conversion/RawText.java @@ -27,8 +27,8 @@ public class RawText { } else if (node instanceof Tab) { return "\t"; } else { - List children = tryCast(HasChildren.class, node) - .map(HasChildren::getChildren) + List children = tryCast(HasGetChildren.class, node) + .map(HasGetChildren::getChildren) .orElse(list()); String suffix = tryCast(Paragraph.class, node).map(paragraph -> "\n\n").orElse(""); return extractRawText(children) + suffix; diff --git a/src/main/java/org/zwobble/mammoth/internal/documents/HasChildren.java b/src/main/java/org/zwobble/mammoth/internal/documents/HasChildren.java index 11789b0..3b5ad4b 100644 --- a/src/main/java/org/zwobble/mammoth/internal/documents/HasChildren.java +++ b/src/main/java/org/zwobble/mammoth/internal/documents/HasChildren.java @@ -2,7 +2,6 @@ package org.zwobble.mammoth.internal.documents; import java.util.List; -public interface HasChildren { - List getChildren(); +public interface HasChildren extends HasGetChildren { T replaceChildren(List newChildren); } diff --git a/src/main/java/org/zwobble/mammoth/internal/documents/HasGetChildren.java b/src/main/java/org/zwobble/mammoth/internal/documents/HasGetChildren.java new file mode 100644 index 0000000..18d39fc --- /dev/null +++ b/src/main/java/org/zwobble/mammoth/internal/documents/HasGetChildren.java @@ -0,0 +1,7 @@ +package org.zwobble.mammoth.internal.documents; + +import java.util.List; + +public interface HasGetChildren { + List getChildren(); +} -- cgit v1.2.3