Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2013-05-21 20:40:00 +0000
committerRoberto E. Escobar2013-07-01 23:46:18 +0000
commitf5dc25ab9ee62ab4fc068efd91460586fa610cbb (patch)
tree508c5e774c73b7829068a82fa372f74c36bdfd2a
parent96c660ce7ec6b79cf74b3b8b5d50c39c642703ac (diff)
downloadorg.eclipse.osee-f5dc25ab9ee62ab4fc068efd91460586fa610cbb.tar.gz
org.eclipse.osee-f5dc25ab9ee62ab4fc068efd91460586fa610cbb.tar.xz
org.eclipse.osee-f5dc25ab9ee62ab4fc068efd91460586fa610cbb.zip
refactor: Clean-up warnings from ORCS code
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/TxCurrentsOpFactory.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/ArtifactSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AllArtifactsSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactGuidSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactHridsSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactIdsSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeOtherSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTokenSqlHandler.java7
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTypeExistsSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeExistsSqlHandler.java2
11 files changed, 12 insertions, 17 deletions
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/TxCurrentsOpFactory.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/TxCurrentsOpFactory.java
index 4ea4cf709b6..6368e0840d6 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/TxCurrentsOpFactory.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/exchange/TxCurrentsOpFactory.java
@@ -12,9 +12,9 @@ package org.eclipse.osee.orcs.db.internal.exchange;
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.osee.framework.core.operation.CompositeOperation;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.operation.OperationLogger;
+import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.database.operation.InvalidTxCurrentsAndModTypes;
@@ -29,7 +29,7 @@ public class TxCurrentsOpFactory {
public static IOperation createTxCurrentsAndModTypesOp(IOseeDatabaseService db, OperationLogger logger, boolean archived) {
List<IOperation> ops = createSubOperations(db, logger, archived);
- return new CompositeOperation("TxCurrents And Mod Types", "Plugin Id", logger, ops);
+ return Operations.createBuilder("TxCurrents And Mod Types").addAll(ops).build();
}
private static List<IOperation> createSubOperations(IOseeDatabaseService db, OperationLogger logger, boolean archived) {
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/ArtifactSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/ArtifactSqlHandler.java
index 7cbe652333e..840fbb9d489 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/ArtifactSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/loader/handlers/ArtifactSqlHandler.java
@@ -43,7 +43,7 @@ public class ArtifactSqlHandler extends SqlHandler<CriteriaArtifact, LoadOptions
}
@Override
- public void addTables(AbstractSqlWriter<LoadOptions> writer) throws OseeCoreException {
+ public void addTables(AbstractSqlWriter<LoadOptions> writer) {
jArtAlias = writer.addTable(TableEnum.ARTIFACT_JOIN_TABLE);
artAlias = writer.addTable(TableEnum.ARTIFACT_TABLE);
txsAlias = writer.addTable(TableEnum.TXS_TABLE);
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AllArtifactsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AllArtifactsSqlHandler.java
index 2e1f4bf80ea..c7e5146c3b9 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AllArtifactsSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AllArtifactsSqlHandler.java
@@ -32,7 +32,7 @@ public class AllArtifactsSqlHandler extends SqlHandler<CriteriaAllArtifacts, Que
}
@Override
- public void addTables(AbstractSqlWriter<QueryOptions> writer) throws OseeCoreException {
+ public void addTables(AbstractSqlWriter<QueryOptions> writer) {
List<String> artAliases = writer.getAliases(TableEnum.ARTIFACT_TABLE);
List<String> txsAliases = writer.getAliases(TableEnum.TXS_TABLE);
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactGuidSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactGuidSqlHandler.java
index 1fa22d8f400..0d114a6efec 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactGuidSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactGuidSqlHandler.java
@@ -37,7 +37,7 @@ public class ArtifactGuidSqlHandler extends SqlHandler<CriteriaArtifactGuids, Qu
}
@Override
- public void addTables(AbstractSqlWriter<QueryOptions> writer) throws OseeCoreException {
+ public void addTables(AbstractSqlWriter<QueryOptions> writer) {
if (criteria.getIds().size() > 1) {
jguidAlias = writer.addTable(TableEnum.CHAR_JOIN_TABLE);
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactHridsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactHridsSqlHandler.java
index 02b25fb9df9..9675f31ecc5 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactHridsSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactHridsSqlHandler.java
@@ -37,7 +37,7 @@ public class ArtifactHridsSqlHandler extends SqlHandler<CriteriaArtifactHrids, Q
}
@Override
- public void addTables(AbstractSqlWriter<QueryOptions> writer) throws OseeCoreException {
+ public void addTables(AbstractSqlWriter<QueryOptions> writer) {
if (criteria.getIds().size() > 1) {
jHridAlias = writer.addTable(TableEnum.CHAR_JOIN_TABLE);
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactIdsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactIdsSqlHandler.java
index 16a929af0f3..625be37049a 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactIdsSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/ArtifactIdsSqlHandler.java
@@ -36,7 +36,7 @@ public class ArtifactIdsSqlHandler extends SqlHandler<CriteriaArtifactIds, Query
}
@Override
- public void addTables(AbstractSqlWriter<QueryOptions> writer) throws OseeCoreException {
+ public void addTables(AbstractSqlWriter<QueryOptions> writer) {
if (criteria.getIds().size() > 1) {
jIdAlias = writer.addTable(TableEnum.ID_JOIN_TABLE);
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeOtherSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeOtherSqlHandler.java
index 13f99467690..27b0d9e3626 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeOtherSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeOtherSqlHandler.java
@@ -46,7 +46,7 @@ public class AttributeOtherSqlHandler extends SqlHandler<CriteriaAttributeOther,
}
@Override
- public void addTables(AbstractSqlWriter<QueryOptions> writer) throws OseeCoreException {
+ public void addTables(AbstractSqlWriter<QueryOptions> writer) {
Collection<String> values = criteria.getValues();
if (values.size() == 1) {
this.value = values.iterator().next();
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTokenSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTokenSqlHandler.java
index 1d4b67d319c..53afe056a8b 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTokenSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTokenSqlHandler.java
@@ -39,7 +39,6 @@ import org.eclipse.osee.orcs.db.internal.sql.WithClause.WithAlias;
public class AttributeTokenSqlHandler extends SqlHandler<CriteriaAttributeKeywords, QueryOptions> implements HasTagProcessor, HasDataPostProcessorFactory<CriteriaAttributeKeywords> {
private CriteriaAttributeKeywords criteria;
- private static final int MAX_TOKEN_SIZE = 20;
private String artAlias;
private String attrAlias;
@@ -79,7 +78,6 @@ public class AttributeTokenSqlHandler extends SqlHandler<CriteriaAttributeKeywor
Collection<? extends IAttributeType> types = criteria.getTypes();
int valueCount = values.size();
- int tagsCount = 0;
StringBuilder gammaSb = new StringBuilder();
@@ -89,7 +87,7 @@ public class AttributeTokenSqlHandler extends SqlHandler<CriteriaAttributeKeywor
tokenize(value, tags);
int tagsSize = tags.size();
gammaSb.append("(");
- for (int tagIdx = 0; tagIdx < tagsSize; tagIdx++, tagsCount++) {
+ for (int tagIdx = 0; tagIdx < tagsSize; tagIdx++) {
Long tag = tags.get(tagIdx);
gammaSb.append("SELECT gamma_id FROM osee_search_tags WHERE coded_tag_id = ?");
writer.addParameter(tag);
@@ -103,9 +101,6 @@ public class AttributeTokenSqlHandler extends SqlHandler<CriteriaAttributeKeywor
}
}
- // Conditions.checkExpressionFailOnTrue(tagsCount > MAX_TOKEN_SIZE, "Parsed tokens for [%s] is greater than [%d]",
- // Collections.toString(", ", criteria.getValues()), MAX_TOKEN_SIZE);
-
WithClause gammaWith = new WithClause(gammaSb.toString(), WithAlias.GAMMA);
String gammaAlias = writer.addWithClause(gammaWith);
String jIdAlias = null;
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTypeExistsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTypeExistsSqlHandler.java
index 5aa06965d75..e30282f19fa 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTypeExistsSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/AttributeTypeExistsSqlHandler.java
@@ -42,7 +42,7 @@ public class AttributeTypeExistsSqlHandler extends SqlHandler<CriteriaAttributeT
}
@Override
- public void addTables(AbstractSqlWriter<QueryOptions> writer) throws OseeCoreException {
+ public void addTables(AbstractSqlWriter<QueryOptions> writer) {
if (criteria.getTypes().size() > 1) {
jIdAlias = writer.addTable(TableEnum.ID_JOIN_TABLE);
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java
index f5ecd21a643..99488ac122d 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelatedToSqlHandler.java
@@ -38,7 +38,7 @@ public class RelatedToSqlHandler extends SqlHandler<CriteriaRelatedTo, QueryOpti
}
@Override
- public void addTables(AbstractSqlWriter<QueryOptions> writer) throws OseeCoreException {
+ public void addTables(AbstractSqlWriter<QueryOptions> writer) {
if (criteria.getIds().size() > 1) {
jIdAlias = writer.addTable(TableEnum.ID_JOIN_TABLE);
}
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeExistsSqlHandler.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeExistsSqlHandler.java
index 28f10aada73..8d6df0a1510 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeExistsSqlHandler.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/search/handlers/RelationTypeExistsSqlHandler.java
@@ -35,7 +35,7 @@ public class RelationTypeExistsSqlHandler extends SqlHandler<CriteriaRelationTyp
}
@Override
- public void addTables(AbstractSqlWriter<QueryOptions> writer) throws OseeCoreException {
+ public void addTables(AbstractSqlWriter<QueryOptions> writer) {
List<String> artAliases = writer.getAliases(TableEnum.ARTIFACT_TABLE);
if (artAliases.isEmpty()) {
writer.addTable(TableEnum.ARTIFACT_TABLE);

Back to the top