fix right angle yaml

datastructures-yaml-tiny/src/main/java/module-info.java

@@ -5,6 +5,5 @@ module org.xbib.datastructures.yaml.tiny {
     exports org.xbib.datastructures.yaml.tiny;
     requires org.xbib.datastructures.api;
     requires org.xbib.datastructures.tiny;
-    requires java.logging;
     provides DataStructure with Yaml;
 }

datastructures-yaml-tiny/src/main/java/org/xbib/datastructures/yaml/tiny/Lexer.java

@@ -84,8 +84,7 @@ public class Lexer {
                 if (indent > prevToken.getDepth()) {
                     do {
                         valueTokens.add(token);
-                    }
+                    } while ((token = nextToken()) != null && token.getDepth() > prevToken.getDepth());
-                    while ((token = nextToken()) != null && token.getDepth() > prevToken.getDepth());
                     nextToken = token;
                     StringBuilder sb = new StringBuilder();
                     boolean lf = false;
@@ -131,7 +130,15 @@ public class Lexer {
         if (isEOL()) {
             return nextToken();
         }
-        if (isText()) {
+        if (isPipe()) {
+            indent = index;
+            read();
+            return new Token(TokenType.PIPE, indent);
+        } else if (isRAngle()) {
+            indent = index;
+            read();
+            return new Token(TokenType.ANGLE, indent);
+        } else if (isText()) {
             indent = index;
             value = extractText();
             if (isColon() && hasRightGap()) {
@@ -150,14 +157,6 @@ public class Lexer {
             indent = index;
             read(2);
             return new Token(TokenType.ITEM, indent);
-        } else if (isPipe()) {
-            indent = index;
-            read();
-            return new Token(TokenType.PIPE, indent);
-        } else if (isRAngle()) {
-            indent = index;
-            read();
-            return new Token(TokenType.ANGLE, indent);
         } else if (isDocumentStart()) {
             read(3);
             return new Token(TokenType.DOCUMENT_START, 0);

datastructures-yaml-tiny/src/main/java/org/xbib/datastructures/yaml/tiny/ValueNode.java

@@ -4,8 +4,6 @@ import org.xbib.datastructures.api.Node;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class ValueNode implements org.xbib.datastructures.api.ValueNode {
 

datastructures-yaml-tiny/src/main/java/org/xbib/datastructures/yaml/tiny/YamlParser.java

@@ -8,15 +8,11 @@ import java.io.Reader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import static org.xbib.datastructures.yaml.tiny.TokenType.ITEM;
 
 public class YamlParser implements Parser {
 
-    private static final Logger logger = Logger.getLogger(YamlParser.class.getName());
-
     private final List<Token> comments;
 
     private Lexer lexer;

settings-datastructures-yaml/src/main/java/org/xbib/settings/datastructures/yaml/YamlSettingsLoader.java

@@ -25,7 +25,7 @@ public class YamlSettingsLoader extends AbstractSettingsLoader {
 
     @Override
     public Map<String, String> load(String source) throws IOException {
-        // replace tabs with whitespace (yaml does not accept tabs, but many users might use it still...)
+        // replace tabs with two whitespace (yaml does not accept tabs, but many users might use it still...)
         return super.load(source.replace("\t", "  "));
     }
 }

settings-datastructures-yaml/src/test/java/org/xbib/settings/datastructures/yaml/test/YamlSettingsTest.java

@@ -50,18 +50,18 @@ public class YamlSettingsTest {
 
     @Test
     public void testRightAngleString() throws IOException {
-        String s = "test: >\n   this is a\n   multiline\n   string\na: b\b";
+        String s = "test: >\n   this is a\n   right-angle multiline\n   string\na: b\b";
         SettingsLoader loader = new YamlSettingsLoader();
         Map<String, String> map = loader.load(s);
-        assertEquals("{test=this is a multiline string, a=b}", map.toString());
+        assertEquals("{test=this is a right-angle multiline string, a=b}", map.toString());
     }
 
     @Test
     public void testPipeString() throws IOException {
-        String s = "test: |\n   this is a\n   multiline\n   string\na: b\b";
+        String s = "test: |\n   this is a\n   pipe multiline\n   string\na: b\b";
         SettingsLoader loader = new YamlSettingsLoader();
         Map<String, String> map = loader.load(s);
-        assertEquals("{test=this is a\nmultiline\nstring, a=b}", map.toString());
+        assertEquals("{test=this is a\npipe multiline\nstring, a=b}", map.toString());
     }
 
     @Test

settings-datastructures-yaml/src/test/resources/logging.properties

@@ -0,0 +1,5 @@
+handlers=java.util.logging.ConsoleHandler
+.level=ALL
+java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
+java.util.logging.ConsoleHandler.level=ALL
+java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter