From ea5bdb1500aab5a1fcba43518b1aa10cffd94a30 Mon Sep 17 00:00:00 2001
From: Alex Simkin <asimkin@atlassian.com>
Date: Mon, 28 May 2018 13:51:22 +1000
Subject: [PATCH] NodeSetView tidy up

---
 .../github/simy4/xpath/expr/Attribute.java    |  2 +-
 .../com/github/simy4/xpath/expr/Element.java  |  2 +-
 .../github/simy4/xpath/view/NodeSetView.java  | 19 ++++++++-----------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/xpath-to-xml-core/src/main/java/com/github/simy4/xpath/expr/Attribute.java b/xpath-to-xml-core/src/main/java/com/github/simy4/xpath/expr/Attribute.java
index b716d284..da0f811e 100644
--- a/xpath-to-xml-core/src/main/java/com/github/simy4/xpath/expr/Attribute.java
+++ b/xpath-to-xml-core/src/main/java/com/github/simy4/xpath/expr/Attribute.java
@@ -32,7 +32,7 @@ public Attribute(QName attribute, Iterable<Expr> predicates) {
     <N extends Node> IterableNodeView<N> resolveStep(ViewContext<N> context) throws XmlBuilderException {
         final Navigator<N> navigator = context.getNavigator();
         final N parentNode = context.getCurrent().getNode();
-        IterableNodeView<N> result = NodeSetView.filtered(navigator.attributesOf(parentNode), filter);
+        IterableNodeView<N> result = new NodeSetView<N>(navigator.attributesOf(parentNode), filter);
         if (context.isGreedy() && !context.hasNext() && !result.toBoolean()) {
             result = createStepNode(context);
         }
diff --git a/xpath-to-xml-core/src/main/java/com/github/simy4/xpath/expr/Element.java b/xpath-to-xml-core/src/main/java/com/github/simy4/xpath/expr/Element.java
index ad94b846..a22eb661 100644
--- a/xpath-to-xml-core/src/main/java/com/github/simy4/xpath/expr/Element.java
+++ b/xpath-to-xml-core/src/main/java/com/github/simy4/xpath/expr/Element.java
@@ -32,7 +32,7 @@ public Element(QName element, Iterable<Expr> predicates) {
     <N extends Node> IterableNodeView<N> resolveStep(ViewContext<N> context) throws XmlBuilderException {
         final Navigator<N> navigator = context.getNavigator();
         final N parentNode = context.getCurrent().getNode();
-        IterableNodeView<N> result = NodeSetView.filtered(navigator.elementsOf(parentNode), filter);
+        IterableNodeView<N> result = new NodeSetView<N>(navigator.elementsOf(parentNode), filter);
         if (context.isGreedy() && !context.hasNext() && !result.toBoolean()) {
             result = createStepNode(context);
         }
diff --git a/xpath-to-xml-core/src/main/java/com/github/simy4/xpath/view/NodeSetView.java b/xpath-to-xml-core/src/main/java/com/github/simy4/xpath/view/NodeSetView.java
index 26965104..1768e3d8 100644
--- a/xpath-to-xml-core/src/main/java/com/github/simy4/xpath/view/NodeSetView.java
+++ b/xpath-to-xml-core/src/main/java/com/github/simy4/xpath/view/NodeSetView.java
@@ -21,27 +21,24 @@ public static <T extends Node> NodeSetView<T> empty() {
         return (NodeSetView<T>) EMPTY_NODE_SET;
     }
 
+    private final Iterable<NodeView<N>> nodeSet;
+
     /**
-     * Creates filtered node view from given nodes and predicate.
+     * Creates NodeSetView from given nodes and predicate.
      *
      * @param nodes     nodes to wap in a view
      * @param predicate predicate to apply to nodes
-     * @param <T> XML model type
-     * @return newly created node set view
      */
-    public static <T extends Node> NodeSetView<T> filtered(final Iterable<? extends T> nodes,
-                                                           final Predicate<? super T> predicate) {
-        return new NodeSetView<T>(new Iterable<NodeView<T>>() {
+    public NodeSetView(final Iterable<? extends N> nodes, final Predicate<? super N> predicate) {
+        this(new Iterable<NodeView<N>>() {
             @Override
-            public Iterator<NodeView<T>> iterator() {
-                return new TransformingIterator<T, NodeView<T>>(
-                        new FilteringIterator<T>(nodes.iterator(), predicate), new NodeWrapper<T>());
+            public Iterator<NodeView<N>> iterator() {
+                return new TransformingIterator<N, NodeView<N>>(new FilteringIterator<N>(nodes.iterator(), predicate),
+                        new NodeWrapper<N>());
             }
         });
     }
 
-    private final Iterable<NodeView<N>> nodeSet;
-
     public NodeSetView(Iterable<NodeView<N>> nodeSet) {
         this.nodeSet = nodeSet;
     }