diff options
13 files changed, 6 insertions, 139 deletions
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/ds/OptionsUtilTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/ds/OptionsUtilTest.java index d1f27ec3289..ac9a2096824 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/ds/OptionsUtilTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/ds/OptionsUtilTest.java @@ -39,7 +39,6 @@ public class OptionsUtilTest { assertEquals(LoadLevel.SHALLOW, OptionsUtil.getLoadLevel(defaults)); assertEquals(false, OptionsUtil.areDeletedIncluded(defaults)); - assertEquals(false, OptionsUtil.isCacheIncluded(defaults)); assertEquals(true, OptionsUtil.isHeadTransaction(defaults)); assertEquals(false, OptionsUtil.isHistorical(defaults)); } @@ -84,26 +83,15 @@ public class OptionsUtilTest { } @Test - public void testSetGetIncludeCache() { - assertEquals(false, OptionsUtil.isCacheIncluded(options)); - - OptionsUtil.setIncludeCache(options, true); - - assertEquals(true, OptionsUtil.isCacheIncluded(options)); - } - - @Test public void testReset() { OptionsUtil.setFromTransaction(options, 1231); OptionsUtil.setLoadLevel(options, LoadLevel.ATTRIBUTE); OptionsUtil.setIncludeDeleted(options, true); - OptionsUtil.setIncludeCache(options, true); assertEquals(1231, OptionsUtil.getFromTransaction(options)); assertEquals(DeletionFlag.INCLUDE_DELETED, OptionsUtil.getIncludeDeleted(options)); assertEquals(LoadLevel.ATTRIBUTE, OptionsUtil.getLoadLevel(options)); assertEquals(true, OptionsUtil.areDeletedIncluded(options)); - assertEquals(true, OptionsUtil.isCacheIncluded(options)); assertEquals(false, OptionsUtil.isHeadTransaction(options)); assertEquals(true, OptionsUtil.isHistorical(options)); @@ -113,7 +101,6 @@ public class OptionsUtilTest { assertEquals(DeletionFlag.EXCLUDE_DELETED, OptionsUtil.getIncludeDeleted(options)); assertEquals(LoadLevel.SHALLOW, OptionsUtil.getLoadLevel(options)); assertEquals(false, OptionsUtil.areDeletedIncluded(options)); - assertEquals(false, OptionsUtil.isCacheIncluded(options)); assertEquals(true, OptionsUtil.isHeadTransaction(options)); assertEquals(false, OptionsUtil.isHistorical(options)); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/OptionsUtil.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/OptionsUtil.java index c8e4d464e58..e8a7ce5ddd1 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/OptionsUtil.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/ds/OptionsUtil.java @@ -23,12 +23,10 @@ public final class OptionsUtil { private static final String FROM_TRANSACTION = "from.transaction"; private static final String INCLUDE_DELETED = "include.deleted"; - private static final String INCLUDE_CACHE = "include.cache"; private static final String LOAD_LEVEL = "load.level"; public static Options createBranchOptions() { Options options = new Options(); - setIncludeCache(options, false); setIncludeDeleted(options, false); setLoadLevel(options, LoadLevel.SHALLOW); return options; @@ -36,7 +34,6 @@ public final class OptionsUtil { public static Options createOptions() { Options options = new Options(); - setIncludeCache(options, false); setIncludeDeleted(options, false); setHeadTransaction(options); setLoadLevel(options, LoadLevel.SHALLOW); @@ -44,20 +41,11 @@ public final class OptionsUtil { } public static void reset(Options options) { - setIncludeCache(options, false); setIncludeDeleted(options, false); setHeadTransaction(options); setLoadLevel(options, LoadLevel.SHALLOW); } - public static boolean isCacheIncluded(Options options) { - return options.getBoolean(INCLUDE_CACHE); - } - - public static void setIncludeCache(Options options, boolean enabled) { - options.put(INCLUDE_CACHE, enabled); - } - public static boolean areDeletedIncluded(Options options) { return options.getBoolean(INCLUDE_DELETED); } diff --git a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/QueryBuilderImpl.java b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/QueryBuilderImpl.java index 6c03b9e1822..71ed4db6f6a 100644 --- a/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/QueryBuilderImpl.java +++ b/plugins/org.eclipse.osee.orcs.core/src/org/eclipse/osee/orcs/core/internal/search/QueryBuilderImpl.java @@ -70,23 +70,6 @@ public class QueryBuilderImpl implements QueryBuilder { } @Override - public QueryBuilder includeCache() { - includeCache(true); - return this; - } - - @Override - public QueryBuilder includeCache(boolean enabled) { - OptionsUtil.setIncludeCache(getOptions(), enabled); - return this; - } - - @Override - public boolean isCacheIncluded() { - return OptionsUtil.isCacheIncluded(getOptions()); - } - - @Override public QueryBuilder includeDeleted() { includeDeleted(true); return this; @@ -126,12 +109,6 @@ public class QueryBuilderImpl implements QueryBuilder { } @Override - public QueryBuilder excludeCache() { - includeCache(false); - return this; - } - - @Override public QueryBuilder excludeDeleted() { includeDeleted(false); return this; diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/QueryBuilder.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/QueryBuilder.java index fa33c47cc59..c7c6044f926 100644 --- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/QueryBuilder.java +++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/QueryBuilder.java @@ -31,12 +31,6 @@ public interface QueryBuilder { public static IAttributeType ANY_ATTRIBUTE_TYPE = TokenFactory.createAttributeType(Long.MIN_VALUE, "Any Attribute Type"); - QueryBuilder includeCache(); - - QueryBuilder includeCache(boolean enabled); - - boolean isCacheIncluded(); - QueryBuilder includeDeleted(); QueryBuilder includeDeleted(boolean enabled); @@ -51,8 +45,6 @@ public interface QueryBuilder { boolean isHeadTransaction(); - QueryBuilder excludeCache(); - QueryBuilder excludeDeleted(); /** diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryBuilderImpl.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryBuilderImpl.java index 839a70befc5..bc16da7256f 100644 --- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryBuilderImpl.java +++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryBuilderImpl.java @@ -49,22 +49,6 @@ public class QueryBuilderImpl implements QueryBuilder { } @Override - public QueryBuilder includeCache() { - return includeCache(true); - } - - @Override - public QueryBuilder includeCache(boolean enabled) { - options.setIncludeDeleted(enabled); - return this; - } - - @Override - public boolean isCacheIncluded() { - return options.isCacheIncluded(); - } - - @Override public QueryBuilder includeDeleted() { return includeDeleted(true); } @@ -103,12 +87,6 @@ public class QueryBuilderImpl implements QueryBuilder { } @Override - public QueryBuilder excludeCache() { - options.setIncludeCache(false); - return this; - } - - @Override public QueryBuilder excludeDeleted() { return includeDeleted(false); } diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryExecutorV1.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryExecutorV1.java index d24512371d2..133f09d0028 100644 --- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryExecutorV1.java +++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryExecutorV1.java @@ -59,11 +59,6 @@ public class QueryExecutorV1 implements QueryExecutor { fromTx = options.getFromTransaction(); } - boolean includeCache = false; - if (options.isCacheIncluded()) { - includeCache = true; - } - boolean includeDeleted = false; if (options.areDeletedIncluded()) { includeDeleted = true; @@ -71,7 +66,7 @@ public class QueryExecutorV1 implements QueryExecutor { SearchRequest params = new SearchRequest(branch.getGuid(), predicates, outputFormat.name().toLowerCase(), - requestType.name().toLowerCase(), fromTx, includeCache, includeDeleted); + requestType.name().toLowerCase(), fromTx, includeDeleted); URI uri = uriProvider.getEncodedURI(String.format("oseex/branch/%s/artifact/search/v1", branch.getGuid()), null); diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryOptions.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryOptions.java index 8cdfaad5fcf..e1dc64f0b50 100644 --- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryOptions.java +++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/QueryOptions.java @@ -17,8 +17,6 @@ import org.eclipse.osee.orcs.rest.client.internal.Options; */ public class QueryOptions extends Options { - private boolean includeCache = true; - public QueryOptions() { super(); } @@ -26,15 +24,6 @@ public class QueryOptions extends Options { @Override public void reset() { super.reset(); - includeCache = true; - } - - public boolean isCacheIncluded() { - return includeCache; - } - - public void setIncludeCache(boolean enabled) { - includeCache = enabled; } @Override @@ -42,12 +31,11 @@ public class QueryOptions extends Options { QueryOptions clone = new QueryOptions(); clone.setIncludeDeleted(this.areDeletedIncluded()); clone.setFromTransaction(this.getFromTransaction()); - clone.includeCache = this.includeCache; return clone; } @Override public String toString() { - return "QueryOptions [includeCache=" + includeCache + " [" + super.toString() + "]]"; + return "QueryOptions [" + super.toString() + "]"; } } 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 a7e76239675..115fe0a00be 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,8 +26,6 @@ public interface SearchParameters { String getFields(); - boolean isIncludeCache(); - boolean isIncludeDeleted(); int getFromTx(); 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 76320e38421..3d6e4769635 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 includeCache; private boolean includeDeleted; @XmlTransient @@ -37,14 +36,13 @@ public class SearchRequest implements SearchParameters { super(); } - public SearchRequest(String branchUuid, List<Predicate> predicates, String alt, String fields, int fromTx, boolean includeCache, boolean includeDeleted) { + public SearchRequest(String branchUuid, List<Predicate> predicates, String alt, String fields, int fromTx, boolean includeDeleted) { super(); this.branchUuid = branchUuid; this.predicates = predicates; this.alt = alt; this.fields = fields; this.fromTx = fromTx; - this.includeCache = includeCache; this.includeDeleted = includeDeleted; } @@ -87,11 +85,6 @@ public class SearchRequest implements SearchParameters { } @Override - public boolean isIncludeCache() { - return includeCache; - } - - @Override public boolean isIncludeDeleted() { return includeDeleted; } @@ -105,10 +98,6 @@ public class SearchRequest implements SearchParameters { this.fromTx = fromTx; } - public void setIncludeCache(boolean includeCache) { - this.includeCache = includeCache; - } - public void setIncludeDeleted(boolean includeDeleted) { this.includeDeleted = includeDeleted; } diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/dsl/SearchDslTest.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/dsl/SearchDslTest.java index e1ecea13032..1940cac3bf5 100644 --- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/dsl/SearchDslTest.java +++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/dsl/SearchDslTest.java @@ -69,7 +69,7 @@ public class SearchDslTest { Strings.EMPTY_STRING, Arrays.asList("AtsAdmin")); SearchRequest params = new SearchRequest(BRANCH.getGuid(), Arrays.asList(predicate), Strings.EMPTY_STRING, Strings.EMPTY_STRING, 0, - false, false); + false); dsl.build(queryFactory, params); diff --git a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/ArtifactSearch_V1.java b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/ArtifactSearch_V1.java index a28b2f1cf65..4dab472a92c 100644 --- a/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/ArtifactSearch_V1.java +++ b/plugins/org.eclipse.osee.orcs.rest/src/org/eclipse/osee/orcs/rest/internal/search/ArtifactSearch_V1.java @@ -97,10 +97,10 @@ public class ArtifactSearch_V1 extends ArtifactSearch { */ @GET @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) - public SearchResponse getSearchWithQueryParams(@QueryParam("alt") String alt, @QueryParam("fields") String fields, @QueryParam("q") String rawQuery, @QueryParam("fromTx") int fromTransaction, @QueryParam("cached") boolean includeCache, @QueryParam("includeDeleted") boolean includeDeleted) throws OseeCoreException { + public SearchResponse getSearchWithQueryParams(@QueryParam("alt") String alt, @QueryParam("fields") String fields, @QueryParam("q") String rawQuery, @QueryParam("fromTx") int fromTransaction, @QueryParam("includeDeleted") boolean includeDeleted) throws OseeCoreException { DslTranslator translator = DslFactory.createTranslator(); SearchRequest params = - new SearchRequest(getBranchUuid(), translator.translate(rawQuery), alt, fields, fromTransaction, includeCache, + new SearchRequest(getBranchUuid(), translator.translate(rawQuery), alt, fields, fromTransaction, includeDeleted); return search(params); } @@ -119,7 +119,6 @@ public class ArtifactSearch_V1 extends ArtifactSearch { QueryBuilder builder = searchQueryBuilder.build(qFactory, params); - builder.includeCache(params.isIncludeCache()); builder.includeDeleted(params.isIncludeDeleted()); if (params.getFromTx() > 0) { 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 e4577040da0..da5acad47c7 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 @@ -35,12 +35,6 @@ public interface QueryBuilder { public static IAttributeType ANY_ATTRIBUTE_TYPE = TokenFactory.createAttributeType(Long.MIN_VALUE, "Any Attribute Type"); - QueryBuilder includeCache(); - - QueryBuilder includeCache(boolean enabled); - - boolean isCacheIncluded(); - QueryBuilder includeDeleted(); QueryBuilder includeDeleted(boolean enabled); @@ -55,8 +49,6 @@ public interface QueryBuilder { boolean isHeadTransaction(); - QueryBuilder excludeCache(); - QueryBuilder excludeDeleted(); /** diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java index 8ba15695bbf..edf4f8c2895 100644 --- a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java +++ b/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java @@ -104,22 +104,6 @@ public class OseeClientQueryTest { } @Test - public void searchForArtifactByGuidsExcludeCache() throws OseeCoreException { - final int EXPECTED_RESULTS = 2; - SearchResult results = - createClient.createQueryBuilder(COMMON).andGuids(GUID1, GUID2).excludeCache().getSearchResult(); - assertEquals(EXPECTED_RESULTS, results.getTotal()); - } - - @Test - public void searchForArtifactByGuidsIncludeCache() throws OseeCoreException { - final int EXPECTED_RESULTS = 2; - SearchResult results = - createClient.createQueryBuilder(COMMON).andGuids(GUID1, GUID2).includeCache().getSearchResult(); - assertEquals(EXPECTED_RESULTS, results.getTotal()); - } - - @Test public void searchForArtifactByLocalId() throws OseeCoreException { final int EXPECTED_RESULTS = 1; SearchResult results = createClient.createQueryBuilder(COMMON).andLocalId(9).getSearchResult(); |