diff --git a/src/main/java/com/amihaiemil/eoyaml/RtYamlPrinter.java b/src/main/java/com/amihaiemil/eoyaml/RtYamlPrinter.java index eaac943a..b9ffb1dd 100644 --- a/src/main/java/com/amihaiemil/eoyaml/RtYamlPrinter.java +++ b/src/main/java/com/amihaiemil/eoyaml/RtYamlPrinter.java @@ -122,54 +122,4 @@ private String printPossibleComment(final YamlNode node) { } return wrtr.toString(); } - - /** - * A scalar which escapes its value. - * @author Mihai Andronache (amihaiemil@gmail.com) - * @version $Id$ - * @since 4.3.1 - * @checkstyle LineLength (100 lines) - */ - static class Escaped extends BaseScalar { - - /** - * Original unescaped scalar. - */ - private final Scalar original; - - /** - * Ctor. - * @param original Unescaped scalar. - */ - Escaped(final Scalar original) { - this.original = original; - } - - @Override - public String value() { - final String value = this.original.value(); - String toEscape; - if(value == null) { - toEscape = "null"; - } else { - toEscape = value; - } - boolean alreadyEscaped = (toEscape.startsWith("'") && toEscape.endsWith("'")) - || (toEscape.startsWith("\"") && toEscape.endsWith("\"")); - final String needsEscaping = ".*[?\\-#:>|$%&{}\\[\\]@`!*,'\"]+.*|[ ]+|null"; - if (!alreadyEscaped && toEscape.matches(needsEscaping)) { - if(toEscape.contains("\"")) { - toEscape = "'" + toEscape + "'"; - } else { - toEscape = "\"" + toEscape + "\""; - } - } - return toEscape; - } - - @Override - public Comment comment() { - return this.original.comment(); - } - } } diff --git a/src/test/java/com/amihaiemil/eoyaml/RtYamlPrinterTest.java b/src/test/java/com/amihaiemil/eoyaml/RtYamlPrinterTest.java index 82486045..be124b43 100644 --- a/src/test/java/com/amihaiemil/eoyaml/RtYamlPrinterTest.java +++ b/src/test/java/com/amihaiemil/eoyaml/RtYamlPrinterTest.java @@ -79,33 +79,4 @@ public void writerIsBeingClosed() throws Exception { ); } } - - /** - * {@link RtYamlPrinter.Escaped} escapes values when encounter special - * characters or when there are quotations inside and ignores when the - * values are already escaped with - * " or '. - */ - @Test - public void escapesWhenEncounterSpecialChars(){ - MatcherAssert.assertThat(new RtYamlPrinter - .Escaped(new PlainStringScalar("Some value?")).value(), - Matchers.equalTo("\"Some value?\"")); - MatcherAssert.assertThat(new RtYamlPrinter - .Escaped(new PlainStringScalar("Some value-")).value(), - Matchers.equalTo("\"Some value-\"")); - MatcherAssert.assertThat(new RtYamlPrinter - .Escaped(new PlainStringScalar("Some value#")).value(), - Matchers.equalTo("\"Some value#\"")); - MatcherAssert.assertThat(new RtYamlPrinter - .Escaped(new PlainStringScalar("'Some value'")).value(), - Matchers.equalTo("'Some value'")); - MatcherAssert.assertThat(new RtYamlPrinter - .Escaped(new PlainStringScalar("Some \"value\"|")) - .value(), - Matchers.equalTo("'Some \"value\"|'")); - MatcherAssert.assertThat(new RtYamlPrinter - .Escaped(new PlainStringScalar("\"Some value\"")).value(), - Matchers.equalTo("\"Some value\"")); - } }