[SHRINKDESC-88] Do not expose the Pattern/Query elements as part of t…

…he viewable SPI
shrinkwrap · Sep 7, 2011 · 7bd3e65 · 7bd3e65
1 parent 6197f87
commit 7bd3e65
Show file tree

Hide file tree

Showing 21 changed files with 57 additions and 81 deletions.
diff --git a/.../node/query/queries/AbsoluteGetQuery.java → ...descriptor/spi/node/AbsoluteGetQuery.java b/.../node/query/queries/AbsoluteGetQuery.java → ...descriptor/spi/node/AbsoluteGetQuery.java
@@ -14,16 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.spi.node.query.queries;
+package org.jboss.shrinkwrap.descriptor.spi.node;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.jboss.shrinkwrap.descriptor.spi.node.Node;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.Pattern;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.Query;
 
 /**
  * Form of {@link GetQuery} for retrieving nodes matching
@@ -36,13 +33,13 @@
  * @author <a href="mailto:alr@jboss.org">Andrew Lee Rubinger</a>
  * @author <a href="mailto:bartosz.majsak@gmail.com">Bartosz Majsak</a>
  */
-public enum AbsoluteGetQuery implements Query<List<Node>> {
+enum AbsoluteGetQuery implements Query<List<Node>> {
 
    INSTANCE;
 
    /**
     * {@inheritDoc}
-    * @see org.jboss.shrinkwrap.descriptor.spi.node.query.Query#execute(org.jboss.shrinkwrap.descriptor.spi.node.Node, org.jboss.shrinkwrap.descriptor.spi.node.query.Pattern[])
+    * @see org.jboss.shrinkwrap.descriptor.spi.node.Query#execute(org.jboss.shrinkwrap.descriptor.spi.node.Node, org.jboss.shrinkwrap.descriptor.spi.node.Pattern[])
     */
    @Override
    public List<Node> execute(final Node node, final Pattern... patterns) throws IllegalArgumentException

diff --git a/...query/queries/AbsoluteGetSingleQuery.java → ...ptor/spi/node/AbsoluteGetSingleQuery.java b/...query/queries/AbsoluteGetSingleQuery.java → ...ptor/spi/node/AbsoluteGetSingleQuery.java
@@ -14,13 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.spi.node.query.queries;
+package org.jboss.shrinkwrap.descriptor.spi.node;
 
 import java.util.List;
 
-import org.jboss.shrinkwrap.descriptor.spi.node.Node;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.Pattern;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.Query;
 
 /**
  * Form of {@link GetQuery} used as a convenience to retrieve
@@ -31,13 +28,13 @@
  * @author <a href="mailto:aslak@redhat.com">Aslak Knutsen</a>
  * @author <a href="mailto:andrew.rubinger@jboss.org">ALR</a>
  */
-public enum AbsoluteGetSingleQuery implements Query<Node> {
+enum AbsoluteGetSingleQuery implements Query<Node> {
 
    INSTANCE;
 
    /**
     * {@inheritDoc}
-    * @see org.jboss.shrinkwrap.descriptor.spi.node.query.Query#execute(org.jboss.shrinkwrap.descriptor.spi.node.Node, org.jboss.shrinkwrap.descriptor.spi.node.query.Pattern[])
+    * @see org.jboss.shrinkwrap.descriptor.spi.node.Query#execute(org.jboss.shrinkwrap.descriptor.spi.node.Node, org.jboss.shrinkwrap.descriptor.spi.node.Pattern[])
     */
    @Override
    public Node execute(final Node node, final Pattern... patterns)

diff --git a/...r/spi/node/query/queries/CreateQuery.java → ...wrap/descriptor/spi/node/CreateQuery.java b/...r/spi/node/query/queries/CreateQuery.java → ...wrap/descriptor/spi/node/CreateQuery.java
@@ -14,13 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.spi.node.query.queries;
+package org.jboss.shrinkwrap.descriptor.spi.node;
 
 import java.util.Map;
 
-import org.jboss.shrinkwrap.descriptor.spi.node.Node;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.Pattern;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.Query;
 
 /**
  * Creates the specified {@link Pattern}s starting at the specified
@@ -29,13 +26,13 @@
  * @author <a href="mailto:aslak@redhat.com">Aslak Knutsen</a>
  * @author <a href="mailto:andrew.rubinger@jboss.org">ALR</a>
  */
-public enum CreateQuery implements Query<Node> {
+enum CreateQuery implements Query<Node> {
 
    INSTANCE;
 
    /**
     * {@inheritDoc}
-    * @see org.jboss.shrinkwrap.descriptor.spi.node.query.Query#execute(org.jboss.shrinkwrap.descriptor.spi.node.Node, org.jboss.shrinkwrap.descriptor.spi.node.query.Pattern[])
+    * @see org.jboss.shrinkwrap.descriptor.spi.node.Query#execute(org.jboss.shrinkwrap.descriptor.spi.node.Node, org.jboss.shrinkwrap.descriptor.spi.node.Pattern[])
     */
    @Override
    public Node execute(final Node node, final Pattern... patterns)

diff --git a/.../node/query/queries/GetOrCreateQuery.java → ...descriptor/spi/node/GetOrCreateQuery.java b/.../node/query/queries/GetOrCreateQuery.java → ...descriptor/spi/node/GetOrCreateQuery.java
@@ -14,16 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.spi.node.query.queries;
+package org.jboss.shrinkwrap.descriptor.spi.node;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.shrinkwrap.descriptor.spi.node.Node;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.Pattern;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.Query;
 
 /**
  * Starting at the specified {@link Node}, either returns an
@@ -34,7 +31,7 @@
  * @author <a href="mailto:aslak@redhat.com">Aslak Knutsen</a>
  * @author <a href="mailto:andrew.rubinger@jboss.org">ALR</a>
  */
-public class GetOrCreateQuery implements Query<Node> {
+class GetOrCreateQuery implements Query<Node> {
 
    private static final Logger log = Logger.getLogger(GetOrCreateQuery.class.getName());
 
@@ -52,7 +49,7 @@ public static GetOrCreateQuery create()
 
    /**
     * {@inheritDoc}
-    * @see org.jboss.shrinkwrap.descriptor.spi.node.query.Query#execute(org.jboss.shrinkwrap.descriptor.spi.node.Node, org.jboss.shrinkwrap.descriptor.spi.node.query.Pattern[])
+    * @see org.jboss.shrinkwrap.descriptor.spi.node.Query#execute(org.jboss.shrinkwrap.descriptor.spi.node.Node, org.jboss.shrinkwrap.descriptor.spi.node.Pattern[])
     */
    @Override
    public Node execute(final Node node, final Pattern... patterns)

diff --git a/spi/src/main/java/org/jboss/shrinkwrap/descriptor/spi/node/Node.java b/spi/src/main/java/org/jboss/shrinkwrap/descriptor/spi/node/Node.java
@@ -22,12 +22,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jboss.shrinkwrap.descriptor.spi.node.query.Pattern;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.Patterns;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.queries.AbsoluteGetQuery;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.queries.CreateQuery;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.queries.GetOrCreateQuery;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.queries.AbsoluteGetSingleQuery;
 
 /**
  * {@link Node} is a data structure representing a container in a classic

diff --git a/...ap/descriptor/spi/node/query/Pattern.java → ...rinkwrap/descriptor/spi/node/Pattern.java b/...ap/descriptor/spi/node/query/Pattern.java → ...rinkwrap/descriptor/spi/node/Pattern.java
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.spi.node.query;
+package org.jboss.shrinkwrap.descriptor.spi.node;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jboss.shrinkwrap.descriptor.spi.node.Node;
 
 /**
  * A pattern that may be executed as part of a {@link Query} upon
@@ -32,7 +31,7 @@
  * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
  * @author <a href="mailto:andrew.rubinger@jboss.org">ALR</a>
  */
-public final class Pattern
+final class Pattern
 {
    //-------------------------------------------------------------------------------------||
    // Instance Members -------------------------------------------------------------------||

diff --git a/...p/descriptor/spi/node/query/Patterns.java → ...inkwrap/descriptor/spi/node/Patterns.java b/...p/descriptor/spi/node/query/Patterns.java → ...inkwrap/descriptor/spi/node/Patterns.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.spi.node.query;
+package org.jboss.shrinkwrap.descriptor.spi.node;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,7 +26,7 @@
  * @author <a href="mailto:aslak@redhat.com">Aslak Knutsen</a>
  * @version $Revision: $
  */
-public class Patterns
+class Patterns
 {
    private static final String PATH_SEPARATOR = "/";
 

diff --git a/...wrap/descriptor/spi/node/query/Query.java → ...shrinkwrap/descriptor/spi/node/Query.java b/...wrap/descriptor/spi/node/query/Query.java → ...shrinkwrap/descriptor/spi/node/Query.java
@@ -14,9 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.spi.node.query;
+package org.jboss.shrinkwrap.descriptor.spi.node;
 
-import org.jboss.shrinkwrap.descriptor.spi.node.Node;
 
 /**
  * Contract for something capable of executing a 
@@ -27,7 +26,7 @@
  * @author <a href="mailto:andrew.rubinger@jboss.org">ALR</a>
  * @param <T> Expected return value from executing a query
  */
-public interface Query<T>
+interface Query<T>
 {
    /** 
     * Queries the tree starting at the specified {@link Node}

diff --git a/...tor/spi/node/query/queries/QueryUtil.java → ...nkwrap/descriptor/spi/node/QueryUtil.java b/...tor/spi/node/query/queries/QueryUtil.java → ...nkwrap/descriptor/spi/node/QueryUtil.java
@@ -14,18 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.spi.node.query.queries;
+package org.jboss.shrinkwrap.descriptor.spi.node;
 
-import org.jboss.shrinkwrap.descriptor.spi.node.Node;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.Pattern;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.Query;
 
 /**
  * Helper util for building {@link Query} implementations
  *
  * @author <a href="mailto:andrew.rubinger@jboss.org">ALR</a>
  */
-public final class QueryUtil
+final class QueryUtil
 {
 
    //-------------------------------------------------------------------------------------||

diff --git a/.../node/query/queries/RelativeGetQuery.java → ...descriptor/spi/node/RelativeGetQuery.java b/.../node/query/queries/RelativeGetQuery.java → ...descriptor/spi/node/RelativeGetQuery.java
@@ -14,16 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.spi.node.query.queries;
+package org.jboss.shrinkwrap.descriptor.spi.node;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.jboss.shrinkwrap.descriptor.spi.node.Node;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.Pattern;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.Query;
 
 /**
  * Form of {@link GetQuery} for retrieving nodes matching
@@ -36,13 +33,13 @@
  * @author <a href="mailto:bartosz.majsak@gmail.com">Bartosz Majsak</a>
  * 
  */
-public enum RelativeGetQuery implements Query<List<Node>> {
+enum RelativeGetQuery implements Query<List<Node>> {
 
    INSTANCE;
 
    /**
     * {@inheritDoc}
-    * @see org.jboss.shrinkwrap.descriptor.spi.node.query.Query#execute(org.jboss.shrinkwrap.descriptor.spi.node.Node, org.jboss.shrinkwrap.descriptor.spi.node.query.Pattern[])
+    * @see org.jboss.shrinkwrap.descriptor.spi.node.Query#execute(org.jboss.shrinkwrap.descriptor.spi.node.Node, org.jboss.shrinkwrap.descriptor.spi.node.Pattern[])
     */
    @Override
    public List<Node> execute(final Node node, final Pattern... patterns) throws IllegalArgumentException

diff --git a/...query/queries/RelativeGetSingleQuery.java → ...ptor/spi/node/RelativeGetSingleQuery.java b/...query/queries/RelativeGetSingleQuery.java → ...ptor/spi/node/RelativeGetSingleQuery.java
@@ -14,13 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.spi.node.query.queries;
+package org.jboss.shrinkwrap.descriptor.spi.node;
 
 import java.util.List;
 
-import org.jboss.shrinkwrap.descriptor.spi.node.Node;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.Pattern;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.Query;
 
 /**
  * Form of {@link GetQuery} used as a convenience to retrieve
@@ -31,13 +28,13 @@
  * @author <a href="mailto:aslak@redhat.com">Aslak Knutsen</a>
  * @author <a href="mailto:andrew.rubinger@jboss.org">ALR</a>
  */
-public enum RelativeGetSingleQuery implements Query<Node> {
+enum RelativeGetSingleQuery implements Query<Node> {
 
    INSTANCE;
 
    /**
     * {@inheritDoc}
-    * @see org.jboss.shrinkwrap.descriptor.spi.node.query.Query#execute(org.jboss.shrinkwrap.descriptor.spi.node.Node, org.jboss.shrinkwrap.descriptor.spi.node.query.Pattern[])
+    * @see org.jboss.shrinkwrap.descriptor.spi.node.Query#execute(org.jboss.shrinkwrap.descriptor.spi.node.Node, org.jboss.shrinkwrap.descriptor.spi.node.Pattern[])
     */
    @Override
    public Node execute(final Node node, final Pattern... patterns)

diff --git a/.../node/query/AbsoluteGetQueryTestCase.java → ...or/spi/node/AbsoluteGetQueryTestCase.java b/.../node/query/AbsoluteGetQueryTestCase.java → ...or/spi/node/AbsoluteGetQueryTestCase.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.spi.node.query;
+package org.jboss.shrinkwrap.descriptor.spi.node;
 
-import static org.jboss.shrinkwrap.descriptor.spi.node.query.TestTreeBuilder.*;
+import static org.jboss.shrinkwrap.descriptor.spi.node.TestTreeBuilder.*;
 
 import java.util.List;
 
 import junit.framework.Assert;
 
+import org.jboss.shrinkwrap.descriptor.spi.node.AbsoluteGetQuery;
 import org.jboss.shrinkwrap.descriptor.spi.node.Node;
-import org.jboss.shrinkwrap.descriptor.spi.node.NodeAssert;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.queries.AbsoluteGetQuery;
+import org.jboss.shrinkwrap.descriptor.spi.node.Pattern;
 import org.junit.Test;
 
 public class AbsoluteGetQueryTestCase

diff --git a/...query/AbsoluteGetSingleQueryTestCase.java → .../node/AbsoluteGetSingleQueryTestCase.java b/...query/AbsoluteGetSingleQueryTestCase.java → .../node/AbsoluteGetSingleQueryTestCase.java
@@ -14,14 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.spi.node.query;
+package org.jboss.shrinkwrap.descriptor.spi.node;
 
-import static org.jboss.shrinkwrap.descriptor.spi.node.query.TestTreeBuilder.*;
+import static org.jboss.shrinkwrap.descriptor.spi.node.TestTreeBuilder.*;
 
 import junit.framework.Assert;
 
+import org.jboss.shrinkwrap.descriptor.spi.node.AbsoluteGetSingleQuery;
 import org.jboss.shrinkwrap.descriptor.spi.node.Node;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.queries.AbsoluteGetSingleQuery;
+import org.jboss.shrinkwrap.descriptor.spi.node.Patterns;
 import org.junit.Test;
 
 /**

diff --git a/.../node/query/GetOrCreateQueryTestCase.java → ...or/spi/node/GetOrCreateQueryTestCase.java b/.../node/query/GetOrCreateQueryTestCase.java → ...or/spi/node/GetOrCreateQueryTestCase.java
@@ -14,15 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.spi.node.query;
+package org.jboss.shrinkwrap.descriptor.spi.node;
+
+import static org.jboss.shrinkwrap.descriptor.spi.node.TestTreeBuilder.*;
 
-import static org.jboss.shrinkwrap.descriptor.spi.node.query.TestTreeBuilder.*;
 import java.util.List;
 
 import junit.framework.Assert;
 
+import org.jboss.shrinkwrap.descriptor.spi.node.GetOrCreateQuery;
 import org.jboss.shrinkwrap.descriptor.spi.node.Node;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.queries.GetOrCreateQuery;
+import org.jboss.shrinkwrap.descriptor.spi.node.Patterns;
 import org.junit.Test;
 
 /**

diff --git a/spi/src/test/java/org/jboss/shrinkwrap/descriptor/spi/node/NodeTestCase.java b/spi/src/test/java/org/jboss/shrinkwrap/descriptor/spi/node/NodeTestCase.java
@@ -16,12 +16,11 @@
  */
 package org.jboss.shrinkwrap.descriptor.spi.node;
 
-import static org.jboss.shrinkwrap.descriptor.spi.node.query.TestTreeBuilder.*;
+import static org.jboss.shrinkwrap.descriptor.spi.node.TestTreeBuilder.*;
 
 import java.util.List;
 import java.util.Map;
 
-import org.jboss.shrinkwrap.descriptor.spi.node.query.Pattern;
 import org.junit.Assert;
 import org.junit.Test;
 

diff --git a/...iptor/spi/node/query/PatternTestCase.java → .../descriptor/spi/node/PatternTestCase.java b/...iptor/spi/node/query/PatternTestCase.java → .../descriptor/spi/node/PatternTestCase.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.spi.node.query;
+package org.jboss.shrinkwrap.descriptor.spi.node;
 
 import java.util.logging.Logger;
 
 import junit.framework.Assert;
 
 import org.jboss.shrinkwrap.descriptor.spi.node.Node;
-import org.jboss.shrinkwrap.descriptor.spi.node.query.Pattern;
+import org.jboss.shrinkwrap.descriptor.spi.node.Pattern;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;