3:07 p.m.
Author: rhauch
Date: 2009-12-02 16:07:51 -0500 (Wed, 02 Dec 2009)
New Revision: 1383
Removed:
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/QueryRequest.java
Modified:
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/ForkRequestProcessor.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/JoinMirrorRequestProcessor.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/JoinRequestProcessor.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/AbstractMapWorkspace.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/MapRequestProcessor.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/MapWorkspace.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/processor/LoggingRequestProcessor.java
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/processor/RequestProcessor.java
trunk/dna-graph/src/test/java/org/jboss/dna/graph/GraphTest.java
trunk/dna-graph/src/test/java/org/jboss/dna/graph/connector/MockRepositoryRequestProcessor.java
Log:
DNA-467 Removed the QueryRequest type and all uses of it. This may not be needed anymore,
since the addition of the AccessQueryRequest type.
Modified:
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/ForkRequestProcessor.java
===================================================================
---
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/ForkRequestProcessor.java 2009-12-02
20:34:00 UTC (rev 1382)
+++
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/ForkRequestProcessor.java 2009-12-02
21:07:51 UTC (rev 1383)
@@ -70,7 +70,6 @@
import org.jboss.dna.graph.request.InvalidWorkspaceException;
import org.jboss.dna.graph.request.LockBranchRequest;
import org.jboss.dna.graph.request.MoveBranchRequest;
-import org.jboss.dna.graph.request.QueryRequest;
import org.jboss.dna.graph.request.ReadAllChildrenRequest;
import org.jboss.dna.graph.request.ReadAllPropertiesRequest;
import org.jboss.dna.graph.request.ReadBlockOfChildrenRequest;
@@ -1722,16 +1721,6 @@
/**
* {@inheritDoc}
*
- * @see
org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.QueryRequest)
- */
- @Override
- public void process( QueryRequest request ) {
- processUnknownRequest(request);
- }
-
- /**
- * {@inheritDoc}
- *
* @see
org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.FullTextSearchRequest)
*/
@Override
Modified:
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/JoinMirrorRequestProcessor.java
===================================================================
---
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/JoinMirrorRequestProcessor.java 2009-12-02
20:34:00 UTC (rev 1382)
+++
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/JoinMirrorRequestProcessor.java 2009-12-02
21:07:51 UTC (rev 1383)
@@ -46,7 +46,6 @@
import org.jboss.dna.graph.request.GetWorkspacesRequest;
import org.jboss.dna.graph.request.LockBranchRequest;
import org.jboss.dna.graph.request.MoveBranchRequest;
-import org.jboss.dna.graph.request.QueryRequest;
import org.jboss.dna.graph.request.ReadAllChildrenRequest;
import org.jboss.dna.graph.request.ReadAllPropertiesRequest;
import org.jboss.dna.graph.request.ReadBlockOfChildrenRequest;
@@ -478,16 +477,6 @@
/**
* {@inheritDoc}
*
- * @see
org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.QueryRequest)
- */
- @Override
- public void process( QueryRequest request ) {
- throw new UnsupportedOperationException(); // should never be called
- }
-
- /**
- * {@inheritDoc}
- *
* @see
org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.FullTextSearchRequest)
*/
@Override
Modified:
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/JoinRequestProcessor.java
===================================================================
---
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/JoinRequestProcessor.java 2009-12-02
20:34:00 UTC (rev 1382)
+++
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/federation/JoinRequestProcessor.java 2009-12-02
21:07:51 UTC (rev 1383)
@@ -61,7 +61,6 @@
import org.jboss.dna.graph.request.GetWorkspacesRequest;
import org.jboss.dna.graph.request.InvalidRequestException;
import org.jboss.dna.graph.request.MoveBranchRequest;
-import org.jboss.dna.graph.request.QueryRequest;
import org.jboss.dna.graph.request.ReadAllChildrenRequest;
import org.jboss.dna.graph.request.ReadAllPropertiesRequest;
import org.jboss.dna.graph.request.ReadBranchRequest;
@@ -1137,16 +1136,6 @@
/**
* {@inheritDoc}
*
- * @see
org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.QueryRequest)
- */
- @Override
- public void process( QueryRequest request ) {
- throw new UnsupportedOperationException(); // should never be called
- }
-
- /**
- * {@inheritDoc}
- *
* @see
org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.FullTextSearchRequest)
*/
@Override
Modified:
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/AbstractMapWorkspace.java
===================================================================
---
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/AbstractMapWorkspace.java 2009-12-02
20:34:00 UTC (rev 1382)
+++
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/AbstractMapWorkspace.java 2009-12-02
21:07:51 UTC (rev 1383)
@@ -49,7 +49,7 @@
import org.jboss.dna.graph.property.Path.Segment;
import org.jboss.dna.graph.property.basic.RootPath;
import org.jboss.dna.graph.query.QueryResults;
-import org.jboss.dna.graph.query.model.QueryCommand;
+import org.jboss.dna.graph.request.AccessQueryRequest;
/**
* A default implementation of {@link MapWorkspace} that only requires the user to
implement some simple, map-like operations.
@@ -625,10 +625,10 @@
* {@inheritDoc}
*
* @see
org.jboss.dna.graph.connector.map.MapWorkspace#query(org.jboss.dna.graph.ExecutionContext,
- * org.jboss.dna.graph.query.model.QueryCommand)
+ * org.jboss.dna.graph.request.AccessQueryRequest)
*/
public QueryResults query( ExecutionContext context,
- QueryCommand command ) {
+ AccessQueryRequest accessQuery ) {
return null;
}
Modified:
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/MapRequestProcessor.java
===================================================================
---
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/MapRequestProcessor.java 2009-12-02
20:34:00 UTC (rev 1382)
+++
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/MapRequestProcessor.java 2009-12-02
21:07:51 UTC (rev 1383)
@@ -47,6 +47,7 @@
import org.jboss.dna.graph.property.PropertyFactory;
import org.jboss.dna.graph.property.Path.Segment;
import org.jboss.dna.graph.query.QueryResults;
+import org.jboss.dna.graph.request.AccessQueryRequest;
import org.jboss.dna.graph.request.CloneBranchRequest;
import org.jboss.dna.graph.request.CloneWorkspaceRequest;
import org.jboss.dna.graph.request.CopyBranchRequest;
@@ -59,7 +60,6 @@
import org.jboss.dna.graph.request.InvalidWorkspaceException;
import org.jboss.dna.graph.request.LockBranchRequest;
import org.jboss.dna.graph.request.MoveBranchRequest;
-import org.jboss.dna.graph.request.QueryRequest;
import org.jboss.dna.graph.request.ReadAllChildrenRequest;
import org.jboss.dna.graph.request.ReadAllPropertiesRequest;
import org.jboss.dna.graph.request.Request;
@@ -497,14 +497,14 @@
/**
* {@inheritDoc}
*
- * @see
org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.QueryRequest)
+ * @see
org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.AccessQueryRequest)
*/
@Override
- public void process( QueryRequest request ) {
+ public void process( AccessQueryRequest request ) {
MapWorkspace workspace = getWorkspace(request, request.workspace());
if (workspace == null) return;
final ExecutionContext context = getExecutionContext();
- QueryResults results = workspace.query(context, request.query());
+ QueryResults results = workspace.query(context, request);
if (results != null) {
request.setResults(results);
} else {
Modified:
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/MapWorkspace.java
===================================================================
---
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/MapWorkspace.java 2009-12-02
20:34:00 UTC (rev 1382)
+++
trunk/dna-graph/src/main/java/org/jboss/dna/graph/connector/map/MapWorkspace.java 2009-12-02
21:07:51 UTC (rev 1383)
@@ -34,7 +34,7 @@
import org.jboss.dna.graph.property.PathFactory;
import org.jboss.dna.graph.property.Property;
import org.jboss.dna.graph.query.QueryResults;
-import org.jboss.dna.graph.query.model.QueryCommand;
+import org.jboss.dna.graph.request.AccessQueryRequest;
import org.jboss.dna.graph.request.LockBranchRequest.LockScope;
/**
@@ -233,11 +233,11 @@
* Perform a query of this workspace.
*
* @param context the context in which the query is to be executed; may not be null
- * @param command the query command; may not be null
+ * @param accessQuery the access query; may not be null
* @return the query results, or null if the query is not supported
*/
QueryResults query( ExecutionContext context,
- QueryCommand command );
+ AccessQueryRequest accessQuery );
/**
* Perform a full-text search of this workspace.
Deleted: trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/QueryRequest.java
===================================================================
--- trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/QueryRequest.java 2009-12-02
20:34:00 UTC (rev 1382)
+++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/QueryRequest.java 2009-12-02
21:07:51 UTC (rev 1383)
@@ -1,174 +0,0 @@
-/*
- * JBoss DNA (http://www.jboss.org/dna)
- * See the COPYRIGHT.txt file distributed with this work for information
- * regarding copyright ownership. Some portions may be licensed
- * to Red Hat, Inc. under one or more contributor license agreements.
- * See the AUTHORS.txt file in the distribution for a full listing of
- * individual contributors.
- *
- * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA
- * is licensed to you under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * JBoss DNA is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.dna.graph.request;
-
-import java.util.Collections;
-import java.util.Map;
-import org.jboss.dna.common.util.CheckArg;
-import org.jboss.dna.graph.query.model.QueryCommand;
-import org.jboss.dna.graph.query.model.Visitors;
-import org.jboss.dna.graph.query.plan.PlanHints;
-import org.jboss.dna.graph.query.validate.Schemata;
-
-/**
- * A {@link Request} to query a graph.
- */
-public class QueryRequest extends SearchRequest {
-
- private static final Map<String, Object> EMPTY_VARIABLES =
Collections.emptyMap();
-
- private static final long serialVersionUID = 1L;
-
- private final QueryCommand query;
- private final String workspaceName;
- private final Map<String, Object> variables;
- private final PlanHints hints;
- private final transient Schemata schemata;
-
- /**
- * Create a new request to execute the supplied query against the name workspace.
- *
- * @param query the query to be executed
- * @param workspace the name of the workspace to be queried
- * @throws IllegalArgumentException if the query or workspace name is null
- */
- public QueryRequest( QueryCommand query,
- String workspace ) {
- CheckArg.isNotNull(query, "query");
- CheckArg.isNotNull(workspace, "workspace");
- this.query = query;
- this.workspaceName = workspace;
- this.variables = EMPTY_VARIABLES;
- this.hints = null;
- this.schemata = null;
- }
-
- /**
- * Create a new request to execute the supplied query against the name workspace.
- *
- * @param query the query to be executed
- * @param workspace the name of the workspace to be queried
- * @param variables the variables that are available to be substituted upon
execution; may be null if there are no variables
- * @param hints the hints; may be null if there are no hints
- * @param schemata the schemata defining the structure of the tables that may be
queried, or null if the default schemata
- * should be used
- * @throws IllegalArgumentException if the query or workspace name is null
- */
- public QueryRequest( QueryCommand query,
- String workspace,
- Map<String, Object> variables,
- PlanHints hints,
- Schemata schemata ) {
- CheckArg.isNotNull(query, "query");
- CheckArg.isNotNull(workspace, "workspace");
- this.query = query;
- this.workspaceName = workspace;
- this.variables = variables != null ? variables : EMPTY_VARIABLES;
- this.hints = hints;
- this.schemata = schemata;
- }
-
- /**
- * Get the query that is to be executed.
- *
- * @return the query; never null
- */
- public QueryCommand query() {
- return query;
- }
-
- /**
- * Get the name of the workspace in which the node exists.
- *
- * @return the name of the workspace; never null
- */
- public String workspace() {
- return workspaceName;
- }
-
- /**
- * The variables that are available to be substituted upon execution.
- *
- * @return the variables; never null but possibly empty
- */
- public Map<String, Object> variables() {
- return variables;
- }
-
- /**
- * Get the hints for the query.
- *
- * @return the hints, or null if there are no hints
- */
- public PlanHints hints() {
- return hints;
- }
-
- /**
- * Get the schemata that defines the structure of the tables that may be queried.
- *
- * @return the schemata, or null if the default schemata should be used
- */
- public Schemata schemata() {
- return schemata;
- }
-
- /**
- * {@inheritDoc}
- *
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode() {
- return query.hashCode();
- }
-
- /**
- * {@inheritDoc}
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals( Object obj ) {
- if (obj == this) return true;
- if (this.getClass().isInstance(obj)) {
- QueryRequest that = (QueryRequest)obj;
- if (!this.query().equals(that.query())) return false;
- if (!this.workspace().equals(that.workspace())) return false;
- if (!this.variables().equals(that.variables())) return false;
- return true;
- }
- return false;
- }
-
- /**
- * {@inheritDoc}
- *
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return "query the \"" + workspaceName + "\" workspace
with \"" + Visitors.readable(query) + "\"";
- }
-}
Modified:
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/processor/LoggingRequestProcessor.java
===================================================================
---
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/processor/LoggingRequestProcessor.java 2009-12-02
20:34:00 UTC (rev 1382)
+++
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/processor/LoggingRequestProcessor.java 2009-12-02
21:07:51 UTC (rev 1383)
@@ -41,7 +41,6 @@
import org.jboss.dna.graph.request.GetWorkspacesRequest;
import org.jboss.dna.graph.request.LockBranchRequest;
import org.jboss.dna.graph.request.MoveBranchRequest;
-import org.jboss.dna.graph.request.QueryRequest;
import org.jboss.dna.graph.request.ReadAllChildrenRequest;
import org.jboss.dna.graph.request.ReadAllPropertiesRequest;
import org.jboss.dna.graph.request.ReadBlockOfChildrenRequest;
@@ -411,18 +410,6 @@
/**
* {@inheritDoc}
*
- * @see
org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.QueryRequest)
- */
- @Override
- public void process( QueryRequest request ) {
- logger.log(level, GraphI18n.executingRequest, request);
- delegate.process(request);
- logger.log(level, GraphI18n.executedRequest, request);
- }
-
- /**
- * {@inheritDoc}
- *
* @see
org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.AccessQueryRequest)
*/
@Override
Modified:
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/processor/RequestProcessor.java
===================================================================
---
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/processor/RequestProcessor.java 2009-12-02
20:34:00 UTC (rev 1382)
+++
trunk/dna-graph/src/main/java/org/jboss/dna/graph/request/processor/RequestProcessor.java 2009-12-02
21:07:51 UTC (rev 1383)
@@ -62,7 +62,6 @@
import org.jboss.dna.graph.request.InvalidRequestException;
import org.jboss.dna.graph.request.LockBranchRequest;
import org.jboss.dna.graph.request.MoveBranchRequest;
-import org.jboss.dna.graph.request.QueryRequest;
import org.jboss.dna.graph.request.ReadAllChildrenRequest;
import org.jboss.dna.graph.request.ReadAllPropertiesRequest;
import org.jboss.dna.graph.request.ReadBlockOfChildrenRequest;
@@ -277,8 +276,6 @@
process((UpdateValuesRequest)request);
} else if (request instanceof AccessQueryRequest) {
process((AccessQueryRequest)request);
- } else if (request instanceof QueryRequest) {
- process((QueryRequest)request);
} else if (request instanceof FullTextSearchRequest) {
process((FullTextSearchRequest)request);
} else {
@@ -922,19 +919,6 @@
}
/**
- * Process a request to query a workspace.
- * <p>
- * The default implementation of this method behaves as though the implementation
does not support queries by setting an error
- * on the request
- * </p>
- *
- * @param request the request
- */
- public void process( QueryRequest request ) {
- processUnknownRequest(request);
- }
-
- /**
* Process a request to query a workspace with an access query, which is is a
low-level atomic query that is part of a larger,
* planned query.
* <p>
Modified: trunk/dna-graph/src/test/java/org/jboss/dna/graph/GraphTest.java
===================================================================
--- trunk/dna-graph/src/test/java/org/jboss/dna/graph/GraphTest.java 2009-12-02 20:34:00
UTC (rev 1382)
+++ trunk/dna-graph/src/test/java/org/jboss/dna/graph/GraphTest.java 2009-12-02 21:07:51
UTC (rev 1383)
@@ -82,7 +82,6 @@
import org.jboss.dna.graph.request.InvalidRequestException;
import org.jboss.dna.graph.request.LockBranchRequest;
import org.jboss.dna.graph.request.MoveBranchRequest;
-import org.jboss.dna.graph.request.QueryRequest;
import org.jboss.dna.graph.request.ReadAllChildrenRequest;
import org.jboss.dna.graph.request.ReadAllPropertiesRequest;
import org.jboss.dna.graph.request.ReadBlockOfChildrenRequest;
@@ -1483,20 +1482,6 @@
nextQueryResults = null;
}
- /**
- * {@inheritDoc}
- *
- * @see
org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.QueryRequest)
- */
- @Override
- public void process( QueryRequest request ) {
- if (nextQueryResults == null) {
- super.process(request); // should result in error
- }
- request.setResults(nextQueryResults);
- nextQueryResults = null;
- }
-
private Location actualLocationOf( Location location ) {
// If the location has a path, then use the location
if (location.hasPath()) return location;
Modified:
trunk/dna-graph/src/test/java/org/jboss/dna/graph/connector/MockRepositoryRequestProcessor.java
===================================================================
---
trunk/dna-graph/src/test/java/org/jboss/dna/graph/connector/MockRepositoryRequestProcessor.java 2009-12-02
20:34:00 UTC (rev 1382)
+++
trunk/dna-graph/src/test/java/org/jboss/dna/graph/connector/MockRepositoryRequestProcessor.java 2009-12-02
21:07:51 UTC (rev 1383)
@@ -38,7 +38,6 @@
import org.jboss.dna.graph.request.GetWorkspacesRequest;
import org.jboss.dna.graph.request.LockBranchRequest;
import org.jboss.dna.graph.request.MoveBranchRequest;
-import org.jboss.dna.graph.request.QueryRequest;
import org.jboss.dna.graph.request.ReadAllChildrenRequest;
import org.jboss.dna.graph.request.ReadAllPropertiesRequest;
import org.jboss.dna.graph.request.ReadBlockOfChildrenRequest;
@@ -341,16 +340,6 @@
/**
* {@inheritDoc}
*
- * @see
org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.QueryRequest)
- */
- @Override
- public void process( QueryRequest request ) {
- record(request);
- }
-
- /**
- * {@inheritDoc}
- *
* @see
org.jboss.dna.graph.request.processor.RequestProcessor#process(org.jboss.dna.graph.request.FullTextSearchRequest)
*/
@Override