svn commit: r963474 - /incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryService.java

[ma...@apache.org]

Author: mattmann
Date: Mon Jul 12 20:26:33 2010
New Revision: 963474

URL: http://svn.apache.org/viewvc?rev=963474&view=rev
Log:
- progress towards OODT-15 One trunk for all OODT components with top level build

Added:
    incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryService.java
      - copied, changed from r963466, incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java

Copied: incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryService.java (from r963466, incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java)
URL: http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryService.java?p2=incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryService.java&p1=incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java&r1=963466&r2=963474&rev=963474&view=diff
==============================================================================
--- incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/struct/QueryService.java (original)
+++ incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/query/QueryService.java Mon Jul 12 20:26:33 2010
@@ -1,4 +1,4 @@
-/*
+/**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -23,43 +23,49 @@ import java.util.Map;
 
 //OODT imports
 import org.apache.oodt.cas.catalog.exception.QueryServiceException;
-import org.apache.oodt.cas.catalog.page.IngestReceipt;
-import org.apache.oodt.cas.catalog.page.TransactionReceipt;
+import org.apache.oodt.cas.catalog.pagination.IngestReceipt;
+import org.apache.oodt.cas.catalog.pagination.TransactionReceipt;
 import org.apache.oodt.cas.catalog.query.QueryExpression;
 import org.apache.oodt.cas.catalog.term.TermBucket;
 
 /**
- * @author bfoster
- * @version $Revision$
- *
- * <p>
- * A Interface for performing queries to a Catalog
- * <p>
+ * 
+ * An interface for performing queries to a Catalog.
+ * 
  */
 public interface QueryService {
 
-	/**
-	 * Returns all the TransactionIds that fall under the given query
-	 * @param query The query for TransactionIds
-	 * @return Returns a List of TransactionIds that meet the query, otherwise
-	 * an empty List is no TransactionIds are found for the given query
-	 */
-	public List<IngestReceipt> query(QueryExpression queryExpression) throws QueryServiceException;
-	
-	/**
-	 * Returns a List of TermBuckets ingested for a given TransactionId
-	 * @param transactionId The TransactionId in question
-	 * @return A List of TermBuckets for the given TransactionId or empty list
-	 * if no record of the give TranactionId exists
-	 */
-	public List<TermBucket> getBuckets(TransactionId<?> transactionId) throws QueryServiceException;
-	
-	/**
-	 * Does the same as getBuckets(TransactionId), except is performed over a list
-	 * of TransactionIds
-	 * @param transactionIds A List of TransactionIds for which TermBuckets are wanted
-	 * @return A Map of TransactionIds to TermBuckets
-	 */
-	public Map<TransactionId<?>, List<TermBucket>> getBuckets(List<TransactionId<?>> transactionIds) throws QueryServiceException;
+  /**
+   * Returns all the TransactionIds that fall under the given query
+   * 
+   * @param query
+   *          The query for TransactionIds
+   * @return Returns a List of TransactionIds that meet the query, otherwise an
+   *         empty List is no TransactionIds are found for the given query
+   */
+  public List<IngestReceipt> query(QueryExpression queryExpression)
+      throws QueryServiceException;
+
+  /**
+   * Returns a List of TermBuckets ingested for a given TransactionId
+   * 
+   * @param transactionId
+   *          The TransactionId in question
+   * @return A List of TermBuckets for the given TransactionId or empty list if
+   *         no record of the give TranactionId exists
+   */
+  public List<TermBucket> getBuckets(TransactionId<?> transactionId)
+      throws QueryServiceException;
+
+  /**
+   * Does the same as getBuckets(TransactionId), except is performed over a list
+   * of TransactionIds
+   * 
+   * @param transactionIds
+   *          A List of TransactionIds for which TermBuckets are wanted
+   * @return A Map of TransactionIds to TermBuckets
+   */
+  public Map<TransactionId<?>, List<TermBucket>> getBuckets(
+      List<TransactionId<?>> transactionIds) throws QueryServiceException;
 
 }