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

3 files changed, 2 insertions, 21 deletions

diff --git a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchMethod.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchMethod.java
index cf45ead3381..adc577c4df4 100644
--- a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchMethod.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchMethod.java
@@ -21,6 +21,7 @@ public enum SearchMethod {
    IDS("ids"),
    GUID_OR_HRIDS("guids"),
    IS_OF_TYPE("isOfType"),
+   TYPE_EQUALS("typeEquals"),
    EXISTS_TYPE("exists"),
    ATTRIBUTE_TYPE("attrType"),
    RELATED_TO("related");
diff --git a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchParameters.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchParameters.java
index 87d910a823e..a7e76239675 100644
--- a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchParameters.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchParameters.java
@@ -26,14 +26,10 @@ public interface SearchParameters {
 
    String getFields();
 
-   boolean isIncludeTypeInheritance();
-
    boolean isIncludeCache();
 
    boolean isIncludeDeleted();
 
    int getFromTx();
 
-   boolean isIncludeTypeInh();
-
 }
diff --git a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchRequest.java b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchRequest.java
index 7a2862cf666..76320e38421 100644
--- a/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchRequest.java
+++ b/plugins/org.eclipse.osee.orcs.rest.model/src/org/eclipse/osee/orcs/rest/model/search/SearchRequest.java
@@ -27,7 +27,6 @@ public class SearchRequest implements SearchParameters {
    private String alt;
    private String fields;
    private int fromTx;
-   private boolean includeTypeInh;
    private boolean includeCache;
    private boolean includeDeleted;
 
@@ -38,14 +37,13 @@ public class SearchRequest implements SearchParameters {
       super();
    }
 
-   public SearchRequest(String branchUuid, List<Predicate> predicates, String alt, String fields, int fromTx, boolean includeTypeInheritance, boolean includeCache, boolean includeDeleted) {
+   public SearchRequest(String branchUuid, List<Predicate> predicates, String alt, String fields, int fromTx, boolean includeCache, boolean includeDeleted) {
       super();
       this.branchUuid = branchUuid;
       this.predicates = predicates;
       this.alt = alt;
       this.fields = fields;
       this.fromTx = fromTx;
-      this.includeTypeInh = includeTypeInheritance;
       this.includeCache = includeCache;
       this.includeDeleted = includeDeleted;
    }
@@ -89,11 +87,6 @@ public class SearchRequest implements SearchParameters {
    }
 
    @Override
-   public boolean isIncludeTypeInheritance() {
-      return includeTypeInh;
-   }
-
-   @Override
    public boolean isIncludeCache() {
       return includeCache;
    }
@@ -112,15 +105,6 @@ public class SearchRequest implements SearchParameters {
       this.fromTx = fromTx;
    }
 
-   @Override
-   public boolean isIncludeTypeInh() {
-      return includeTypeInh;
-   }
-
-   public void setIncludeTypeInh(boolean includeTypeInh) {
-      this.includeTypeInh = includeTypeInh;
-   }
-
    public void setIncludeCache(boolean includeCache) {
       this.includeCache = includeCache;
    }