@@ -23,60 +23,61 @@ import org.yaml.snakeyaml.parser.ParserImpl
2323import org.yaml.snakeyaml.reader.StreamReader
2424import org.yaml.snakeyaml.scanner.ScannerImpl
2525
26- import java.nio.charset.StandardCharsets
26+ trait YamlTest {
2727
28- interface YamlTest {
29-
30- default CommentedConfigurationNode parseString(final String input) {
28+ CommentedConfigurationNode parseString(final String input) {
3129 // Print events
3230 def scanner = new ScannerImpl (new StreamReader (input))
33- scanner. emitComments = true
31+ scanner. parseComments = true
3432 scanner. acceptTabs = true
3533 def parser = new ParserImpl (scanner)
36- do {
34+
35+ while (true ) {
3736 println parser. getEvent()
38- } while (parser. peekEvent())
37+ if (! parser. peekEvent()) break
38+ }
3939
4040 final YamlParserComposer loader = new YamlParserComposer (new StreamReader (input), Yaml11Tags . REPOSITORY , true )
4141 final CommentedConfigurationNode result = CommentedConfigurationNode . root()
4242 loader. singleDocumentStream(result)
4343 return result
4444 }
4545
46- default CommentedConfigurationNode parseResource(final URL url) {
46+ CommentedConfigurationNode parseResource(final URL url) {
4747 // Print events
4848 url. openStream(). withReader(' UTF-8' ) {reader ->
4949 def scanner = new ScannerImpl (new StreamReader (reader))
50- scanner. emitComments = true
50+ scanner. parseComments = true
5151 scanner. acceptTabs = true
5252 def parser = new ParserImpl (scanner)
53- do {
53+ while ( true ) {
5454 println parser. getEvent()
55- } while (parser. peekEvent())
55+ if (! parser. peekEvent()) break
56+ }
5657 }
5758
5859 assertNotNull (url, " Expected resource is missing" )
59- try ( BufferedReader reader = new BufferedReader ( new InputStreamReader ( url. openStream(), StandardCharsets . UTF_8 ))) {
60+ url. openStream(). withReader( ' UTF-8 ' ) { reader ->
6061 final YamlParserComposer loader = new YamlParserComposer (new StreamReader (reader), Yaml11Tags . REPOSITORY , true )
6162 final CommentedConfigurationNode result = CommentedConfigurationNode . root()
6263 loader. singleDocumentStream(result)
6364 return result
6465 }
6566 }
6667
67- default String dump(final CommentedConfigurationNode input) {
68+ String dump(final CommentedConfigurationNode input) {
6869 return dump(input, null )
6970 }
7071
71- default String dump(final CommentedConfigurationNode input, final NodeStyle preferredStyle) {
72+ String dump(final CommentedConfigurationNode input, final NodeStyle preferredStyle) {
7273 return YamlConfigurationLoader . builder()
7374 .nodeStyle(preferredStyle)
7475 .indent(2 )
7576 .commentsEnabled(true )
7677 .buildAndSaveString(input)
7778 }
7879
79- default String normalize(final String input) {
80+ String normalize(final String input) {
8081 return input. stripIndent(true )
8182 }
8283
0 commit comments