refinement: Improve artifact type inheritance search API

Make artifact type inheritance search similar to java:
- andIsOfType similar to instanceof
- andTypeEquals similar to object.getClass() == Object.class

Change-Id: I348bcecdf85be828a42b7febf118766439984e9f

1 files changed, 12 insertions, 15 deletions

diff --git a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/QueryBuilder.java b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/QueryBuilder.java
index 5eccaa56674..063d0485754 100644
--- a/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/QueryBuilder.java
+++ b/plugins/org.eclipse.osee.orcs/src/org/eclipse/osee/orcs/search/QueryBuilder.java
@@ -47,12 +47,6 @@ public interface QueryBuilder {
 
    boolean areDeletedIncluded();
 
-   QueryBuilder includeTypeInheritance();
-
-   QueryBuilder includeTypeInheritance(boolean enabled);
-
-   boolean isTypeInheritanceIncluded();
-
    QueryBuilder fromTransaction(int transactionId);
 
    int getFromTransaction();
@@ -65,13 +59,6 @@ public interface QueryBuilder {
 
    QueryBuilder excludeDeleted();
 
-   QueryBuilder excludeTypeInheritance();
-
-   /**
-    * Resets query builder to default settings. This also clear all criteria added to original query.
-    */
-   QueryBuilder resetToDefaults();
-
    /**
     * Search criteria that finds a given artifact id
     */
@@ -103,16 +90,26 @@ public interface QueryBuilder {
    QueryBuilder andIds(Collection<? extends IArtifactToken> artifactTokens) throws OseeCoreException;
 
    /**
-    * Search criteria that finds a given artifact type
+    * Search criteria that finds a given artifact type using type inheritance
     */
    QueryBuilder andIsOfType(IArtifactType... artifactType) throws OseeCoreException;
 
    /**
-    * Search criteria that finds a given artifact types
+    * Search criteria that finds a given artifact types using type inheritance
     */
    QueryBuilder andIsOfType(Collection<? extends IArtifactType> artifactType) throws OseeCoreException;
 
    /**
+    * Search criteria that finds a given artifact types by matching type exactly
+    */
+   QueryBuilder andTypeEquals(IArtifactType... artifactType) throws OseeCoreException;
+
+   /**
+    * Search criteria that finds a given artifact types by matching type exactly
+    */
+   QueryBuilder andTypeEquals(Collection<? extends IArtifactType> artifactType) throws OseeCoreException;
+
+   /**
     * Search criteria that checks for the existence of an attribute type(s).
     */
    QueryBuilder andExists(IAttributeType... attributeType) throws OseeCoreException;