cqfn#397 CR

HDouss · Feb 29, 2020 · cefd42b · cefd42b
1 parent 0720b3b
commit cefd42b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/src/main/java/org/jpeek/graph/Node.java b/src/main/java/org/jpeek/graph/Node.java
@@ -42,7 +42,7 @@ public interface Node {
      * Calculates ingoing and outgoing connected nodes.
      * @return List of nodes connected to this node.
      */
-    List<Node> connected();
+    List<Node> connections();
 
     /**
      * Simple implementation.
@@ -74,7 +74,7 @@ public String name() {
         }
 
         @Override
-        public List<Node> connected() {
+        public List<Node> connections() {
             return this.connect;
         }
     }

diff --git a/src/main/java/org/jpeek/graph/XmlGraph.java b/src/main/java/org/jpeek/graph/XmlGraph.java
@@ -25,8 +25,8 @@
 
 import com.jcabi.xml.XML;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
+import org.cactoos.list.Mapped;
 import org.cactoos.text.Joined;
 import org.jpeek.skeleton.Skeleton;
 
@@ -62,19 +62,14 @@ public List<Node> nodes() {
      * @throws IOException If fails
      */
     private static List<Node> build(final Skeleton skeleton) throws IOException {
-        final List<XML> methods = skeleton.xml().nodes(
-            "//methods/method[@ctor='false' and @abstract='false']"
+        return new Mapped<XML, Node>(
+            method -> new Node.Simple(
+                new Joined(
+                    "", method.xpath("@name").get(0), method.xpath("@desc").get(0)
+                ).asString()
+            ), skeleton.xml().nodes(
+                "//methods/method[@ctor='false' and @abstract='false']"
+            )
         );
-        final List<Node> result = new ArrayList<>(methods.size());
-        for (final XML method:methods) {
-            result.add(
-                new Node.Simple(
-                    new Joined(
-                        "", method.xpath("@name").get(0), method.xpath("@desc").get(0)
-                    ).asString()
-                )
-            );
-        }
-        return result;
     }
 }