Skip to content

Commit 5e57e8b

Browse files
author
Björn Ekryd
committed
Reverting NewlineText singleton (Sonar, no like).
Testing parent null (which will never occur in reality)
1 parent e79e319 commit 5e57e8b

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

sorter/src/main/java/sortpom/content/NewlineText.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@
77
* in XmlProcessor.PatchedXMLWriter
88
*/
99
public class NewlineText extends AbstractText {
10-
public static final NewlineText INSTANCE = new NewlineText();
1110
private static final long serialVersionUID = -7552189498553321263L;
1211

13-
private NewlineText() {}
14-
1512
/**
1613
* This returns a <code>String</code> representation of the <code>NewlineText</code>, suitable for
1714
* debugging.

sorter/src/main/java/sortpom/wrapper/TextWrapperCreator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Wrapper<Node> createWrapper(Text text) {
3636
return new UnsortedWrapper<>(text);
3737
}
3838

39-
private boolean isElementSpacePreserved(Element element) {
39+
boolean isElementSpacePreserved(Element element) {
4040
if (element == null) {
4141
return false;
4242
}

sorter/src/main/java/sortpom/wrapper/content/UnsortedWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/** A wrapper that lets is element be unsorted */
88
public class UnsortedWrapper<T extends Node> implements Wrapper<T> {
99
public static final UnsortedWrapper<Node> NEWLINE_TEXT_WRAPPER_INSTANCE =
10-
new UnsortedWrapper<>(NewlineText.INSTANCE);
10+
new UnsortedWrapper<>(new NewlineText());
1111

1212
/** The wrapped dom content. */
1313
private final T content;

sorter/src/test/java/sortpom/wrapper/TextWrapperCreatorTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import static org.junit.jupiter.api.Assertions.assertFalse;
44
import static org.junit.jupiter.api.Assertions.assertTrue;
55

6+
import org.dom4j.dom.DOMText;
67
import org.dom4j.tree.DefaultText;
78
import org.junit.jupiter.api.BeforeEach;
89
import org.junit.jupiter.api.Test;
@@ -40,4 +41,10 @@ void testIsEmptyLine() {
4041
assertTrue(textWrapperCreator.isBlankLineOrLines(new DefaultText("\r\n\r\n")));
4142
assertFalse(textWrapperCreator.isBlankLineOrLines(new DefaultText(" ")));
4243
}
44+
45+
@Test
46+
void textNodeWithNullParentShouldNotCrash() {
47+
var text = new DOMText("Hi!");
48+
assertFalse(textWrapperCreator.isElementSpacePreserved(text.getParent()));
49+
}
4350
}

0 commit comments

Comments
 (0)