#62 extra ctors

yegor256 · Nov 30, 2022 · 0d6b2bd · 0d6b2bd
1 parent b3c2412
commit 0d6b2bd
Show file tree

Hide file tree

Showing 17 changed files with 71 additions and 18 deletions.
diff --git a/src/main/java/com/yegor256/xsline/TrAfter.java b/src/main/java/com/yegor256/xsline/TrAfter.java
@@ -43,6 +43,15 @@ public final class TrAfter implements Train<Shift> {
      */
     private final Shift shift;
 
+    /**
+     * Ctor.
+     * @param fun The shift
+     * @since 0.18.0
+     */
+    public TrAfter(final Shift fun) {
+        this(new TrDefault<>(), fun);
+    }
+
     /**
      * Ctor.
      * @param train Original

diff --git a/src/main/java/com/yegor256/xsline/TrBefore.java b/src/main/java/com/yegor256/xsline/TrBefore.java
@@ -43,6 +43,15 @@ public final class TrBefore implements Train<Shift> {
      */
     private final Shift shift;
 
+    /**
+     * Ctor.
+     * @param fun The shift
+     * @since 0.18.0
+     */
+    public TrBefore(final Shift fun) {
+        this(new TrDefault<>(), fun);
+    }
+
     /**
      * Ctor.
      * @param train Original

diff --git a/src/main/java/com/yegor256/xsline/TrFast.java b/src/main/java/com/yegor256/xsline/TrFast.java
@@ -38,6 +38,14 @@
  */
 public final class TrFast extends TrEnvelope {
 
+    /**
+     * Ctor.
+     * @since 0.18.0
+     */
+    public TrFast() {
+        this(new TrDefault<>());
+    }
+
     /**
      * Ctor.
      * @param train Original

diff --git a/src/main/java/com/yegor256/xsline/TrLambda.java b/src/main/java/com/yegor256/xsline/TrLambda.java
@@ -47,6 +47,15 @@ public final class TrLambda implements Train<Shift> {
      */
     private final FuncChecked<Shift, Shift> lambda;
 
+    /**
+     * Ctor.
+     * @param fun The function
+     * @since 0.18.0
+     */
+    public TrLambda(final FuncChecked<Shift, Shift> fun) {
+        this(new TrDefault<>(), fun);
+    }
+
     /**
      * Ctor.
      * @param train Original

diff --git a/src/main/java/com/yegor256/xsline/TrLogged.java b/src/main/java/com/yegor256/xsline/TrLogged.java
@@ -34,6 +34,14 @@
  */
 public final class TrLogged extends TrEnvelope {
 
+    /**
+     * Ctor.
+     * @since 0.18.0
+     */
+    public TrLogged() {
+        this(new TrDefault<>());
+    }
+
     /**
      * Ctor.
      * @param train Original

diff --git a/src/main/java/com/yegor256/xsline/TrMapped.java b/src/main/java/com/yegor256/xsline/TrMapped.java
@@ -47,6 +47,15 @@ public final class TrMapped<I, T extends Shift> implements Train<I>, Train.Tempo
      */
     private final Function<I, T> func;
 
+    /**
+     * Ctor.
+     * @param fun Mapping function
+     * @since 0.18.0
+     */
+    public TrMapped(final Function<I, T> fun) {
+        this(new TrDefault<>(), fun);
+    }
+
     /**
      * Ctor.
      * @param train Original

diff --git a/src/main/java/com/yegor256/xsline/TrXSL.java b/src/main/java/com/yegor256/xsline/TrXSL.java
@@ -60,6 +60,16 @@ public final class TrXSL<T extends Shift> implements Train<XSL>, Train.Temporary
 
     /**
      * Ctor.
+     *
+     * @since 0.18.0
+     */
+    public TrXSL() {
+        this(new TrDefault<>());
+    }
+
+    /**
+     * Ctor.
+     *
      * @param train Original
      */
     public TrXSL(final Train<T> train) {

diff --git a/src/test/java/com/yegor256/xsline/StSequenceTest.java b/src/test/java/com/yegor256/xsline/StSequenceTest.java
@@ -42,7 +42,7 @@ void shouldStopPipeline() {
         final Train<Shift> train = new TrDefault<Shift>().with(
             new StSequence(
                 xml -> xml.nodes("/x[text()='{{{hello}}}']").isEmpty(),
-                new TrClasspath<>(new TrDefault<>())
+                new TrClasspath<>()
                     .with("add-brackets.xsl")
                     .with("add-brackets.xsl")
                     .with("add-brackets.xsl")

diff --git a/src/test/java/com/yegor256/xsline/TrAfterTest.java b/src/test/java/com/yegor256/xsline/TrAfterTest.java
@@ -40,7 +40,6 @@ final class TrAfterTest {
     @Test
     void simpleScenario() {
         final Train<Shift> train = new TrAfter(
-            new TrDefault<>(),
             new StLambda(
                 (position, xml) -> new XMLDocument(
                     new Xembler(

diff --git a/src/test/java/com/yegor256/xsline/TrBeforeTest.java b/src/test/java/com/yegor256/xsline/TrBeforeTest.java
@@ -40,7 +40,6 @@ final class TrBeforeTest {
     @Test
     void simpleScenario() {
         final Train<Shift> train = new TrBefore(
-            new TrDefault<>(),
             new StLambda(
                 (position, xml) -> new XMLDocument(
                     new Xembler(

diff --git a/src/test/java/com/yegor256/xsline/TrBulkTest.java b/src/test/java/com/yegor256/xsline/TrBulkTest.java
@@ -38,7 +38,7 @@ final class TrBulkTest {
     @Test
     void simpleScenario() {
         MatcherAssert.assertThat(
-            new TrBulk<>(new TrClasspath<>(new TrFast(new TrDefault<>())))
+            new TrBulk<>(new TrClasspath<>(new TrFast()))
                 .with(Arrays.asList("add-brackets.xsl", "void.xsl"))
                 .back()
                 .back()
@@ -52,7 +52,7 @@ void allInCtor() {
         MatcherAssert.assertThat(
             new TrWith(
                 new TrBulk<>(
-                    new TrClasspath<>(new TrDefault<>()),
+                    new TrClasspath<>(),
                     "add-brackets.xsl",
                     "void.xsl"
                 ).back().back(),

diff --git a/src/test/java/com/yegor256/xsline/TrClasspathTest.java b/src/test/java/com/yegor256/xsline/TrClasspathTest.java
@@ -37,7 +37,7 @@ final class TrClasspathTest {
     @Test
     void simpleScenario() {
         MatcherAssert.assertThat(
-            new TrClasspath<>(new TrDefault<>())
+            new TrClasspath<>()
                 .with("add-brackets.xsl")
                 .back()
                 .with(new StEndless(new StClasspath("void.xsl"))),
@@ -49,7 +49,6 @@ void simpleScenario() {
     void withCtor() {
         MatcherAssert.assertThat(
             new TrClasspath<>(
-                new TrDefault<>(),
                 "add-brackets.xsl",
                 "add-id.xsl"
             ).back().with(new StEndless(new StClasspath("void.xsl"))),

diff --git a/src/test/java/com/yegor256/xsline/TrFastTest.java b/src/test/java/com/yegor256/xsline/TrFastTest.java
@@ -37,9 +37,7 @@ final class TrFastTest {
     void simpleScenario() {
         new Xsline(
             new TrFast(
-                new TrClasspath<>(
-                    new TrDefault<>()
-                ).with("add-brackets.xsl").back(),
+                new TrClasspath<>().with("add-brackets.xsl").back(),
                 TrFastTest.class,
                 1L
             )

diff --git a/src/test/java/com/yegor256/xsline/TrLambdaTest.java b/src/test/java/com/yegor256/xsline/TrLambdaTest.java
@@ -88,7 +88,6 @@ void withStLambda() {
     @Test
     void withListOfPostProcessing() {
         final Train<Shift> train = new TrLambda(
-            new TrDefault<>(),
             shift -> new StAfter(
                 shift,
                 new StLambda(
@@ -114,7 +113,7 @@ void withListOfPostProcessing() {
     void shouldReturnEmptyTrain() {
         MatcherAssert.assertThat(
             new TrLambda(
-                new TrDefault<>(), shift -> new StLambda(
+                shift -> new StLambda(
                     shift::uid,
                     (pos, xml) -> TrLambdaTest.ADD_ID.apply(0, xml)
                 )
@@ -129,7 +128,6 @@ void shouldThrowsExceptions() {
             IllegalArgumentException.class,
             () -> new Xsline(
                 new TrLambda(
-                    new TrDefault<>(),
                     shift -> new StLambda(
                         (pos, xml) -> new StClasspath("not-found").apply(pos, xml)
                     )
@@ -140,7 +138,6 @@ void shouldThrowsExceptions() {
             IllegalStateException.class,
             () -> new Xsline(
                 new TrLambda(
-                    new TrDefault<>(),
                     shift -> {
                         final BufferedReader inp = new BufferedReader(new StringReader("test"));
                         inp.close();

diff --git a/src/test/java/com/yegor256/xsline/TrMappedTest.java b/src/test/java/com/yegor256/xsline/TrMappedTest.java
@@ -41,7 +41,6 @@ void simpleScenario() {
         MatcherAssert.assertThat(
             new Xsline(
                 new TrMapped<>(
-                    new TrDefault<>(),
                     (Function<String, Shift>) StClasspath::new
                 ).with("add-brackets.xsl").back()
             ).pass(new XMLDocument("<x>hello</x>")),

diff --git a/src/test/java/com/yegor256/xsline/TrXSLTest.java b/src/test/java/com/yegor256/xsline/TrXSLTest.java
@@ -42,7 +42,7 @@ final class TrXSLTest {
     @Test
     void testPipe() throws IOException {
         final XSL xsl = new XSLDocument(this.getClass().getResource("void.xsl"));
-        final Train<Shift> train = new TrXSL<>(new TrDefault<>())
+        final Train<Shift> train = new TrXSL<>()
             .with(xsl)
             .back();
         MatcherAssert.assertThat(train, Matchers.iterableWithSize(1));
@@ -53,7 +53,7 @@ void shouldThrow() throws IOException {
         final XSL xsl = new XSLDocument(this.getClass().getResource("add-brackets.xsl"));
         Assertions.assertThrows(
             UnsupportedOperationException.class,
-            () -> new TrXSL<>(new TrDefault<>())
+            () -> new TrXSL<>()
                 .with(xsl)
                 .iterator()
         );

diff --git a/src/test/java/com/yegor256/xsline/XslineTest.java b/src/test/java/com/yegor256/xsline/XslineTest.java
@@ -44,7 +44,7 @@ void simpleScenario() throws IOException {
         final XSL xsl = new XSLDocument(
             this.getClass().getResource("add-brackets.xsl")
         );
-        final Train<Shift> train = new TrLogged(new TrDefault<>())
+        final Train<Shift> train = new TrLogged()
             .with(
                 new StEndless(
                     new XSLDocument(