Merge remote-tracking branch 'origin/master'

assira/src/main/java/net/ranides/assira/text/StrBuffer.java

@@ -487,11 +487,6 @@ public class StrBuffer implements Appendable, CharSequence, Serializable {
 
         private String close = "";
 
-        @Override
-        public StrBuilder builder() {
-            throw new UnsupportedOperationException();
-        }
-
         @Override
         public String endl() {
             return endl;

assira/src/main/java/net/ranides/assira/text/StrBuilder.java

@@ -668,11 +668,6 @@ public final class StrBuilder implements CharSequence, Appendable, Serializable
             return state;
         }
 
-        @Override
-        public StrBuilder builder() {
-            return StrBuilder.this;
-        }
-        
         @Override
         public String blank() {
             return ValueUtils.or(blank, parent.blank());

assira/src/main/java/net/ranides/assira/text/StrBuilderOptions.java

@@ -21,11 +21,7 @@ public class StrBuilderOptions implements Serializable {
     protected StrBuilderOptions() {
         // do nothing
     }
-    
-    public StrBuilder builder() {
-        throw new UnsupportedOperationException();
-    }
-    
+
     public String blank() {
         return null;
     }

assira/src/test/java/net/ranides/assira/text/StrBufferTest.java

@@ -96,10 +96,7 @@ public class StrBufferTest {
         assertThrows(UnsupportedOperationException.class, ()->{
             sb.options().blank("b1");
         });
-        assertThrows(UnsupportedOperationException.class, ()->{
-            sb.options().builder();
-        });
-        
+
         sb
             .options().endl("o1").separator("c1");
         sb

assira/src/test/java/net/ranides/assira/text/StrBuilderTest.java

@@ -34,14 +34,12 @@ public class StrBuilderTest {
         List<Integer> list3 = Arrays.asList(3,4,5);
         
         StrBuilder sb = new StrBuilder();
+        sb.options().open("{ ").close(" }").separator(",");
         sb
-            .options()
-                .open("{ ").close(" }").separator(",")
-            .builder()
-                .open().append(list1, Integer::toHexString).close()
-                .endl()
-                .open().append(array.length, i -> Integer.toHexString(array[i])).close()
-                .endl();
+            .open().append(list1, Integer::toHexString).close()
+            .endl()
+            .open().append(array.length, i -> Integer.toHexString(array[i])).close()
+            .endl();
         sb
             .open("<", ">", ":").append(list2).close()
             .endl()
@@ -72,7 +70,8 @@ public class StrBuilderTest {
         
         List<Integer> list = Arrays.asList(1,2,3);
         sb
-            .options().open("{").close("}").separator("-").builder()
+            .options().open("{").close("}").separator("-");
+        sb
             .open().append(list).close().append(" ")
             .open("<", ">", "+").append(list).append(" ")
                 .open("(", ")").append(list).append(" ")
@@ -91,12 +90,9 @@ public class StrBuilderTest {
     public void testOptions() {
         StrBuilder sb = new StrBuilder();
         
-        sb
-            .options().blank("b1").endl("o1").separator("c1").builder()
-            .open()
-                .options().blank("b2").endl("o2").builder()
-                .open()
-                    .options().blank("b3").builder();
+        sb.options().blank("b1").endl("o1").separator("c1");
+        sb.open().options().blank("b2").endl("o2");
+        sb.open().options().blank("b3");
         
         assertEquals("{ blank='62 33', endl='6F 32', separator='63 31', open='', close='' }", sb.options().toString());
         sb.close();
@@ -106,12 +102,9 @@ public class StrBuilderTest {
         
         assertThrows(IllegalStateException.class, sb::close);
         
-        sb
-            .options().blank("b1").endl("o1").separator("c1").builder()
-            .open()
-                .options().blank("b2").endl("o2").builder()
-                .open()
-                    .options().blank("b3").builder();
+        sb.options().blank("b1").endl("o1").separator("c1");
+        sb.open().options().blank("b2").endl("o2");
+        sb.open().options().blank("b3");
         sb.clear();
         assertEquals("{ blank='62 33', endl='6F 32', separator='63 31', open='', close='' }", sb.options().toString());