refactor

Author: l3r8yJ

.gitignore

@@ -22,3 +22,6 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 replay_pid*
+
+target
+.idea

src/main/java/io/github/eocqrs/cmig/State.java

@@ -22,19 +22,17 @@
 
 package io.github.eocqrs.cmig;
 
+import io.github.eocqrs.cmig.sha.StateChanges;
 import org.cactoos.Scalar;
-/*
- * @todo #32:30m/DEV design State interface
- */
 
 /**
  * State.
  *
  * @author Aliaksei Bialiauski ([email protected])
  * @since 0.0.0
  */
-public interface State extends Scalar<String> {
-
+public interface State extends Scalar<StateChanges> {
   @Override
-  String value() throws Exception;
+  StateChanges value();
+
 }

src/main/java/io/github/eocqrs/cmig/meta/Author.java

@@ -24,7 +24,7 @@
 
 import com.jcabi.xml.XML;
 import com.jcabi.xml.XMLDocument;
-import org.cactoos.Scalar;
+import org.cactoos.Text;
 import org.cactoos.io.ResourceOf;
 
 /**
@@ -33,7 +33,7 @@
  * @author Aliaksei Bialiauski ([email protected])
  * @since 0.0.0
  */
-public final class Author implements Scalar<String> {
+public final class Author implements Text {
 
   /**
    * XML.
@@ -75,7 +75,7 @@ public Author(final String name, final String id)
   }
 
   @Override
-  public String value() throws Exception {
+  public String asString() {
     return this.xml.xpath(
       "/states/changeState[@id='%s']/@author"
         .formatted(

src/main/java/io/github/eocqrs/cmig/meta/Names.java

@@ -76,7 +76,7 @@ public Names(final String name, final String id)
   }
 
   @Override
-  public List<String> value() throws Exception {
+  public List<String> value() {
     return this.xml.xpath(
       "/states/changeState[@id='%s']/files/file/@path"
         .formatted(

src/main/java/io/github/eocqrs/cmig/meta/XpathList.java

@@ -35,5 +35,5 @@
 public interface XpathList extends Scalar<List<String>> {
 
   @Override
-  List<String> value() throws Exception;
+  List<String> value();
 }

src/main/java/io/github/eocqrs/cmig/session/Cassandra.java

@@ -37,7 +37,7 @@
 public interface Cassandra extends Scalar<Session>, Closeable {
 
   @Override
-  Session value() throws Exception;
+  Session value();
 
   @Override
   void close() throws IOException;

src/main/java/io/github/eocqrs/cmig/session/Cql.java

@@ -33,7 +33,6 @@ public interface Cql {
   /**
    * Apply Query.
    *
-   * @throws Exception if something went wrong.
    */
-  void apply() throws Exception;
+  void apply();
 }

src/main/java/io/github/eocqrs/cmig/session/InFile.java

@@ -57,12 +57,12 @@ public InFile(
   }
 
   @Override
-  public void apply() throws Exception {
+  public void apply() {
     this.cassandra.value()
       .execute(
         new TextOf(
           new ResourceOf(this.name)
-        ).asString()
+        ).toString()
       );
   }
 }

src/main/java/io/github/eocqrs/cmig/session/Simple.java

@@ -68,12 +68,12 @@ public Simple(
   }
 
   @Override
-  public Session value() throws Exception {
+  public Session value() {
     return this.cluster.connect();
   }
 
   @Override
-  public void close() throws IOException {
+  public void close() {
     this.cluster.close();
   }
 }

src/main/java/io/github/eocqrs/cmig/sha/Sha.java

@@ -42,10 +42,12 @@ public final class Sha implements Text {
    * State ID.
    */
   private final String id;
+
   /**
    * Master file.
    */
   private final String master;
+
   /**
    * CMIG directory.
    */

src/main/java/io/github/eocqrs/cmig/sha/StateChanges.java

@@ -25,7 +25,6 @@
 import io.github.eocqrs.cmig.meta.XpathList;
 import org.cactoos.Scalar;
 import org.cactoos.io.ResourceOf;
-import org.cactoos.list.ListOf;
 import org.cactoos.text.TextOf;
 
 import java.util.List;
@@ -42,6 +41,7 @@ public final class StateChanges implements Scalar<List<String>> {
    * XPATH lists.
    */
   private final XpathList list;
+
   /**
    * CMIG directory.
    */
@@ -60,21 +60,17 @@ public StateChanges(final XpathList lst, final String cmg) {
 
   @Override
   public List<String> value() throws Exception {
-    final List<String> contents = new ListOf<>();
-    final List<String> files = this.list.value();
-    for (final String file : files) {
-      final String content =
-        new TextOf(
+    return this.list.value()
+      .stream()
+      .map(
+        file -> new TextOf(
           new ResourceOf(
-            "%s/%s"
-              .formatted(
-                this.cmig,
-                file
-              )
+            "%s/%s".formatted(
+              this.cmig,
+              file
+            )
           )
-        ).asString();
-      contents.add(content);
-    }
-    return contents;
+        ).toString()
+      ).toList();
   }
 }

src/test/java/io/github/eocqrs/cmig/meta/AuthorTest.java

@@ -41,7 +41,7 @@ void readsAuthorInfoInRightFormat() throws Exception {
       new Author(
         "cmig/master.xml",
         "1"
-      ).value(),
+      ).asString(),
       new IsEqual<>(
         "test"
       )