From f0f991b4f728f2e7550016da91eb2e8d2c8c750c Mon Sep 17 00:00:00 2001 From: rbrooks Date: Thu, 16 Sep 2010 13:32:48 -0700 Subject: refactor: Utilize utility method OseeExceptions.wrapAndThrow instead of in-place code --- .../artifact/DemoCodeTeamWorkflowArtifact.java | 4 +- .../demo/artifact/DemoReqTeamWorkflowArtifact.java | 4 +- .../artifact/DemoTestTeamWorkflowArtifact.java | 4 +- .../osee/ats/config/demo/config/DemoDbUtil.java | 4 +- .../org/eclipse/osee/ats/artifact/ATSArtifact.java | 3 +- .../eclipse/osee/ats/artifact/ActionArtifact.java | 3 +- .../osee/ats/artifact/ActionableItemArtifact.java | 3 +- .../osee/ats/artifact/DecisionReviewArtifact.java | 3 +- .../eclipse/osee/ats/artifact/GoalArtifact.java | 3 +- .../ats/artifact/PeerToPeerReviewArtifact.java | 3 +- .../osee/ats/artifact/ReviewSMArtifact.java | 3 +- .../osee/ats/artifact/StateMachineArtifact.java | 3 +- .../eclipse/osee/ats/artifact/TaskArtifact.java | 3 +- .../ats/artifact/TaskableStateMachineArtifact.java | 3 +- .../osee/ats/artifact/TeamDefinitionArtifact.java | 3 +- .../osee/ats/artifact/TeamWorkFlowArtifact.java | 3 +- .../eclipse/osee/ats/artifact/VersionArtifact.java | 3 +- .../health/TxImportedValidateChangeReports.java | 5 +- .../org/eclipse/osee/ats/operation/PurgeUser.java | 9 +- .../eclipse/osee/ats/operation/TaskMetrics.java | 3 +- .../Import/ExcelAtsActionArtifactExtractor.java | 3 +- .../util/Import/ExcelAtsTaskArtifactExtractor.java | 3 +- .../widgets/dialog/TaskResolutionOptionRule.java | 3 +- .../framework/access/AccessControlManager.java | 5 +- .../osee/framework/access/AccessObject.java | 3 +- .../access/internal/AccessControlService.java | 5 +- .../access/internal/data/ArtifactAccessObject.java | 4 +- .../access/internal/data/BranchAccessObject.java | 3 +- .../branch/management/change/ChangeItemLoader.java | 12 +- .../management/commit/CommitDbOperation.java | 7 +- .../management/commit/UpdatePreviousTxCurrent.java | 8 +- .../management/creation/CreateBranchOperation.java | 3 +- .../management/exchange/ExportController.java | 5 +- .../branch/management/exchange/IdTranslator.java | 10 +- .../management/exchange/ImportController.java | 5 +- .../management/exchange/TranslationManager.java | 8 +- .../exchange/export/MetadataExportItem.java | 4 +- .../exchange/handler/BaseDbSaxHandler.java | 6 +- .../exchange/handler/BranchDataSaxHandler.java | 11 +- .../management/exchange/handler/DataToSql.java | 4 +- .../exchange/handler/DbTableSaxHandler.java | 5 +- .../exchange/handler/MetaDataSaxHandler.java | 7 +- .../exchange/resource/ExchangeProvider.java | 2 +- .../management/purge/PurgeBranchOperation.java | 7 +- .../core/client/server/HttpUrlBuilderClient.java | 9 +- .../core/datastore/DatastoreInitOperation.java | 4 +- .../cache/DatabaseArtifactTypeAccessor.java | 2 +- .../cache/DatabaseAttributeTypeAccessor.java | 9 +- .../schema/operations/DatabaseDataImporter.java | 4 +- .../core/datastore/schema/sql/MysqlSqlManager.java | 8 +- .../datastore/schema/sql/OracleSqlManager.java | 6 +- .../datastore/schema/sql/PostgreSqlManager.java | 10 +- .../core/datastore/schema/sql/SchemaSqlUtil.java | 14 +- .../core/datastore/schema/sql/SqlFactory.java | 4 +- .../core/datastore/schema/sql/SqlManager.java | 15 +- .../core/datastore/schema/sql/SqlManagerImpl.java | 6 +- .../internal/OseeModelingServiceImpl.java | 4 +- .../core/dsl/integration/util/ModelUtil.java | 14 +- .../internal/ApplicationServerDataStore.java | 10 +- .../server/internal/ApplicationServerLookup.java | 4 +- .../server/internal/ApplicationServerManager.java | 3 +- .../internal/compatibility/OseeSql_0_9_1.java | 4 +- .../exception/OseeAuthenticationException.java | 10 -- .../core/exception/OseeDataStoreException.java | 10 +- .../framework/core/exception/OseeExceptions.java | 8 +- .../exception/OseeInvalidInheritanceException.java | 8 -- .../osee/framework/core/util/Conditions.java | 2 +- .../osee/framework/core/util/HttpMessage.java | 2 +- .../database/init/SkynetDbBranchDataImport.java | 33 +++-- .../framework/database/IOseeDatabaseService.java | 16 +-- .../framework/database/core/ConnectionHandler.java | 41 +++--- .../database/core/DatabaseTransactions.java | 8 +- .../framework/database/core/IOseeSequence.java | 35 ++--- .../framework/database/core/IOseeStatement.java | 66 ++++----- .../osee/framework/database/core/JoinUtility.java | 11 +- .../framework/database/core/OseeConnection.java | 18 +-- .../osee/framework/database/core/OseeInfo.java | 16 +-- .../osee/framework/database/core/OseeSql.java | 4 +- .../database/core/ResultSetProcessor.java | 26 ++-- .../framework/database/core/SupportedDatabase.java | 18 +-- .../database/internal/core/OseeConnectionImpl.java | 34 +++-- .../internal/core/OseeConnectionPoolImpl.java | 34 ++--- .../internal/core/OseeDatabaseServiceImpl.java | 29 ++-- .../database/internal/core/OseeSequenceImpl.java | 37 ++--- .../database/internal/core/OseeStatementImpl.java | 157 ++++++++++++--------- .../internal/core/StaleConnectionCloser.java | 4 +- .../database/internal/core/StatementUtil.java | 6 +- .../ConsolidateArtifactVersionTxOperation.java | 3 +- .../operation/InvalidTxCurrentsAndModTypes.java | 4 +- .../manager/servlet/UnsubscribeTransaction.java | 3 +- .../manager/servlet/ats/AtsResourceProvider.java | 2 +- .../manager/servlet/ats/OperationData.java | 3 +- .../manager/servlet/data/ArtifactUtil.java | 16 +-- .../internal/activemq/ConnectionNodeActiveMq.java | 13 +- .../activemq/ReplyConnectionActiveMqImpl.java | 4 +- .../osee/framework/plugin/core/util/AIFile.java | 8 +- .../osee/framework/plugin/core/util/OseeData.java | 4 +- .../attribute/AttributeLocatorProvider.java | 6 +- .../framework/search/engine/ITaggerStatistics.java | 6 +- .../engine/attribute/AttributeDataStore.java | 5 +- .../internal/tagger/InputStreamTagProcessor.java | 4 +- .../engine/internal/tagger/InputToTagQueueTx.java | 5 +- .../engine/internal/tagger/TaggerRunnable.java | 7 +- .../engine/internal/tagger/TaggerStatistics.java | 6 +- .../search/engine/utility/SearchTagDataStore.java | 18 +-- .../admin/app/DataStoreBackupApplication.java | 4 +- .../admin/conversion/CompressedContentFix.java | 5 +- .../framework/server/admin/conversion/Util.java | 4 +- .../server/admin/search/TaggerAllWorker.java | 6 +- .../skynet/core/test/cases/DeletionTest.java | 11 +- .../skynet/core/test/cases/DuplicateHridTest.java | 5 +- .../osee/framework/skynet/core/BootStrapUser.java | 9 +- .../eclipse/osee/framework/skynet/core/User.java | 3 +- .../framework/skynet/core/artifact/Artifact.java | 6 +- .../skynet/core/artifact/ArtifactLoader.java | 8 +- .../skynet/core/artifact/ArtifactTypeManager.java | 3 +- .../framework/skynet/core/artifact/Attribute.java | 3 +- .../skynet/core/artifact/AttributeLoader.java | 3 +- .../skynet/core/artifact/PurgeArtifacts.java | 3 +- .../core/artifact/PurgeTransactionOperation.java | 13 +- .../skynet/core/artifact/RevertAction.java | 4 +- .../skynet/core/artifact/UpdateMergeBranch.java | 3 +- .../core/artifact/operation/ArtifactOperation.java | 4 +- .../search/AbstractArtifactSearchCriteria.java | 2 +- .../core/artifact/search/ArtifactQueryBuilder.java | 5 +- .../core/artifact/search/AttributeCriteria.java | 2 +- .../core/attribute/AttributeExtensionManager.java | 6 +- .../core/attribute/AttributeResourceProcessor.java | 13 +- .../core/attribute/CompressedContentAttribute.java | 3 +- .../skynet/core/attribute/WordAttribute.java | 4 +- .../skynet/core/attribute/providers/DataStore.java | 3 +- .../providers/DefaultAttributeDataProvider.java | 3 +- .../providers/UriAttributeDataProvider.java | 10 +- .../attribute/utils/AbstractResourceProcessor.java | 34 ++--- .../skynet/core/attribute/utils/AttributeURL.java | 2 +- .../skynet/core/conflict/AttributeConflict.java | 3 +- .../core/conflict/ConflictStatusManager.java | 3 +- .../skynet/core/relation/RelationManager.java | 3 +- .../framework/skynet/core/revision/ChangeData.java | 4 +- .../core/revision/ConflictManagerInternal.java | 3 +- .../skynet/core/transaction/SkynetTransaction.java | 4 +- .../core/transaction/TransactionManager.java | 3 +- .../core/transaction/TransactionMonitor.java | 11 +- .../osee/framework/skynet/core/utility/DbUtil.java | 6 +- .../eclipse/osee/framework/ui/admin/AdminView.java | 3 +- .../framework/ui/admin/dbtabletab/DbDescribe.java | 8 +- .../framework/ui/admin/dbtabletab/DbTableTab.java | 8 +- .../ui/admin/dbtabletab/DbTableViewer.java | 8 +- .../ui/admin/dbtabletab/OseeInfoDbItem.java | 6 +- .../ui/admin/dbtabletab/SiteGssflRpcr.java | 5 +- .../framework/ui/skynet/ArtifactImageManager.java | 9 +- .../ui/skynet/access/PolicyTableViewer.java | 4 +- .../ui/skynet/action/EditTransactionComment.java | 4 +- .../dbHealth/ArtifactIdWithoutVersionsCheck.java | 4 +- .../skynet/dbHealth/AttributeBackingDataCheck.java | 4 +- .../ui/skynet/dbHealth/BranchStateHealthCheck.java | 5 +- .../ui/skynet/dbHealth/CleanUpBackingData.java | 6 +- .../ui/skynet/dbHealth/DuplicateAttributes.java | 10 +- .../ui/skynet/dbHealth/DuplicateHRID.java | 5 +- .../skynet/dbHealth/MultipleParentRelations.java | 7 +- .../ui/skynet/dbHealth/RelationIntegrityCheck.java | 7 +- .../dbHealth/RepeatEnumerationAttributeValues.java | 4 +- .../framework/ui/skynet/render/RenderingUtil.java | 2 +- .../osee/framework/ui/skynet/util/SkynetViews.java | 5 +- 164 files changed, 692 insertions(+), 731 deletions(-) (limited to 'plugins') diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoCodeTeamWorkflowArtifact.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoCodeTeamWorkflowArtifact.java index b40f9560b6f..165ca2bece6 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoCodeTeamWorkflowArtifact.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoCodeTeamWorkflowArtifact.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.config.demo.artifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory; @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory; * @author Donald G. Dunne */ public class DemoCodeTeamWorkflowArtifact extends TeamWorkFlowArtifact { - public DemoCodeTeamWorkflowArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public DemoCodeTeamWorkflowArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humanReadableId, branch, artifactType); } } \ No newline at end of file diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoReqTeamWorkflowArtifact.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoReqTeamWorkflowArtifact.java index f7118db447e..7403241508f 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoReqTeamWorkflowArtifact.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoReqTeamWorkflowArtifact.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.config.demo.artifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory; @@ -24,7 +24,7 @@ public class DemoReqTeamWorkflowArtifact extends TeamWorkFlowArtifact { public static String ARTIFACT_NAME = DemoArtifactTypes.DemoReqTeamWorkflow.getName(); - public DemoReqTeamWorkflowArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public DemoReqTeamWorkflowArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humanReadableId, branch, artifactType); } diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoTestTeamWorkflowArtifact.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoTestTeamWorkflowArtifact.java index 0bbddefc39e..1c3792ab018 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoTestTeamWorkflowArtifact.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/artifact/DemoTestTeamWorkflowArtifact.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.config.demo.artifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory; @@ -24,7 +24,7 @@ public class DemoTestTeamWorkflowArtifact extends TeamWorkFlowArtifact { public static String ARTIFACT_NAME = DemoArtifactTypes.DemoTestTeamWorkflow.getName(); - public DemoTestTeamWorkflowArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public DemoTestTeamWorkflowArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humanReadableId, branch, artifactType); } diff --git a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java index d5b7e49461d..941498fedc3 100644 --- a/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java +++ b/plugins/org.eclipse.osee.ats.config.demo/src/org/eclipse/osee/ats/config/demo/config/DemoDbUtil.java @@ -21,7 +21,7 @@ import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeWrappedException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; @@ -63,7 +63,7 @@ public class DemoDbUtil { try { Thread.sleep(milliseconds); } catch (Exception ex) { - throw new OseeWrappedException(ex); + OseeExceptions.wrapAndThrow(ex); } OseeLog.log(OseeAtsConfigDemoActivator.class, Level.INFO, "Awake"); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSArtifact.java index 0db6d955cdd..5e20bbea5ec 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSArtifact.java @@ -17,7 +17,6 @@ import java.util.Set; import org.eclipse.osee.ats.hyper.IHyperArtifact; import org.eclipse.osee.ats.util.Overview; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -27,7 +26,7 @@ import org.eclipse.osee.framework.skynet.core.relation.RelationLink; public abstract class ATSArtifact extends Artifact implements IHyperArtifact, IATSArtifact { - public ATSArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public ATSArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humanReadableId, branch, artifactType); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java index fc600ec2a57..0495262f328 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java @@ -36,7 +36,6 @@ import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.jdk.core.util.Collections; @@ -64,7 +63,7 @@ public class ActionArtifact extends ATSArtifact implements IWorldViewArtifact { Duplicate_If_Exists; // If option exists, then duplication of workflow of same team definition is allowed }; - public ActionArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public ActionArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humanReadableId, branch, artifactType); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java index 1d1c9403cc3..5d0b9d2bbcc 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionableItemArtifact.java @@ -24,7 +24,6 @@ import org.eclipse.osee.ats.util.AtsRelationTypes; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.jdk.core.util.Collections; @@ -39,7 +38,7 @@ import org.eclipse.osee.framework.skynet.core.utility.Artifacts; */ public class ActionableItemArtifact extends Artifact { - public ActionableItemArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public ActionableItemArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humanReadableId, branch, artifactType); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/DecisionReviewArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/DecisionReviewArtifact.java index 9cccdcc0677..9d47da7e6f8 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/DecisionReviewArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/DecisionReviewArtifact.java @@ -13,7 +13,6 @@ package org.eclipse.osee.ats.artifact; import java.util.Collection; import org.eclipse.osee.ats.util.widgets.XDecisionOptions; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.skynet.core.User; @@ -34,7 +33,7 @@ public class DecisionReviewArtifact extends ReviewSMArtifact implements IReviewA Completed }; - public DecisionReviewArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public DecisionReviewArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humanReadableId, branch, artifactType); decisionOptions = new XDecisionOptions(this); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalArtifact.java index 633a6a14bea..6b20c9b1bae 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalArtifact.java @@ -27,7 +27,6 @@ import org.eclipse.osee.ats.util.AtsRelationTypes; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.ats.world.search.GoalSearchItem; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.skynet.core.User; @@ -51,7 +50,7 @@ public class GoalArtifact extends StateMachineArtifact { Cancelled }; - public GoalArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public GoalArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humanReadableId, branch, artifactType); registerAtsWorldRelation(AtsRelationTypes.Goal_Member); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/PeerToPeerReviewArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/PeerToPeerReviewArtifact.java index 6d7b8971f2b..87392bdd0c6 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/PeerToPeerReviewArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/PeerToPeerReviewArtifact.java @@ -18,7 +18,6 @@ import org.eclipse.osee.ats.util.widgets.defect.DefectManager; import org.eclipse.osee.ats.util.widgets.role.UserRole; import org.eclipse.osee.ats.util.widgets.role.UserRole.Role; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.skynet.core.User; @@ -37,7 +36,7 @@ public class PeerToPeerReviewArtifact extends ReviewSMArtifact implements IRevie Completed }; - public PeerToPeerReviewArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public PeerToPeerReviewArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humanReadableId, branch, artifactType); defectManager = new DefectManager(this); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ReviewSMArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ReviewSMArtifact.java index c8b849908e4..db437b400c4 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ReviewSMArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ReviewSMArtifact.java @@ -28,7 +28,6 @@ import org.eclipse.osee.ats.util.widgets.role.UserRole; import org.eclipse.osee.ats.util.widgets.role.UserRole.Role; import org.eclipse.osee.ats.util.widgets.role.UserRoleManager; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.logging.OseeLog; @@ -54,7 +53,7 @@ public abstract class ReviewSMArtifact extends TaskableStateMachineArtifact { Commit }; - public ReviewSMArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public ReviewSMArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humanReadableId, branch, artifactType); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java index 350238dd175..694bbc9bb10 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java @@ -51,7 +51,6 @@ import org.eclipse.osee.framework.core.enums.IRelationEnumeration; import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.core.services.CmAccessControl; @@ -113,7 +112,7 @@ public abstract class StateMachineArtifact extends ATSArtifact implements HasCmA OverrideAssigneeCheck }; - public StateMachineArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public StateMachineArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humanReadableId, branch, artifactType); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskArtifact.java index d49010a4da2..9e7ba3fa5df 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskArtifact.java @@ -23,7 +23,6 @@ import org.eclipse.osee.ats.util.AtsRelationTypes; import org.eclipse.osee.ats.util.widgets.dialog.TaskResOptionDefinition; import org.eclipse.osee.ats.util.widgets.dialog.TaskResolutionOptionRule; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.ArtifactType; @@ -50,7 +49,7 @@ public class TaskArtifact extends StateMachineArtifact implements IATSStateMachi Cancelled }; - public TaskArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public TaskArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humanReadableId, branch, artifactType); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskableStateMachineArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskableStateMachineArtifact.java index ef696b0a8ac..ee765188bf0 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskableStateMachineArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskableStateMachineArtifact.java @@ -27,7 +27,6 @@ import org.eclipse.osee.ats.util.AtsArtifactTypes; import org.eclipse.osee.ats.util.AtsRelationTypes; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.logging.OseeLevel; @@ -46,7 +45,7 @@ import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition; */ public abstract class TaskableStateMachineArtifact extends StateMachineArtifact { - public TaskableStateMachineArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public TaskableStateMachineArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humanReadableId, branch, artifactType); registerAtsWorldRelation(AtsRelationTypes.SmaToTask_Task); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java index cbebdfdc06d..90ba9724bf4 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamDefinitionArtifact.java @@ -34,7 +34,6 @@ import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.exception.BranchDoesNotExist; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.jdk.core.util.Collections; @@ -62,7 +61,7 @@ public class TeamDefinitionArtifact extends Artifact implements ICommitConfigArt RequireTargetedVersion }; - public TeamDefinitionArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public TeamDefinitionArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humanReadableId, branch, artifactType); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java index fa22824c303..bd72fe6a9f9 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java @@ -33,7 +33,6 @@ import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions.RuleWorkItemId; import org.eclipse.osee.framework.core.enums.Active; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.ArtifactType; @@ -71,7 +70,7 @@ public class TeamWorkFlowArtifact extends TaskableStateMachineArtifact implement Cancelled } - public TeamWorkFlowArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public TeamWorkFlowArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humanReadableId, branch, artifactType); registerAtsWorldRelation(AtsRelationTypes.TeamWorkflowToReview_Review); branchMgr = new AtsBranchManager(this); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java index d4bc3945b35..15c982cdb8b 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/VersionArtifact.java @@ -23,7 +23,6 @@ import org.eclipse.osee.ats.util.widgets.commit.ICommitConfigArtifact; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.core.exception.BranchDoesNotExist; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.jdk.core.util.GUID; @@ -42,7 +41,7 @@ public class VersionArtifact extends Artifact implements ICommitConfigArtifact { VersionLocked }; - public VersionArtifact(ArtifactFactory parentFactory, String guid, String humandReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public VersionArtifact(ArtifactFactory parentFactory, String guid, String humandReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humandReadableId, branch, artifactType); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/TxImportedValidateChangeReports.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/TxImportedValidateChangeReports.java index 08f9cc59c79..c9e7c40d933 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/TxImportedValidateChangeReports.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/TxImportedValidateChangeReports.java @@ -26,7 +26,6 @@ import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.database.core.ConnectionHandler; @@ -73,7 +72,7 @@ public class TxImportedValidateChangeReports extends AbstractBlam { return "Tx Imported Validate Change Reports"; } - private void setup(String databaseTargetId) throws OseeDataStoreException { + private void setup(String databaseTargetId) throws OseeCoreException { List importtedIds = getImportedIds(); for (ImportedId importedId : importtedIds) { print(importedId.getSequence() + "\n"); @@ -278,7 +277,7 @@ public class TxImportedValidateChangeReports extends AbstractBlam { return newVersion; } - public void load(String sourceDatabaseId) throws OseeDataStoreException { + public void load(String sourceDatabaseId) throws OseeCoreException { IOseeStatement chStmt = ConnectionHandler.getStatement(); try { originalToMapped.clear(); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/PurgeUser.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/PurgeUser.java index 567864ce254..52b62c48cb9 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/PurgeUser.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/PurgeUser.java @@ -16,7 +16,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.DbTransaction; import org.eclipse.osee.framework.database.core.OseeConnection; @@ -113,7 +112,7 @@ public class PurgeUser extends AbstractBlam { } } - private void findAndUpdateAuthoredTransactions(OseeConnection connection, final User fromUser, final User toUser) throws OseeDataStoreException { + private void findAndUpdateAuthoredTransactions(OseeConnection connection, final User fromUser, final User toUser) throws OseeCoreException { numOfAuthoredTransactions = ConnectionHandler.runPreparedQueryFetchInt(defaultUpdateValue, GET_AUTHORED_TRANSACTIONS, new Object[] {fromUser.getArtId()}); @@ -123,12 +122,12 @@ public class PurgeUser extends AbstractBlam { fromUser.getArtId()}); } - private void findAndUpdateRelations(OseeConnection connection, final User fromUser, final User toUser) throws OseeDataStoreException { + private void findAndUpdateRelations(OseeConnection connection, final User fromUser, final User toUser) throws OseeCoreException { updateRelationA(connection, fromUser, toUser); updateRelationB(connection, fromUser, toUser); } - private void updateRelationA(OseeConnection connection, final User fromUser, final User toUser) throws OseeDataStoreException { + private void updateRelationA(OseeConnection connection, final User fromUser, final User toUser) throws OseeCoreException { numOfASideRelations = ConnectionHandler.runPreparedQueryFetchInt(defaultUpdateValue, GET_RELATIONS_ASIDE, new Object[] {fromUser.getArtId()}); @@ -138,7 +137,7 @@ public class PurgeUser extends AbstractBlam { fromUser.getArtId()}); } - private void updateRelationB(OseeConnection connection, final User fromUser, final User toUser) throws OseeDataStoreException { + private void updateRelationB(OseeConnection connection, final User fromUser, final User toUser) throws OseeCoreException { numOfBSideRelations = ConnectionHandler.runPreparedQueryFetchInt(defaultUpdateValue, GET_RELATIONS_BSIDE, new Object[] {fromUser.getArtId()}); diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java index 7fcfaa9d566..7a52d455192 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java @@ -27,6 +27,7 @@ import org.eclipse.osee.ats.util.widgets.SMAState; import org.eclipse.osee.ats.util.widgets.XCurrentStateDam; import org.eclipse.osee.ats.util.widgets.XStateDam; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.jdk.core.type.CountingMap; import org.eclipse.osee.framework.jdk.core.type.MutableInteger; @@ -85,7 +86,7 @@ public class TaskMetrics extends AbstractBlam { AIFile.writeToFile(iFile, charBak); Program.launch(iFile.getLocation().toOSString()); } catch (Exception ex) { - throw new OseeCoreException(ex); + OseeExceptions.wrapAndThrow(ex); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java index 5755dee9487..06f03e6a3fe 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java @@ -29,6 +29,7 @@ import org.eclipse.osee.ats.util.AtsPriority; import org.eclipse.osee.ats.util.AtsRelationTypes; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.jdk.core.util.io.xml.ExcelSaxHandler; import org.eclipse.osee.framework.jdk.core.util.io.xml.RowProcessor; @@ -163,7 +164,7 @@ public class ExcelAtsActionArtifactExtractor { xmlReader.setContentHandler(new ExcelSaxHandler(new InternalRowProcessor(actionDatas), true)); xmlReader.parse(new InputSource(new InputStreamReader(source.toURL().openStream(), "UTF-8"))); } catch (Exception ex) { - throw new OseeCoreException(ex); + OseeExceptions.wrapAndThrow(ex); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java index a8258ae8489..26357f43bba 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsTaskArtifactExtractor.java @@ -30,6 +30,7 @@ import org.eclipse.osee.ats.util.AtsNotifyUsers; import org.eclipse.osee.ats.util.AtsUtil; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.jdk.core.util.io.xml.ExcelSaxHandler; import org.eclipse.osee.framework.jdk.core.util.io.xml.RowProcessor; @@ -69,7 +70,7 @@ public class ExcelAtsTaskArtifactExtractor { new InternalRowProcessor(monitor, transaction, sma, emailPOCs), true)); xmlReader.parse(new InputSource(new InputStreamReader(source.toURL().openStream(), "UTF-8"))); } catch (Exception ex) { - throw new OseeCoreException(ex); + OseeExceptions.wrapAndThrow(ex); } } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TaskResolutionOptionRule.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TaskResolutionOptionRule.java index 5059aa7c6ca..7b0f6872db4 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TaskResolutionOptionRule.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TaskResolutionOptionRule.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -83,7 +84,7 @@ public class TaskResolutionOptionRule extends WorkRuleDefinition { try { setFromDoc(Jaxp.readXmlDocument(xmlStr)); } catch (Exception ex) { - throw new OseeCoreException(ex); + OseeExceptions.wrapAndThrow(ex); } } diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlManager.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlManager.java index 51abe841bbf..35a9cd3f2d1 100644 --- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlManager.java +++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessControlManager.java @@ -18,7 +18,6 @@ import org.eclipse.osee.framework.access.internal.Activator; import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.access.AccessDataQuery; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; @@ -48,7 +47,7 @@ public final class AccessControlManager { getService().lockObjects(objects, subject); } - public static void unLockObjects(Collection objects, Artifact subject) throws OseeDataStoreException, OseeAuthenticationRequiredException { + public static void unLockObjects(Collection objects, Artifact subject) throws OseeCoreException, OseeAuthenticationRequiredException { getService().unLockObjects(objects, subject); } @@ -84,7 +83,7 @@ public final class AccessControlManager { getService().persistPermission(data, isRecursionAllowed); } - public static void removeAccessControlDataIf(boolean removeFromDb, AccessControlData data) throws OseeDataStoreException { + public static void removeAccessControlDataIf(boolean removeFromDb, AccessControlData data) throws OseeCoreException { getService().removeAccessControlDataIf(removeFromDb, data); } diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessObject.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessObject.java index 842f52ce7ab..8f66293b8a4 100644 --- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessObject.java +++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/AccessObject.java @@ -14,7 +14,6 @@ import org.eclipse.osee.framework.access.internal.data.ArtifactAccessObject; import org.eclipse.osee.framework.access.internal.data.BranchAccessObject; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -24,7 +23,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; public abstract class AccessObject { public abstract void removeFromCache(); - public abstract void removeFromDatabase(int subjectId) throws OseeDataStoreException; + public abstract void removeFromDatabase(int subjectId) throws OseeCoreException; public abstract int getId(); diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java index 0b6a26fde01..686ce437039 100644 --- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java +++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/AccessControlService.java @@ -35,7 +35,6 @@ import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.IBasicArtifact; @@ -517,7 +516,7 @@ public class AccessControlService implements IAccessControlService { return getBranchPermission(subject, branch); } - public void removeAccessControlDataIf(boolean removeFromDb, AccessControlData data) throws OseeDataStoreException { + public void removeAccessControlDataIf(boolean removeFromDb, AccessControlData data) throws OseeCoreException { int subjectId = data.getSubject().getArtId(); AccessObject accessControlledObject = data.getObject(); if (removeFromDb) { @@ -587,7 +586,7 @@ public class AccessControlService implements IAccessControlService { } } - public void unLockObjects(Collection objects, Artifact subject) throws OseeDataStoreException, OseeAuthenticationRequiredException { + public void unLockObjects(Collection objects, Artifact subject) throws OseeCoreException, OseeAuthenticationRequiredException { AccessControlEvent event = new AccessControlEvent(); event.setEventType(AccessControlEventType.ArtifactsUnlocked); Set lockedArts = new HashSet(); diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/ArtifactAccessObject.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/ArtifactAccessObject.java index 6b846e3876b..be11c1a782c 100644 --- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/ArtifactAccessObject.java +++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/ArtifactAccessObject.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.access.internal.data; import org.eclipse.osee.framework.access.AccessObject; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.jdk.core.type.DoubleKeyHashMap; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -55,7 +55,7 @@ public class ArtifactAccessObject extends AccessObject { } @Override - public void removeFromDatabase(int subjectId) throws OseeDataStoreException { + public void removeFromDatabase(int subjectId) throws OseeCoreException { final String DELETE_ARTIFACT_ACL = "DELETE FROM OSEE_ARTIFACT_ACL WHERE privilege_entity_id = ? AND art_id =? AND branch_id =?"; ConnectionHandler.runPreparedUpdate(DELETE_ARTIFACT_ACL, subjectId, artId, branchId); diff --git a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/BranchAccessObject.java b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/BranchAccessObject.java index 65219f42009..6090c4841ac 100644 --- a/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/BranchAccessObject.java +++ b/plugins/org.eclipse.osee.framework.access/src/org/eclipse/osee/framework/access/internal/data/BranchAccessObject.java @@ -15,7 +15,6 @@ import java.util.Map; import org.eclipse.osee.framework.access.AccessObject; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; @@ -49,7 +48,7 @@ public class BranchAccessObject extends AccessObject { } @Override - public void removeFromDatabase(int subjectId) throws OseeDataStoreException { + public void removeFromDatabase(int subjectId) throws OseeCoreException { final String DELETE_BRANCH_ACL = "DELETE FROM OSEE_BRANCH_ACL WHERE privilege_entity_id = ? AND branch_id =?"; ConnectionHandler.runPreparedUpdate(DELETE_BRANCH_ACL, subjectId, branchId); } diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/change/ChangeItemLoader.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/change/ChangeItemLoader.java index 80d36071cb5..8fc6c3c74a0 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/change/ChangeItemLoader.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/change/ChangeItemLoader.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.branch.management.change; import java.util.HashMap; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.enums.ModificationType; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.message.ArtifactChangeItem; import org.eclipse.osee.framework.core.message.AttributeChangeItem; import org.eclipse.osee.framework.core.message.ChangeItem; @@ -40,7 +40,7 @@ public class ChangeItemLoader { String getLoadByGammaQuery(); - ChangeItem createItem(IOseeStatement statement) throws OseeDataStoreException; + ChangeItem createItem(IOseeStatement statement) throws OseeCoreException; } public ChangeItemLoader(IOseeDatabaseServiceProvider oseeDatabaseProvider, HashMap changeByGammaId) { @@ -60,7 +60,7 @@ public class ChangeItemLoader { return new RelationChangeItemFactory(); } - public void loadItemIdsBasedOnGammas(IProgressMonitor monitor, ChangeItemFactory factory, int queryId, HashMap changesByItemId, IdJoinQuery idJoin) throws OseeDataStoreException { + public void loadItemIdsBasedOnGammas(IProgressMonitor monitor, ChangeItemFactory factory, int queryId, HashMap changesByItemId, IdJoinQuery idJoin) throws OseeCoreException { IOseeStatement chStmt = oseeDatabaseProvider.getOseeDatabaseService().getStatement(); try { chStmt.runPreparedQuery(10000, factory.getLoadByGammaQuery(), queryId); @@ -85,7 +85,7 @@ public class ChangeItemLoader { } @Override - public ChangeItem createItem(IOseeStatement chStmt) throws OseeDataStoreException { + public ChangeItem createItem(IOseeStatement chStmt) throws OseeCoreException { int artId = chStmt.getInt("art_id"); int artTypeId = chStmt.getInt("art_type_id"); @@ -121,7 +121,7 @@ public class ChangeItemLoader { } @Override - public ChangeItem createItem(IOseeStatement chStmt) throws OseeDataStoreException { + public ChangeItem createItem(IOseeStatement chStmt) throws OseeCoreException { int attrId = chStmt.getInt("attr_id"); int attrTypeId = chStmt.getInt("attr_type_id"); int artId = chStmt.getInt("art_id"); @@ -160,7 +160,7 @@ public class ChangeItemLoader { } @Override - public ChangeItem createItem(IOseeStatement chStmt) throws OseeDataStoreException { + public ChangeItem createItem(IOseeStatement chStmt) throws OseeCoreException { int relLinkId = chStmt.getInt("rel_link_id"); int relTypeId = chStmt.getInt("rel_link_type_id"); diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/commit/CommitDbOperation.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/commit/CommitDbOperation.java index 8140875347c..6d53e7e0597 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/commit/CommitDbOperation.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/commit/CommitDbOperation.java @@ -25,7 +25,6 @@ import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.TransactionDetailsType; import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.message.ArtifactChangeItem; import org.eclipse.osee.framework.core.message.AttributeChangeItem; @@ -117,7 +116,7 @@ public class CommitDbOperation extends AbstractDbTxOperation { } } - private void updateMergeBranchCommitTx() throws OseeDataStoreException { + private void updateMergeBranchCommitTx() throws OseeCoreException { getDatabaseService().runPreparedUpdate(connection, UPDATE_MERGE_COMMIT_TX, txHolder.getTransaction().getId(), sourceBranch.getId(), destinationBranch.getId()); } @@ -140,7 +139,7 @@ public class CommitDbOperation extends AbstractDbTxOperation { getDatabaseService().runPreparedUpdate(UPDATE_SOURCE_BRANCH_STATE, state.getValue(), sourceBranch.getId()); } - private void updatePreviousCurrentsOnDestinationBranch() throws OseeStateException, OseeDataStoreException { + private void updatePreviousCurrentsOnDestinationBranch() throws OseeCoreException { UpdatePreviousTxCurrent updater = new UpdatePreviousTxCurrent(destinationBranch, connection); for (ChangeItem change : changes) { if (change instanceof ArtifactChangeItem) { @@ -174,7 +173,7 @@ public class CommitDbOperation extends AbstractDbTxOperation { return record; } - private void insertCommitAddressing() throws OseeDataStoreException { + private void insertCommitAddressing() throws OseeCoreException { List insertData = new ArrayList(); for (ChangeItem change : changes) { ModificationType modType = change.getNetChange().getModType(); diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/commit/UpdatePreviousTxCurrent.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/commit/UpdatePreviousTxCurrent.java index 7083d8fa268..069dafb6e64 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/commit/UpdatePreviousTxCurrent.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/commit/UpdatePreviousTxCurrent.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.branch.management.commit; import java.util.ArrayList; import java.util.List; import org.eclipse.osee.framework.core.enums.TxChange; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; @@ -50,19 +50,19 @@ public class UpdatePreviousTxCurrent { relationJoin.add(relationId); } - public void updateTxNotCurrents() throws OseeDataStoreException { + public void updateTxNotCurrents() throws OseeCoreException { updateTxNotCurrents("osee_artifact", "art_id", artifactJoin); updateTxNotCurrents("osee_attribute", "attr_id", attributeJoin); updateTxNotCurrents("osee_relation_link", "rel_link_id", relationJoin); } - private void updateTxNotCurrents(String tableName, String columnName, IdJoinQuery idJoin) throws OseeDataStoreException { + private void updateTxNotCurrents(String tableName, String columnName, IdJoinQuery idJoin) throws OseeCoreException { idJoin.store(connection); updateNoLongerCurrentGammas(tableName, columnName, idJoin.getQueryId()); idJoin.delete(connection); } - private void updateNoLongerCurrentGammas(String tableName, String columnName, int queryId) throws OseeDataStoreException { + private void updateNoLongerCurrentGammas(String tableName, String columnName, int queryId) throws OseeCoreException { List updateData = new ArrayList(); IOseeStatement chStmt = ConnectionHandler.getStatement(connection); String query = diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/creation/CreateBranchOperation.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/creation/CreateBranchOperation.java index 61e19d29c01..d8f7f4e71df 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/creation/CreateBranchOperation.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/creation/CreateBranchOperation.java @@ -25,7 +25,6 @@ import org.eclipse.osee.framework.core.enums.StorageState; import org.eclipse.osee.framework.core.enums.TransactionDetailsType; import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.message.BranchCreationRequest; import org.eclipse.osee.framework.core.message.BranchCreationResponse; @@ -98,7 +97,7 @@ public class CreateBranchOperation extends AbstractDbTxOperation { try { systemUserId = getDatabaseService().runPreparedQueryFetchObject(-1, USER_ID_QUERY, SystemUser.OseeSystem.getUserID()); - } catch (OseeDataStoreException ex) { + } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.WARNING, "Unable to retrieve the system user"); } } diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExportController.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExportController.java index 112488b02f7..1ecaec7468b 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExportController.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExportController.java @@ -27,7 +27,6 @@ import org.eclipse.osee.framework.branch.management.exchange.export.AbstractDbEx import org.eclipse.osee.framework.branch.management.exchange.export.AbstractExportItem; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.server.ServerThreads; import org.eclipse.osee.framework.database.core.DbTransaction; @@ -82,7 +81,7 @@ final class ExportController extends DbTransaction implements IExchangeTaskListe joinQuery.delete(connection); joinQuery = null; } - } catch (OseeDataStoreException ex) { + } catch (OseeCoreException ex) { onException("Export Clean-Up", ex); } this.executorService.shutdown(); @@ -97,7 +96,7 @@ final class ExportController extends DbTransaction implements IExchangeTaskListe return rootDirectory; } - private void setUp(OseeConnection connection, List taskList, File tempFolder) throws OseeDataStoreException { + private void setUp(OseeConnection connection, List taskList, File tempFolder) throws OseeCoreException { joinQuery = JoinUtility.createExportImportJoinQuery(); for (int branchId : branchIds) { joinQuery.add((long) branchId, -1L); diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/IdTranslator.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/IdTranslator.java index 1c0f48a66a7..771a8a81930 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/IdTranslator.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/IdTranslator.java @@ -16,7 +16,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.database.core.OseeConnection; @@ -58,7 +58,7 @@ public class IdTranslator { return this.aliases; } - public Object getId(Object original) throws OseeDataStoreException { + public Object getId(Object original) throws OseeCoreException { Long originalLong = null; if (original instanceof Double) { originalLong = ((Double) original).longValue(); @@ -83,7 +83,7 @@ public class IdTranslator { return toReturn; } - private Long transalateId(Long original) throws OseeDataStoreException { + private Long transalateId(Long original) throws OseeCoreException { Long newVersion = null; if (original <= 0L) { newVersion = original; @@ -116,7 +116,7 @@ public class IdTranslator { return newVersion; } - public void load(String sourceDatabaseId) throws OseeDataStoreException { + public void load(String sourceDatabaseId) throws OseeCoreException { IOseeStatement chStmt = service.getStatement(); try { originalToMapped.clear(); @@ -133,7 +133,7 @@ public class IdTranslator { return !newIds.isEmpty(); } - public void store(OseeConnection connection, int sequenceId) throws OseeDataStoreException { + public void store(OseeConnection connection, int sequenceId) throws OseeCoreException { if (hasItemsToStore()) { List data = new ArrayList(); for (Long original : newIds) { diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ImportController.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ImportController.java index dac5ba9c3be..618ae0ffa3f 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ImportController.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ImportController.java @@ -35,7 +35,6 @@ import org.eclipse.osee.framework.branch.management.exchange.transform.IExchange import org.eclipse.osee.framework.branch.management.internal.Activator; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.operation.OperationReporter; @@ -232,7 +231,7 @@ public final class ImportController { } } - private void loadImportTrace(String sourceDatabaseId, Date sourceExportDate) throws OseeDataStoreException { + private void loadImportTrace(String sourceDatabaseId, Date sourceExportDate) throws OseeCoreException { IOseeStatement chStmt = oseeServices.getDatabaseService().getStatement(); try { currentSavePoint = "load.save.points"; @@ -286,7 +285,7 @@ public final class ImportController { branchesStored = new int[0]; } - public void updateBranchParentTransactionId() throws OseeDataStoreException { + public void updateBranchParentTransactionId() throws OseeCoreException { currentSavePoint = "update branch parent transaction id"; if (!doesSavePointExist(currentSavePoint)) { if (branchesStored.length > 0) { diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/TranslationManager.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/TranslationManager.java index 7c3304b884d..145bf577a7c 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/TranslationManager.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/TranslationManager.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import org.eclipse.osee.framework.branch.management.ImportOptions; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.core.OseeConnection; import org.eclipse.osee.framework.resource.management.Options; @@ -48,7 +48,7 @@ public class TranslationManager { } } - public void loadTranslators(String sourceDatabaseId) throws OseeDataStoreException { + public void loadTranslators(String sourceDatabaseId) throws OseeCoreException { for (IdTranslator translator : translators) { translator.load(sourceDatabaseId); } @@ -62,7 +62,7 @@ public class TranslationManager { return toReturn; } - public void store(OseeConnection connection, int importIdIndex) throws OseeDataStoreException { + public void store(OseeConnection connection, int importIdIndex) throws OseeCoreException { List data = new ArrayList(); for (IdTranslator translatedIdMap : translators) { if (translatedIdMap.hasItemsToStore()) { @@ -78,7 +78,7 @@ public class TranslationManager { return translatorMap.containsKey(name.toLowerCase()); } - public Object translate(String name, Object original) throws OseeDataStoreException { + public Object translate(String name, Object original) throws OseeCoreException { Object toReturn = original; if (original != null && !useOriginalIds) { IdTranslator translator = translatorMap.get(name.toLowerCase()); diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/export/MetadataExportItem.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/export/MetadataExportItem.java index 8d022b9a250..5f6810826d2 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/export/MetadataExportItem.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/export/MetadataExportItem.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.osee.framework.branch.management.exchange.ExportImportXml; import org.eclipse.osee.framework.branch.management.exchange.handler.ExportItem; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.SQL3DataType; import org.eclipse.osee.framework.database.core.SupportedDatabase; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -133,7 +133,7 @@ public class MetadataExportItem extends AbstractDbExportItem { } } - private void processColumnMetaData(Appendable appendable, DatabaseMetaData metaData, String schema, String tableName) throws SQLException, OseeDataStoreException, IOException { + private void processColumnMetaData(Appendable appendable, DatabaseMetaData metaData, String schema, String tableName) throws SQLException, IOException, OseeCoreException { ResultSet resultSet = null; try { try { diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BaseDbSaxHandler.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BaseDbSaxHandler.java index d36c9120fc7..7b910bb1516 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BaseDbSaxHandler.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BaseDbSaxHandler.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.branch.management.exchange.handler; import java.util.ArrayList; import java.util.List; import org.eclipse.osee.framework.branch.management.exchange.TranslationManager; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.core.OseeConnection; import org.eclipse.osee.framework.resource.management.Options; @@ -91,14 +91,14 @@ public abstract class BaseDbSaxHandler extends BaseExportImportSaxHandler { this.data.add(objects); } - protected void store(OseeConnection connection) throws OseeDataStoreException { + protected void store(OseeConnection connection) throws OseeCoreException { if (this.data.isEmpty() != true) { getDatabaseService().runBatchUpdate(connection, getMetaData().getQuery(), this.data); this.data.clear(); } } - public void clearDataTable() throws OseeDataStoreException { + public void clearDataTable() throws OseeCoreException { getDatabaseService().runPreparedUpdate(connection, String.format("DELETE FROM %s", getMetaData().getTableName())); } diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BranchDataSaxHandler.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BranchDataSaxHandler.java index 3e42aa48082..c3e21f689a1 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BranchDataSaxHandler.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BranchDataSaxHandler.java @@ -22,6 +22,7 @@ import org.eclipse.osee.framework.branch.management.exchange.ExchangeDb; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.core.exception.OseeArgumentException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.core.IOseeStatement; @@ -109,7 +110,7 @@ public class BranchDataSaxHandler extends BaseDbSaxHandler { } } - public int[] store(boolean writeToDb, int... branchesToImport) throws OseeDataStoreException { + public int[] store(boolean writeToDb, int... branchesToImport) throws OseeCoreException { checkSelectedBranches(branchesToImport); Collection branchesToStore = getSelectedBranchesToImport(branchesToImport); @@ -144,7 +145,7 @@ public class BranchDataSaxHandler extends BaseDbSaxHandler { return toReturn; } - public void updateParentTransactionId(int[] branchesStored) throws OseeDataStoreException { + public void updateParentTransactionId(int[] branchesStored) throws OseeCoreException { List branches = getSelectedBranchesToImport(branchesStored); List data = new ArrayList(); for (BranchData branchData : branches) { @@ -159,13 +160,13 @@ public class BranchDataSaxHandler extends BaseDbSaxHandler { getDatabaseService().runBatchUpdate(query, data); } - private int translateId(String id, int originalValue) throws OseeDataStoreException { + private int translateId(String id, int originalValue) throws OseeCoreException { Long original = new Long(originalValue); Long newValue = (Long) getTranslator().translate(id, original); return newValue.intValue(); } - private Collection checkTargetDbBranches(Collection selectedBranches) throws OseeDataStoreException { + private Collection checkTargetDbBranches(Collection selectedBranches) throws OseeCoreException { Map guidToImportFileBranchData = new HashMap(); for (BranchData data : selectedBranches) { guidToImportFileBranchData.put(data.getBranchGuid(), data); @@ -191,7 +192,7 @@ public class BranchDataSaxHandler extends BaseDbSaxHandler { } @Override - public void clearDataTable() throws OseeDataStoreException { + public void clearDataTable() throws OseeCoreException { getDatabaseService().runPreparedUpdate( getConnection(), String.format("DELETE FROM %s where NOT branch_type = " + BranchType.SYSTEM_ROOT.getValue(), diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/DataToSql.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/DataToSql.java index 1dd8031daf0..9dfc758af9d 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/DataToSql.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/DataToSql.java @@ -14,7 +14,7 @@ import java.lang.reflect.Method; import java.util.Map; import org.eclipse.osee.framework.branch.management.exchange.TranslationManager; import org.eclipse.osee.framework.core.exception.OseeArgumentException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.OseeConnection; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -43,7 +43,7 @@ public class DataToSql { return notNullCount > 0 ? data : null; } - public static Object[] toDataArray(OseeConnection connection, MetaData metadata, TranslationManager translator, Map fieldMap) throws OseeArgumentException, OseeDataStoreException { + public static Object[] toDataArray(OseeConnection connection, MetaData metadata, TranslationManager translator, Map fieldMap) throws OseeCoreException { int notNullCount = 0; Object[] data = new Object[metadata.getColumnSize()]; int index = 0; diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/DbTableSaxHandler.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/DbTableSaxHandler.java index c6c9618cbd8..fb3c12ee51d 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/DbTableSaxHandler.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/DbTableSaxHandler.java @@ -25,7 +25,6 @@ import org.eclipse.osee.framework.branch.management.exchange.resource.ZipBinaryR import org.eclipse.osee.framework.branch.management.internal.Activator; import org.eclipse.osee.framework.core.enums.ConflictType; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -66,7 +65,7 @@ public class DbTableSaxHandler extends BaseDbSaxHandler { } } - public void store() throws OseeDataStoreException { + public void store() throws OseeCoreException { super.store(this.getConnection()); } @@ -206,7 +205,7 @@ public class DbTableSaxHandler extends BaseDbSaxHandler { } @Override - public void clearDataTable() throws OseeDataStoreException { + public void clearDataTable() throws OseeCoreException { if (!getMetaData().getTableName().equals("osee_tx_details")) { super.clearDataTable(); } diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/MetaDataSaxHandler.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/MetaDataSaxHandler.java index 96851404525..91e76faa58b 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/MetaDataSaxHandler.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/MetaDataSaxHandler.java @@ -19,7 +19,6 @@ import java.util.HashMap; import java.util.Map; import org.eclipse.osee.framework.branch.management.exchange.ExportImportXml; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.core.OseeConnection; import org.eclipse.osee.framework.database.core.SQL3DataType; @@ -99,7 +98,7 @@ public class MetaDataSaxHandler extends AbstractSaxHandler { this.targetMetadataMap.putAll(targetTables); } - private Map getTargetDbMetadata() throws SQLException, OseeDataStoreException { + private Map getTargetDbMetadata() throws SQLException, OseeCoreException { Map targetDbMetadata = new HashMap(); OseeConnection connection = service.getConnection(); try { @@ -113,7 +112,7 @@ public class MetaDataSaxHandler extends AbstractSaxHandler { return targetDbMetadata; } - private void processMetaData(Map targetDbMetadata, DatabaseMetaData dbMetaData, String targetTable) throws SQLException, OseeDataStoreException { + private void processMetaData(Map targetDbMetadata, DatabaseMetaData dbMetaData, String targetTable) throws SQLException, OseeCoreException { ResultSet resultSet = null; try { resultSet = dbMetaData.getTables(null, null, null, new String[] {"TABLE"}); @@ -136,7 +135,7 @@ public class MetaDataSaxHandler extends AbstractSaxHandler { } } - private void processColumnMetaData(MetaData currentMetadata, DatabaseMetaData dbMetaData, String schema, String tableName) throws SQLException, OseeDataStoreException { + private void processColumnMetaData(MetaData currentMetadata, DatabaseMetaData dbMetaData, String schema, String tableName) throws SQLException, OseeCoreException { ResultSet resultSet = null; try { diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/resource/ExchangeProvider.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/resource/ExchangeProvider.java index 2f204ed97bd..5ef072fb710 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/resource/ExchangeProvider.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/resource/ExchangeProvider.java @@ -60,7 +60,7 @@ public class ExchangeProvider implements IResourceProvider { try { toReturn = new URI(rawPath); } catch (URISyntaxException ex) { - throw new MalformedLocatorException(rawPath, ex); + throw new MalformedLocatorException(ex); } } return toReturn; diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/PurgeBranchOperation.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/PurgeBranchOperation.java index 884398cecb9..d4c04138d22 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/PurgeBranchOperation.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/purge/PurgeBranchOperation.java @@ -18,7 +18,6 @@ import org.eclipse.osee.framework.branch.management.internal.Activator; import org.eclipse.osee.framework.core.enums.StorageState; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.cache.BranchCache; import org.eclipse.osee.framework.core.services.IOseeCachingServiceProvider; @@ -114,7 +113,7 @@ public class PurgeBranchOperation extends AbstractDbTxOperation { branchCache.decache(branch); } - private void purgeGammas(String tableName, double percentage) throws OseeDataStoreException { + private void purgeGammas(String tableName, double percentage) throws OseeCoreException { if (!deleteableGammas.isEmpty()) { monitor.setTaskName(String.format("Purge from %s", tableName)); checkForCancelledStatus(monitor); @@ -124,7 +123,7 @@ public class PurgeBranchOperation extends AbstractDbTxOperation { monitor.worked(calculateWork(percentage)); } - private void purgeFromTable(String tableName, String sql, double percentage, Object... data) throws OseeDataStoreException { + private void purgeFromTable(String tableName, String sql, double percentage, Object... data) throws OseeCoreException { monitor.setTaskName(String.format("Purge from %s", tableName)); checkForCancelledStatus(monitor); oseeDatabaseProvider.getOseeDatabaseService().runPreparedUpdate(connection, sql, data); @@ -144,7 +143,7 @@ public class PurgeBranchOperation extends AbstractDbTxOperation { } } - private void purgeAddressing(double percentage) throws OseeDataStoreException { + private void purgeAddressing(double percentage) throws OseeCoreException { monitor.setTaskName("Purge txs addressing"); IOseeStatement chStmt = oseeDatabaseProvider.getOseeDatabaseService().getStatement(connection); List addressing = new ArrayList(); diff --git a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/server/HttpUrlBuilderClient.java b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/server/HttpUrlBuilderClient.java index bac8004b1bb..0cc809a7011 100644 --- a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/server/HttpUrlBuilderClient.java +++ b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/server/HttpUrlBuilderClient.java @@ -19,6 +19,7 @@ import org.eclipse.osee.framework.core.client.OseeClientProperties; import org.eclipse.osee.framework.core.client.internal.OseeApplicationServer; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.jdk.core.util.HttpUrlBuilder; import org.eclipse.osee.framework.logging.OseeLog; @@ -74,15 +75,17 @@ public class HttpUrlBuilderClient { try { return HttpUrlBuilder.createURL(getApplicationServerPrefix(), context, parameters); } catch (UnsupportedEncodingException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } - public String getOsgiArbitrationServiceUrl(String context, Map parameters) throws OseeDataStoreException { + public String getOsgiArbitrationServiceUrl(String context, Map parameters) throws OseeCoreException { try { return HttpUrlBuilder.createURL(getArbitrationServerPrefix(), context, parameters); } catch (UnsupportedEncodingException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } } diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/DatastoreInitOperation.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/DatastoreInitOperation.java index 90384118062..355b8ce1fb4 100644 --- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/DatastoreInitOperation.java +++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/DatastoreInitOperation.java @@ -17,7 +17,7 @@ import org.eclipse.osee.framework.branch.management.IOseeBranchService; import org.eclipse.osee.framework.core.datastore.internal.Activator; import org.eclipse.osee.framework.core.datastore.schema.operations.OperationFactory; import org.eclipse.osee.framework.core.enums.PermissionEnum; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.core.server.IApplicationServerManager; @@ -81,7 +81,7 @@ public class DatastoreInitOperation extends AbstractOperation { } @SuppressWarnings("unchecked") - private void addDefaultPermissions() throws OseeDataStoreException { + private void addDefaultPermissions() throws OseeCoreException { for (PermissionEnum permission : PermissionEnum.values()) { dbService.runPreparedUpdate(ADD_PERMISSION, permission.getPermId(), permission.getName()); } diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseArtifactTypeAccessor.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseArtifactTypeAccessor.java index 323837748b2..a62ff79c5d8 100644 --- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseArtifactTypeAccessor.java +++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseArtifactTypeAccessor.java @@ -235,7 +235,7 @@ public class DatabaseArtifactTypeAccessor extends AbstractDatabaseAccessor types) throws OseeDataStoreException { + private void storeArtifactTypeInheritance(Collection types) throws OseeCoreException { List insertInheritanceData = new ArrayList(); List deleteInheritanceData = new ArrayList(); for (ArtifactType type : types) { diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseAttributeTypeAccessor.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseAttributeTypeAccessor.java index 3e5fa9066fa..61e2bc577ef 100644 --- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseAttributeTypeAccessor.java +++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/cache/DatabaseAttributeTypeAccessor.java @@ -17,7 +17,6 @@ import java.util.logging.Level; import org.eclipse.osee.framework.core.datastore.internal.Activator; import org.eclipse.osee.framework.core.enums.StorageState; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.cache.IOseeCache; import org.eclipse.osee.framework.core.model.cache.OseeEnumTypeCache; import org.eclipse.osee.framework.core.model.type.AttributeType; @@ -126,7 +125,7 @@ public class DatabaseAttributeTypeAccessor extends AbstractDatabaseAccessor tables) throws OseeDataStoreException { + private void processData(List tables) throws OseeCoreException { if (tables.size() != 0) { for (TableData tableData : tables) { OseeLog.log(Activator.class, Level.INFO, "Populating: [ " + tableData.getFullyQualifiedTableName() + "]\n"); diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/MysqlSqlManager.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/MysqlSqlManager.java index 053fdb5df48..f38f90b99f7 100644 --- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/MysqlSqlManager.java +++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/MysqlSqlManager.java @@ -26,7 +26,7 @@ import org.eclipse.osee.framework.core.datastore.schema.data.ReferenceClause.OnD import org.eclipse.osee.framework.core.datastore.schema.data.ReferenceClause.OnUpdateEnum; import org.eclipse.osee.framework.core.datastore.schema.data.TableElement; import org.eclipse.osee.framework.core.datastore.schema.data.TableElement.ColumnFields; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.OseeConnection; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -52,7 +52,7 @@ public class MysqlSqlManager extends SqlManagerImpl { return toExecute; } - public void createTable(OseeConnection connection, TableElement tableDef) throws OseeDataStoreException { + public void createTable(OseeConnection connection, TableElement tableDef) throws OseeCoreException { String toExecute = "CREATE TABLE " + tableDef.getFullyQualifiedTableName() + " ( \n"; toExecute += handleColumnCreationSection(connection, tableDef.getColumns()); toExecute += handleConstraintCreationSection(tableDef.getConstraints(), tableDef.getFullyQualifiedTableName()); @@ -64,7 +64,7 @@ public class MysqlSqlManager extends SqlManagerImpl { } @Override - public void dropTable(TableElement tableDef) throws OseeDataStoreException { + public void dropTable(TableElement tableDef) throws OseeCoreException { String toExecute = "DROP TABLE " + formatQuotedString(tableDef.getFullyQualifiedTableName(), "\\."); OseeLog.log(Activator.class, Level.INFO, "Dropping Table: [ " + tableDef.getFullyQualifiedTableName() + "]"); ConnectionHandler.runPreparedUpdate(toExecute); @@ -80,7 +80,7 @@ public class MysqlSqlManager extends SqlManagerImpl { } @Override - public void dropIndex(TableElement tableDef) throws OseeDataStoreException { + public void dropIndex(TableElement tableDef) throws OseeCoreException { List tableIndices = tableDef.getIndexData(); String tableName = tableDef.getFullyQualifiedTableName(); for (IndexElement iData : tableIndices) { diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/OracleSqlManager.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/OracleSqlManager.java index bdcd8920e36..665cbb49aef 100644 --- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/OracleSqlManager.java +++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/OracleSqlManager.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.core.datastore.schema.data.ColumnMetadata; import org.eclipse.osee.framework.core.datastore.schema.data.IndexElement; import org.eclipse.osee.framework.core.datastore.schema.data.TableElement; import org.eclipse.osee.framework.core.datastore.schema.data.TableElement.ColumnFields; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.logging.OseeLog; @@ -45,7 +45,7 @@ public class OracleSqlManager extends SqlManager { } @Override - public void createTable(TableElement tableDef) throws OseeDataStoreException { + public void createTable(TableElement tableDef) throws OseeCoreException { StringBuilder toExecute = new StringBuilder(); toExecute.append(SqlManager.CREATE_STRING + " TABLE " + formatQuotedString(tableDef.getFullyQualifiedTableName(), "\\.") + " ( \n"); @@ -70,7 +70,7 @@ public class OracleSqlManager extends SqlManager { } @Override - public void dropTable(TableElement tableDef) throws OseeDataStoreException { + public void dropTable(TableElement tableDef) throws OseeCoreException { StringBuilder toExecute = new StringBuilder(); toExecute.append(SqlManager.DROP_STRING + " TABLE " + formatQuotedString(tableDef.getFullyQualifiedTableName(), "\\.") + " cascade constraints purge"); diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/PostgreSqlManager.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/PostgreSqlManager.java index 473b8ed9bf6..a3034544bc1 100644 --- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/PostgreSqlManager.java +++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/PostgreSqlManager.java @@ -27,7 +27,7 @@ import org.eclipse.osee.framework.core.datastore.schema.data.ReferenceClause.OnD import org.eclipse.osee.framework.core.datastore.schema.data.ReferenceClause.OnUpdateEnum; import org.eclipse.osee.framework.core.datastore.schema.data.TableElement; import org.eclipse.osee.framework.core.datastore.schema.data.TableElement.ColumnFields; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.OseeConnection; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -52,7 +52,7 @@ public class PostgreSqlManager extends SqlManagerImpl { return toExecute; } - public void createTable(OseeConnection connection, TableElement tableDef) throws OseeDataStoreException { + public void createTable(OseeConnection connection, TableElement tableDef) throws OseeCoreException { String toExecute = "CREATE TABLE " + tableDef.getFullyQualifiedTableName() + " ( \n"; toExecute += handleColumnCreationSection(connection, tableDef.getColumns()); toExecute += handleConstraintCreationSection(tableDef.getConstraints(), tableDef.getFullyQualifiedTableName()); @@ -64,7 +64,7 @@ public class PostgreSqlManager extends SqlManagerImpl { } @Override - public void dropTable(TableElement tableDef) throws OseeDataStoreException { + public void dropTable(TableElement tableDef) throws OseeCoreException { String toExecute = "DROP TABLE " + formatQuotedString(tableDef.getFullyQualifiedTableName(), "\\.") + " CASCADE"; OseeLog.log(Activator.class, Level.FINE, "Dropping Table: [ " + tableDef.getFullyQualifiedTableName() + "]"); ConnectionHandler.runPreparedUpdate(toExecute); @@ -79,7 +79,7 @@ public class PostgreSqlManager extends SqlManagerImpl { return StringUtils.join(array, splitAt.replaceAll("\\\\", "")); } - public void dropIndex(OseeConnection connection, TableElement tableDef) throws OseeDataStoreException { + public void dropIndex(OseeConnection connection, TableElement tableDef) throws OseeCoreException { List tableIndices = tableDef.getIndexData(); String tableName = tableDef.getFullyQualifiedTableName(); for (IndexElement iData : tableIndices) { @@ -155,7 +155,7 @@ public class PostgreSqlManager extends SqlManagerImpl { return toReturn.toString(); } - public void createIndex(OseeConnection connection, TableElement tableDef) throws OseeDataStoreException { + public void createIndex(OseeConnection connection, TableElement tableDef) throws OseeCoreException { List tableIndices = tableDef.getIndexData(); String indexId = null; StringBuilder appliesTo = new StringBuilder(); diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SchemaSqlUtil.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SchemaSqlUtil.java index 6c63551d795..760eca33afe 100644 --- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SchemaSqlUtil.java +++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SchemaSqlUtil.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.Set; import org.eclipse.osee.framework.core.datastore.schema.data.SchemaData; import org.eclipse.osee.framework.core.datastore.schema.data.TableElement; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; public class SchemaSqlUtil { private final SqlManager sqlManager; @@ -24,7 +24,7 @@ public class SchemaSqlUtil { this.sqlManager = sqlManager; } - public void addIndices(Set schemas, Map userSpecifiedConfig) throws OseeDataStoreException { + public void addIndices(Set schemas, Map userSpecifiedConfig) throws OseeCoreException { for (String schemaId : schemas) { if (userSpecifiedConfig.containsKey(schemaId)) { SchemaData schemaData = userSpecifiedConfig.get(schemaId); @@ -36,7 +36,7 @@ public class SchemaSqlUtil { } } - public void addTables(Set schemas, Map userSpecifiedConfig) throws OseeDataStoreException { + public void addTables(Set schemas, Map userSpecifiedConfig) throws OseeCoreException { for (String schemaId : schemas) { if (userSpecifiedConfig.containsKey(schemaId)) { SchemaData schemaData = userSpecifiedConfig.get(schemaId); @@ -49,7 +49,7 @@ public class SchemaSqlUtil { } } - public void dropTables(Set schemas, Map userSpecifiedConfig, Map currentDatabaseConfig) throws OseeDataStoreException { + public void dropTables(Set schemas, Map userSpecifiedConfig, Map currentDatabaseConfig) throws OseeCoreException { for (String schemaId : schemas) { if (currentDatabaseConfig.containsKey(schemaId)) { SchemaData currentDbSchemaData = currentDatabaseConfig.get(schemaId); @@ -75,7 +75,7 @@ public class SchemaSqlUtil { } } - public void dropIndices(Set schemas, Map userSpecifiedConfig, Map currentDatabaseConfig) throws OseeDataStoreException { + public void dropIndices(Set schemas, Map userSpecifiedConfig, Map currentDatabaseConfig) throws OseeCoreException { for (String schemaId : schemas) { if (currentDatabaseConfig.containsKey(schemaId)) { SchemaData currentDbSchemaData = currentDatabaseConfig.get(schemaId); @@ -99,13 +99,13 @@ public class SchemaSqlUtil { } } - public void createSchema(Set schemas) throws OseeDataStoreException { + public void createSchema(Set schemas) throws OseeCoreException { for (String schemaId : schemas) { sqlManager.createSchema(schemaId.toLowerCase()); } } - public void dropSchema(Set schemas) throws OseeDataStoreException { + public void dropSchema(Set schemas) throws OseeCoreException { for (String schemaId : schemas) { sqlManager.dropSchema(schemaId.toLowerCase()); } diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SqlFactory.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SqlFactory.java index 857d92f44ec..612aac946c3 100644 --- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SqlFactory.java +++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SqlFactory.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.core.datastore.schema.sql; import java.sql.DatabaseMetaData; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.SupportedDatabase; /** @@ -23,7 +23,7 @@ public class SqlFactory { super(); } - public static SqlManager getSqlManager(DatabaseMetaData metaData) throws OseeDataStoreException { + public static SqlManager getSqlManager(DatabaseMetaData metaData) throws OseeCoreException { return getSqlManager(SupportedDatabase.getDatabaseType(metaData)); } diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SqlManager.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SqlManager.java index 564c80e3383..9d7e5c75e32 100644 --- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SqlManager.java +++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SqlManager.java @@ -34,6 +34,7 @@ import org.eclipse.osee.framework.core.datastore.schema.data.ReferenceClause.OnU import org.eclipse.osee.framework.core.datastore.schema.data.SchemaDataLookup; import org.eclipse.osee.framework.core.datastore.schema.data.TableElement; import org.eclipse.osee.framework.core.datastore.schema.data.TableElement.ColumnFields; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.SQL3DataType; @@ -53,11 +54,11 @@ public abstract class SqlManager { this.sqlDataType = sqlDataType; } - public abstract void createTable(TableElement tableDef) throws OseeDataStoreException; + public abstract void createTable(TableElement tableDef) throws OseeCoreException; - public abstract void dropTable(TableElement tableDef) throws OseeDataStoreException; + public abstract void dropTable(TableElement tableDef) throws OseeCoreException; - public void insertData(List rowData, TableElement tableMetadata) throws OseeDataStoreException { + public void insertData(List rowData, TableElement tableMetadata) throws OseeCoreException { List columnNames = new ArrayList(); List placeHolders = new ArrayList(); List columnValues = new ArrayList(); @@ -233,11 +234,11 @@ public abstract class SqlManager { return toReturn.toString(); } - public void createSchema(String schema) throws OseeDataStoreException { + public void createSchema(String schema) throws OseeCoreException { ConnectionHandler.runPreparedUpdate(CREATE_STRING + " SCHEMA \"" + schema + "\""); } - public void dropSchema(String schema) throws OseeDataStoreException { + public void dropSchema(String schema) throws OseeCoreException { ConnectionHandler.runPreparedUpdate(DROP_STRING + " SCHEMA \"" + schema + "\" CASCADE"); } @@ -251,7 +252,7 @@ public abstract class SqlManager { return toExecute.toString(); } - public void createIndex(TableElement tableDef) throws OseeDataStoreException { + public void createIndex(TableElement tableDef) throws OseeCoreException { List tableIndices = tableDef.getIndexData(); String indexId = null; StringBuilder appliesTo = new StringBuilder(); @@ -295,7 +296,7 @@ public abstract class SqlManager { return original; } - public void dropIndex(TableElement tableDef) throws OseeDataStoreException { + public void dropIndex(TableElement tableDef) throws OseeCoreException { List tableIndices = tableDef.getIndexData(); String tableName = tableDef.getFullyQualifiedTableName(); for (IndexElement iData : tableIndices) { diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SqlManagerImpl.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SqlManagerImpl.java index 10c698953d7..f95810fb859 100644 --- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SqlManagerImpl.java +++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/schema/sql/SqlManagerImpl.java @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.datastore.internal.Activator; import org.eclipse.osee.framework.core.datastore.schema.data.ColumnMetadata; import org.eclipse.osee.framework.core.datastore.schema.data.TableElement; import org.eclipse.osee.framework.core.datastore.schema.data.TableElement.ColumnFields; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.logging.OseeLog; @@ -44,7 +44,7 @@ public class SqlManagerImpl extends SqlManager { } @Override - public void createTable(TableElement tableDef) throws OseeDataStoreException { + public void createTable(TableElement tableDef) throws OseeCoreException { StringBuilder toExecute = new StringBuilder(); toExecute.append(SqlManager.CREATE_STRING + " TABLE " + formatQuotedString(tableDef.getFullyQualifiedTableName(), "\\.") + " ( \n"); @@ -58,7 +58,7 @@ public class SqlManagerImpl extends SqlManager { } @Override - public void dropTable(TableElement tableDef) throws OseeDataStoreException { + public void dropTable(TableElement tableDef) throws OseeCoreException { StringBuilder toExecute = new StringBuilder(); toExecute.append(SqlManager.DROP_STRING + " TABLE " + formatQuotedString(tableDef.getFullyQualifiedTableName(), "\\.")); diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/OseeModelingServiceImpl.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/OseeModelingServiceImpl.java index a85d4c0e34c..922e2b9e6a5 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/OseeModelingServiceImpl.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/internal/OseeModelingServiceImpl.java @@ -27,7 +27,7 @@ import org.eclipse.osee.framework.core.dsl.integration.util.ModelUtil; import org.eclipse.osee.framework.core.dsl.oseeDsl.OseeDsl; import org.eclipse.osee.framework.core.dsl.oseeDsl.OseeDslFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeWrappedException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.message.IOseeModelingService; import org.eclipse.osee.framework.core.message.OseeImportModelRequest; import org.eclipse.osee.framework.core.message.OseeImportModelResponse; @@ -71,7 +71,7 @@ public class OseeModelingServiceImpl implements IOseeModelingService { try { ModelUtil.saveModel(model, "osee:/oseeTypes_" + Lib.getDateTimeString() + ".osee", outputStream, false); } catch (IOException ex) { - throw new OseeWrappedException(ex); + OseeExceptions.wrapAndThrow(ex); } } diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/util/ModelUtil.java b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/util/ModelUtil.java index aaf3cf5693e..ce03a2e9af1 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/util/ModelUtil.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/src/org/eclipse/osee/framework/core/dsl/integration/util/ModelUtil.java @@ -29,8 +29,8 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl; import org.eclipse.osee.framework.core.dsl.OseeDslStandaloneSetup; import org.eclipse.osee.framework.core.dsl.oseeDsl.OseeDsl; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.exception.OseeStateException; -import org.eclipse.osee.framework.core.exception.OseeWrappedException; import org.eclipse.xtext.resource.SaveOptions; import org.eclipse.xtext.resource.XtextResource; import org.eclipse.xtext.resource.XtextResourceSet; @@ -58,7 +58,7 @@ public final class ModelUtil { resource.setURI(URI.createURI("http://www.eclipse.org/osee/framework/OseeTypes")); resource.load(inputStream, options); } catch (IOException ex) { - throw new OseeWrappedException(ex); + OseeExceptions.wrapAndThrow(ex); } OseeDsl model = (OseeDsl) resource.getContents().get(0); for (Diagnostic diagnostic : resource.getErrors()) { @@ -84,7 +84,8 @@ public final class ModelUtil { } return model; } catch (IOException ex) { - throw new OseeWrappedException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } @@ -110,7 +111,7 @@ public final class ModelUtil { resource.getContents().add(object); resource.save(outputStream, options); } catch (IOException ex) { - throw new OseeWrappedException(ex); + OseeExceptions.wrapAndThrow(ex); } } @@ -133,7 +134,8 @@ public final class ModelUtil { try { return outputStream.toString("UTF-8"); } catch (UnsupportedEncodingException ex) { - throw new OseeWrappedException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } @@ -145,7 +147,7 @@ public final class ModelUtil { resource.load(new ByteArrayInputStream(compareData.getBytes("UTF-8")), resourceSet.getLoadOptions()); snapshot = (ComparisonSnapshot) resource.getContents().get(0); } catch (IOException ex) { - throw new OseeWrappedException(ex); + OseeExceptions.wrapAndThrow(ex); } return snapshot; } diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerDataStore.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerDataStore.java index 6538f51d3b5..b120cd45666 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerDataStore.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerDataStore.java @@ -51,7 +51,7 @@ public class ApplicationServerDataStore { private static final String SELECT_SUPPORTED_VERSIONS_FROM_LOOKUP_TABLE_BY_SERVER_ID = "SELECT version_id FROM osee_server_lookup where server_id = ?"; - static void removeByServerId(Collection infos) throws OseeDataStoreException { + static void removeByServerId(Collection infos) throws OseeCoreException { if (!infos.isEmpty()) { List data = new ArrayList(); for (OseeServerInfo info : infos) { @@ -99,7 +99,7 @@ public class ApplicationServerDataStore { } @SuppressWarnings("unchecked") - static boolean updateServerState(OseeServerInfo applicationServerInfo, boolean state) throws OseeDataStoreException { + static boolean updateServerState(OseeServerInfo applicationServerInfo, boolean state) throws OseeCoreException { ConnectionHandler.runPreparedUpdate(UPDATE_LOOKUP_TABLE, state ? 1 : 0, applicationServerInfo.getServerAddress(), applicationServerInfo.getPort()); return true; @@ -118,7 +118,7 @@ public class ApplicationServerDataStore { return result; } - static Collection getApplicationServerInfos(String clientVersion) throws OseeDataStoreException { + static Collection getApplicationServerInfos(String clientVersion) throws OseeCoreException { CompositeKeyHashMap servers = new CompositeKeyHashMap(); if (Strings.isValid(clientVersion)) { @@ -159,7 +159,7 @@ public class ApplicationServerDataStore { return servers.values(); } - static Collection getAllApplicationServerInfos() throws OseeDataStoreException { + static Collection getAllApplicationServerInfos() throws OseeCoreException { Collection infos = new ArrayList(); IOseeStatement chStmt = ConnectionHandler.getStatement(); try { @@ -198,7 +198,7 @@ public class ApplicationServerDataStore { return supportedVersions; } - static int getNumberOfSessions(String serverId) throws OseeDataStoreException { + static int getNumberOfSessions(String serverId) throws OseeCoreException { return ConnectionHandler.runPreparedQueryFetchInt(0, GET_NUMBER_OF_SESSIONS, serverId); } } diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerLookup.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerLookup.java index eecbfbfccd5..2109afc2651 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerLookup.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerLookup.java @@ -69,7 +69,7 @@ public class ApplicationServerLookup implements IApplicationServerLookup { public void run() { try { ApplicationServerDataStore.removeByServerId(unHealthyServers); - } catch (OseeDataStoreException ex) { + } catch (OseeCoreException ex) { OseeLog.log(ServerActivator.class, Level.SEVERE, String.format("Error removing unhealthy server entries: [%s]", unHealthyServers), ex); } @@ -79,7 +79,7 @@ public class ApplicationServerLookup implements IApplicationServerLookup { } } - private OseeServerInfo getBestAvailable(Collection infos) { + private OseeServerInfo getBestAvailable(Collection infos) throws OseeCoreException { OseeServerInfo result = null; if (infos.size() == 1) { result = infos.iterator().next(); diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerManager.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerManager.java index 920c6f62ba1..2cfb9d6d2c4 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerManager.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerManager.java @@ -27,7 +27,6 @@ import java.util.concurrent.ThreadFactory; import java.util.logging.Level; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.operation.OperationJob; import org.eclipse.osee.framework.core.server.IApplicationServerManager; import org.eclipse.osee.framework.core.server.OseeHttpServlet; @@ -148,7 +147,7 @@ public class ApplicationServerManager implements IApplicationServerManager { } @Override - public synchronized void setServletRequestsAllowed(final boolean value) throws OseeDataStoreException { + public synchronized void setServletRequestsAllowed(final boolean value) throws OseeCoreException { if (getApplicationServerInfo().isAcceptingRequests() != value) { boolean wasSuccessful = ApplicationServerDataStore.updateServerState(getApplicationServerInfo(), value); if (wasSuccessful) { diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/compatibility/OseeSql_0_9_1.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/compatibility/OseeSql_0_9_1.java index 9e567dc6893..17981068f88 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/compatibility/OseeSql_0_9_1.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/compatibility/OseeSql_0_9_1.java @@ -16,7 +16,7 @@ import org.eclipse.osee.framework.core.enums.ConflictStatus; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.TransactionDetailsType; import org.eclipse.osee.framework.core.enums.TxChange; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.SupportedDatabase; /** @@ -78,7 +78,7 @@ public enum OseeSql_0_9_1 { this(sql, null); } - public static Properties getSqlProperties(DatabaseMetaData metaData) throws OseeDataStoreException { + public static Properties getSqlProperties(DatabaseMetaData metaData) throws OseeCoreException { Properties sqlProperties = new Properties(); boolean areHintsSupported = SupportedDatabase.areHintsSupported(metaData); for (OseeSql_0_9_1 oseeSql : OseeSql_0_9_1.values()) { diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAuthenticationException.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAuthenticationException.java index 0dea02973dc..0d2f1e9c084 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAuthenticationException.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAuthenticationException.java @@ -27,21 +27,11 @@ public class OseeAuthenticationException extends OseeCoreException { private final AuthenticationErrorCode errorCode; - public OseeAuthenticationException(String message, Throwable cause) { - super(message, cause); - this.errorCode = null; - } - public OseeAuthenticationException(String message) { super(message); this.errorCode = null; } - public OseeAuthenticationException(Throwable cause) { - super(cause); - this.errorCode = null; - } - public AuthenticationErrorCode getCode() { return errorCode; } diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeDataStoreException.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeDataStoreException.java index 62f7aeac26d..0686995dc5a 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeDataStoreException.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeDataStoreException.java @@ -16,15 +16,7 @@ package org.eclipse.osee.framework.core.exception; public class OseeDataStoreException extends OseeCoreException { private static final long serialVersionUID = 7339636628746394923L; - public OseeDataStoreException(String message, Throwable cause) { - super(message, cause); - } - public OseeDataStoreException(String message) { super(message); } - - public OseeDataStoreException(Throwable cause) { - super(cause); - } -} +} \ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeExceptions.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeExceptions.java index 232e0345ccb..5813116d32e 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeExceptions.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeExceptions.java @@ -20,10 +20,14 @@ public final class OseeExceptions { } public static void wrapAndThrow(Throwable ex) throws OseeCoreException { + throw wrap(ex); + } + + public static OseeCoreException wrap(Throwable ex) { if (ex instanceof OseeCoreException) { - throw (OseeCoreException) ex; + return (OseeCoreException) ex; } else { - throw new OseeWrappedException(ex); + return new OseeWrappedException(ex); } } } \ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeInvalidInheritanceException.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeInvalidInheritanceException.java index 9f24b343e1e..df29e9a92ad 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeInvalidInheritanceException.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeInvalidInheritanceException.java @@ -17,12 +17,4 @@ public class OseeInvalidInheritanceException extends OseeCoreException { public OseeInvalidInheritanceException(String message) { super(message); } - - public OseeInvalidInheritanceException(String message, Throwable cause) { - super(message, cause); - } - - public OseeInvalidInheritanceException(Throwable cause) { - super(cause); - } } diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/Conditions.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/Conditions.java index 471f401cf2b..273fbf824b0 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/Conditions.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/Conditions.java @@ -48,7 +48,7 @@ public final class Conditions { public static void checkNotNullOrEmpty(Collection collection, String objectName) throws OseeCoreException { checkNotNull(collection, objectName); if (collection.isEmpty()) { - throw new OseeArgumentException("%s cannot be empty", objectName); + throw new OseeArgumentException(String.format("%s cannot be empty", objectName)); } } diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpMessage.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpMessage.java index 82c81eee5d9..8e353c36fab 100644 --- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpMessage.java +++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpMessage.java @@ -48,7 +48,7 @@ public final class HttpMessage { } } catch (Exception ex) { OseeExceptions.wrapAndThrow(ex); - return null; // this line is not reachable since wrapAndThrow always throws an exception + return null; // unreachable since wrapAndThrow() always throws an exception } finally { Lib.close(inputStream); } diff --git a/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/SkynetDbBranchDataImport.java b/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/SkynetDbBranchDataImport.java index 43e45adfddf..042ea71f60c 100644 --- a/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/SkynetDbBranchDataImport.java +++ b/plugins/org.eclipse.osee.framework.database.init/src/org/eclipse/osee/framework/database/init/SkynetDbBranchDataImport.java @@ -11,10 +11,8 @@ package org.eclipse.osee.framework.database.init; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; import java.net.URI; -import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.Collection; @@ -31,8 +29,11 @@ import org.eclipse.osee.framework.core.client.OseeClientProperties; import org.eclipse.osee.framework.core.enums.BranchArchivedState; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.enums.CoreBranches; +import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; +import org.eclipse.osee.framework.core.exception.OseeNotFoundException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.database.init.internal.DatabaseInitActivator; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -79,7 +80,7 @@ public class SkynetDbBranchDataImport implements IDbInitializationTask { } } - private Collection loadDataFromExtensions() throws OseeDataStoreException { + private Collection loadDataFromExtensions() throws OseeCoreException { List toReturn = new ArrayList(); Map selectedBranches = new HashMap(); List elements = ExtensionPoints.getExtensionElements(EXTENSION_POINT, ELEMENT_NAME); @@ -92,7 +93,8 @@ public class SkynetDbBranchDataImport implements IDbInitializationTask { try { exchangeFile = getExchangeFile(bundleName, branchData); } catch (Exception ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } ImportData importData = new ImportData(exchangeFile); for (IConfigurationElement innerElement : element.getChildren(BRANCHES_TO_IMPORT)) { @@ -119,20 +121,25 @@ public class SkynetDbBranchDataImport implements IDbInitializationTask { return toReturn; } - private File getExchangeFile(String bundleName, String exchangeFile) throws IOException, URISyntaxException { + private File getExchangeFile(String bundleName, String exchangeFile) throws IOException, OseeCoreException { if (exchangeFile.endsWith("zip") != true) { - throw new IOException(String.format("Branch data file is invalid [%s] ", exchangeFile)); + throw new OseeArgumentException(String.format("Branch data file is invalid [%s] ", exchangeFile)); } Bundle bundle = Platform.getBundle(bundleName); URL url = bundle.getResource(exchangeFile); - url = FileLocator.toFileURL(url); - String urlValue = url.toString(); - URI uri = new URI(urlValue.replaceAll(" ", "%20")); - File toReturn = new File(uri); - if (toReturn.exists() != true) { - throw new FileNotFoundException(String.format("Branch data file cannot be found [%s]", exchangeFile)); + try { + url = FileLocator.toFileURL(url); + String urlValue = url.toString(); + URI uri = new URI(urlValue.replaceAll(" ", "%20")); + File toReturn = new File(uri); + if (!toReturn.exists()) { + throw new OseeNotFoundException(String.format("Branch data file cannot be found [%s]", exchangeFile)); + } + return toReturn; + } catch (Exception ex) { + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } - return toReturn; } private static final class ImportData { diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/IOseeDatabaseService.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/IOseeDatabaseService.java index 500102f6b09..736cba49a31 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/IOseeDatabaseService.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/IOseeDatabaseService.java @@ -33,21 +33,21 @@ public interface IOseeDatabaseService { IOseeStatement getStatement(int resultSetType, int resultSetConcurrency) throws OseeDataStoreException; - OseeConnection getConnection() throws OseeDataStoreException; + OseeConnection getConnection() throws OseeCoreException; - OseeConnection getConnection(IDatabaseInfo info) throws OseeDataStoreException; + OseeConnection getConnection(IDatabaseInfo info) throws OseeCoreException; - int runBatchUpdate(String query, List dataList) throws OseeDataStoreException; + int runBatchUpdate(String query, List dataList) throws OseeCoreException; - int runPreparedUpdate(String query, O... data) throws OseeDataStoreException; + int runPreparedUpdate(String query, O... data) throws OseeCoreException; - int runBatchUpdate(OseeConnection connection, String query, List dataList) throws OseeDataStoreException; + int runBatchUpdate(OseeConnection connection, String query, List dataList) throws OseeCoreException; - int runPreparedUpdate(OseeConnection connection, String query, O... data) throws OseeDataStoreException; + int runPreparedUpdate(OseeConnection connection, String query, O... data) throws OseeCoreException; - T runPreparedQueryFetchObject(T defaultValue, String query, O... data) throws OseeDataStoreException; + T runPreparedQueryFetchObject(T defaultValue, String query, O... data) throws OseeCoreException; - T runPreparedQueryFetchObject(OseeConnection connection, T defaultValue, String query, O... data) throws OseeDataStoreException; + T runPreparedQueryFetchObject(OseeConnection connection, T defaultValue, String query, O... data) throws OseeCoreException; boolean isProduction() throws OseeCoreException; } diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/ConnectionHandler.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/ConnectionHandler.java index 30875a26951..2c122d64d76 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/ConnectionHandler.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/ConnectionHandler.java @@ -16,6 +16,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; import org.eclipse.osee.framework.core.data.IDatabaseInfo; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.internal.Activator; @@ -38,14 +39,14 @@ public final class ConnectionHandler { /** * Avoid using if possible */ - public static OseeConnection getConnection() throws OseeDataStoreException { + public static OseeConnection getConnection() throws OseeCoreException { return getDatabase().getConnection(); } /** * Avoid using if possible */ - public static OseeConnection getConnection(IDatabaseInfo info) throws OseeDataStoreException { + public static OseeConnection getConnection(IDatabaseInfo info) throws OseeCoreException { return getDatabase().getConnection(info); } @@ -66,7 +67,7 @@ public final class ConnectionHandler { * * @return number of records updated */ - public static int runPreparedUpdate(String query, O... data) throws OseeDataStoreException { + public static int runPreparedUpdate(String query, O... data) throws OseeCoreException { return getDatabase().runPreparedUpdate(query, data); } @@ -75,7 +76,7 @@ public final class ConnectionHandler { * * @return number of records updated */ - public static int runBatchUpdate(String query, List dataList) throws OseeDataStoreException { + public static int runBatchUpdate(String query, List dataList) throws OseeCoreException { return getDatabase().runBatchUpdate(query, dataList); } @@ -84,31 +85,31 @@ public final class ConnectionHandler { * * @return number of records updated */ - public static int runPreparedUpdate(OseeConnection connection, String query, O... data) throws OseeDataStoreException { + public static int runPreparedUpdate(OseeConnection connection, String query, O... data) throws OseeCoreException { return getDatabase().runPreparedUpdate(connection, query, data); } - public static int runBatchUpdate(OseeConnection connection, String query, List dataList) throws OseeDataStoreException { + public static int runBatchUpdate(OseeConnection connection, String query, List dataList) throws OseeCoreException { return getDatabase().runBatchUpdate(connection, query, dataList); } - public static int runPreparedQueryFetchInt(int defaultValue, String query, O... data) throws OseeDataStoreException { + public static int runPreparedQueryFetchInt(int defaultValue, String query, O... data) throws OseeCoreException { return getDatabase().runPreparedQueryFetchObject(defaultValue, query, data); } - public static int runPreparedQueryFetchInt(OseeConnection connection, int defaultValue, String query, O... data) throws OseeDataStoreException { + public static int runPreparedQueryFetchInt(OseeConnection connection, int defaultValue, String query, O... data) throws OseeCoreException { return getDatabase().runPreparedQueryFetchObject(connection, defaultValue, query, data); } - public static int runCallableStatementFetchInt(String query, O... data) throws OseeDataStoreException { + public static int runCallableStatementFetchInt(String query, O... data) throws OseeCoreException { return runCallableStatementFetchInt(getStatement(), query, data); } - public static int runCallableStatementFetchInt(OseeConnection connection, String query, O... data) throws OseeDataStoreException { + public static int runCallableStatementFetchInt(OseeConnection connection, String query, O... data) throws OseeCoreException { return runCallableStatementFetchInt(getStatement(connection), query, data); } - public static int runCallableStatementFetchInt(IOseeStatement chStmt, String query, O... data) throws OseeDataStoreException { + public static int runCallableStatementFetchInt(IOseeStatement chStmt, String query, O... data) throws OseeCoreException { try { chStmt.runCallableStatement(query, data); return chStmt.getCallableInt(1); @@ -117,15 +118,15 @@ public final class ConnectionHandler { } } - public static double runCallableStatementFetchDouble(String query, O... data) throws OseeDataStoreException { + public static double runCallableStatementFetchDouble(String query, O... data) throws OseeCoreException { return runCallableStatementFetchDouble(getStatement(), query, data); } - public static double runCallableStatementFetchDouble(OseeConnection connection, String query, O... data) throws OseeDataStoreException { + public static double runCallableStatementFetchDouble(OseeConnection connection, String query, O... data) throws OseeCoreException { return runCallableStatementFetchDouble(getStatement(connection), query, data); } - private static double runCallableStatementFetchDouble(IOseeStatement chStmt, String query, O... data) throws OseeDataStoreException { + private static double runCallableStatementFetchDouble(IOseeStatement chStmt, String query, O... data) throws OseeCoreException { try { chStmt.runCallableStatement(query, data); return chStmt.getCallableDouble(1); @@ -134,26 +135,26 @@ public final class ConnectionHandler { } } - public static long runPreparedQueryFetchLong(long defaultValue, String query, O... data) throws OseeDataStoreException { + public static long runPreparedQueryFetchLong(long defaultValue, String query, O... data) throws OseeCoreException { return getDatabase().runPreparedQueryFetchObject(defaultValue, query, data); } - public static long runPreparedQueryFetchLong(OseeConnection connection, long defaultValue, String query, O... data) throws OseeDataStoreException { + public static long runPreparedQueryFetchLong(OseeConnection connection, long defaultValue, String query, O... data) throws OseeCoreException { return getDatabase().runPreparedQueryFetchObject(connection, defaultValue, query, data); } - public static String runPreparedQueryFetchString(String defaultValue, String query, O... data) throws OseeDataStoreException { + public static String runPreparedQueryFetchString(String defaultValue, String query, O... data) throws OseeCoreException { return getDatabase().runPreparedQueryFetchObject(defaultValue, query, data); } - public static String runPreparedQueryFetchString(OseeConnection connection, String defaultValue, String query, O... data) throws OseeDataStoreException { + public static String runPreparedQueryFetchString(OseeConnection connection, String defaultValue, String query, O... data) throws OseeCoreException { return getDatabase().runPreparedQueryFetchObject(connection, defaultValue, query, data); } /** * Cause constraint checking to be deferred until the end of the current transaction. */ - public static void deferConstraintChecking(OseeConnection connection) throws OseeDataStoreException { + public static void deferConstraintChecking(OseeConnection connection) throws OseeCoreException { if (SupportedDatabase.getDatabaseType(connection.getMetaData()) == SupportedDatabase.derby) { return; } @@ -161,7 +162,7 @@ public final class ConnectionHandler { runPreparedUpdate(connection, "SET CONSTRAINTS ALL DEFERRED"); } - public static DatabaseMetaData getMetaData() throws OseeDataStoreException { + public static DatabaseMetaData getMetaData() throws OseeCoreException { OseeConnection connection = getDatabase().getConnection(); try { return connection.getMetaData(); diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/DatabaseTransactions.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/DatabaseTransactions.java index 21114b012a5..c45d67b3523 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/DatabaseTransactions.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/DatabaseTransactions.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.database.core; import java.util.logging.Level; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeWrappedException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.database.internal.Activator; import org.eclipse.osee.framework.logging.OseeLog; @@ -40,11 +40,7 @@ public final class DatabaseTransactions { connection.commit(); OseeLog.log(Activator.class, Level.FINEST, String.format("End Transaction: [%s]", dbWork.getName())); } catch (Exception ex) { - if (ex instanceof OseeCoreException) { - saveException = (OseeCoreException) ex; - } else { - saveException = new OseeWrappedException(ex); - } + saveException = OseeExceptions.wrap(ex); try { connection.rollback(); connection.destroy(); diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/IOseeSequence.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/IOseeSequence.java index 235ebe1ebd6..71a8088d95c 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/IOseeSequence.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/IOseeSequence.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.database.core; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; /** @@ -34,39 +35,39 @@ public interface IOseeSequence { static final String IMPORT_MAPPED_INDEX_SEQ = "SKYNET_IMPORT_MAPPED_INDEX_SEQ"; static final String TTE_SESSION_SEQ = "TTE_SESSION_SEQ"; - long getNextSequence(String sequenceName) throws OseeDataStoreException; + long getNextSequence(String sequenceName) throws OseeCoreException; - int getNextSessionId() throws OseeDataStoreException; + int getNextSessionId() throws OseeCoreException; - int getNextTransactionId() throws OseeDataStoreException; + int getNextTransactionId() throws OseeCoreException; - int getNextArtifactId() throws OseeDataStoreException; + int getNextArtifactId() throws OseeCoreException; - int getNextOseeEnumTypeId() throws OseeDataStoreException; + int getNextOseeEnumTypeId() throws OseeCoreException; - int getNextGammaId() throws OseeDataStoreException; + int getNextGammaId() throws OseeCoreException; - int getNextArtifactTypeId() throws OseeDataStoreException; + int getNextArtifactTypeId() throws OseeCoreException; - int getNextAttributeBaseTypeId() throws OseeDataStoreException; + int getNextAttributeBaseTypeId() throws OseeCoreException; - int getNextAttributeProviderTypeId() throws OseeDataStoreException; + int getNextAttributeProviderTypeId() throws OseeCoreException; - int getNextAttributeId() throws OseeDataStoreException; + int getNextAttributeId() throws OseeCoreException; - int getNextAttributeTypeId() throws OseeDataStoreException; + int getNextAttributeTypeId() throws OseeCoreException; - int getNextFactoryId() throws OseeDataStoreException; + int getNextFactoryId() throws OseeCoreException; - int getNextBranchId() throws OseeDataStoreException; + int getNextBranchId() throws OseeCoreException; - int getNextRelationTypeId() throws OseeDataStoreException; + int getNextRelationTypeId() throws OseeCoreException; - int getNextRelationId() throws OseeDataStoreException; + int getNextRelationId() throws OseeCoreException; - int getNextImportId() throws OseeDataStoreException; + int getNextImportId() throws OseeCoreException; - int getNextImportMappedIndexId() throws OseeDataStoreException; + int getNextImportMappedIndexId() throws OseeCoreException; void clear() throws OseeDataStoreException; } diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/IOseeStatement.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/IOseeStatement.java index 116bc4c2194..87ed7ffa5c5 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/IOseeStatement.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/IOseeStatement.java @@ -16,7 +16,7 @@ import java.math.BigDecimal; import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; /** * @author Jeff C. Phillips @@ -24,21 +24,21 @@ import org.eclipse.osee.framework.core.exception.OseeDataStoreException; */ public interface IOseeStatement extends Closeable { - void runPreparedQuery(String query, Object... data) throws OseeDataStoreException; + void runPreparedQuery(String query, Object... data) throws OseeCoreException; /** * @param fetchSize hint as to the number of rows that should be fetched from the database at a time. will be limited * to 10,000 */ - void runPreparedQuery(int fetchSize, String query, Object... data) throws OseeDataStoreException; + void runPreparedQuery(int fetchSize, String query, Object... data) throws OseeCoreException; /** * Invokes a stored procedure parameters of type SQL3DataType are registered as Out parameters and all others are set * as in parameters */ - void runCallableStatement(String query, Object... data) throws OseeDataStoreException; + void runCallableStatement(String query, Object... data) throws OseeCoreException; - boolean next() throws OseeDataStoreException; + boolean next() throws OseeCoreException; /** * The application must call close when it is done using this object; however, it is safe to use this same object @@ -47,39 +47,39 @@ public interface IOseeStatement extends Closeable { @Override void close(); - InputStream getBinaryStream(String columnName) throws OseeDataStoreException; + InputStream getBinaryStream(String columnName) throws OseeCoreException; - InputStream getAsciiStream(String columnName) throws OseeDataStoreException; + InputStream getAsciiStream(String columnName) throws OseeCoreException; - String getString(String columnName) throws OseeDataStoreException; + String getString(String columnName) throws OseeCoreException; - float getFloat(String columnName) throws OseeDataStoreException; + float getFloat(String columnName) throws OseeCoreException; - long getLong(String columnName) throws OseeDataStoreException; + long getLong(String columnName) throws OseeCoreException; - int getInt(String columnName) throws OseeDataStoreException; + int getInt(String columnName) throws OseeCoreException; - Timestamp getTimestamp(String columnName) throws OseeDataStoreException; + Timestamp getTimestamp(String columnName) throws OseeCoreException; - BigDecimal getBigDecimal(String name) throws OseeDataStoreException; + BigDecimal getBigDecimal(String name) throws OseeCoreException; - Time getTime(String name) throws OseeDataStoreException; + Time getTime(String name) throws OseeCoreException; - double getDouble(String columnName) throws OseeDataStoreException; + double getDouble(String columnName) throws OseeCoreException; - Date getDate(String columnName) throws OseeDataStoreException; + Date getDate(String columnName) throws OseeCoreException; - boolean wasNull() throws OseeDataStoreException; + boolean wasNull() throws OseeCoreException; - int getColumnCount() throws OseeDataStoreException; + int getColumnCount() throws OseeCoreException; - String getColumnName(int columnIndex) throws OseeDataStoreException; + String getColumnName(int columnIndex) throws OseeCoreException; - int getColumnType(int columnIndex) throws OseeDataStoreException; + int getColumnType(int columnIndex) throws OseeCoreException; - String getColumnTypeName(int columnIndex) throws OseeDataStoreException; + String getColumnTypeName(int columnIndex) throws OseeCoreException; - Object getObject(int columnIndex) throws OseeDataStoreException; + Object getObject(int columnIndex) throws OseeCoreException; /** * Returns the number of rows in the result set. Once this method returns the result set will be pointing to the last @@ -87,34 +87,34 @@ public interface IOseeStatement extends Closeable { * * @return the number of rows in the result set */ - int getRowCount() throws OseeDataStoreException; + int getRowCount() throws OseeCoreException; - boolean isNullable(int columnIndex) throws OseeDataStoreException; + boolean isNullable(int columnIndex) throws OseeCoreException; - double getCallableDouble(int columnIndex) throws OseeDataStoreException; + double getCallableDouble(int columnIndex) throws OseeCoreException; /** * should not be used by application code because it is less readable than using the column name */ - int getInt(int columnIndex) throws OseeDataStoreException; + int getInt(int columnIndex) throws OseeCoreException; - int getCallableInt(int columnIndex) throws OseeDataStoreException; + int getCallableInt(int columnIndex) throws OseeCoreException; /** * should not be used by application code because it is less readable than using the column name */ - long getLong(int columnIndex) throws OseeDataStoreException; + long getLong(int columnIndex) throws OseeCoreException; /** * should not be used by application code because it is less readable than using the column name */ - String getString(int columnIndex) throws OseeDataStoreException; + String getString(int columnIndex) throws OseeCoreException; - String getComplementSql() throws OseeDataStoreException; + String getComplementSql() throws OseeCoreException; - boolean isDatabaseType(SupportedDatabase type) throws OseeDataStoreException; + boolean isDatabaseType(SupportedDatabase type) throws OseeCoreException; - void updateObject(String columnName, Object value) throws OseeDataStoreException; + void updateObject(String columnName, Object value) throws OseeCoreException; - void updateRow() throws OseeDataStoreException; + void updateRow() throws OseeCoreException; } \ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/JoinUtility.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/JoinUtility.java index 47bfec91e9c..fcd76f707c0 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/JoinUtility.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/JoinUtility.java @@ -16,6 +16,7 @@ import java.util.HashSet; import java.util.List; import java.util.Random; import java.util.Set; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.internal.Activator; @@ -121,7 +122,7 @@ public class JoinUtility { return new CharJoinQuery(sessionId); } - public static List getAllTagQueueQueryIds() throws OseeDataStoreException { + public static List getAllTagQueueQueryIds() throws OseeCoreException { List queryIds = new ArrayList(); IOseeStatement chStmt = ConnectionHandler.getStatement(); try { @@ -172,7 +173,7 @@ public class JoinUtility { } @SuppressWarnings("unchecked") - public void store(OseeConnection connection) throws OseeDataStoreException { + public void store(OseeConnection connection) throws OseeCoreException { if (this.wasStored != true) { List data = new ArrayList(); for (IJoinRow joinArray : entries) { @@ -191,7 +192,7 @@ public class JoinUtility { } } - public int delete(OseeConnection connection) throws OseeDataStoreException { + public int delete(OseeConnection connection) throws OseeCoreException { int updated = 0; IOseeDatabaseService databaseService = Activator.getInstance().getOseeDatabaseService(); if (queryId != -1) { @@ -203,11 +204,11 @@ public class JoinUtility { return updated; } - public void store() throws OseeDataStoreException { + public void store() throws OseeCoreException { store(null); } - public int delete() throws OseeDataStoreException { + public int delete() throws OseeCoreException { return delete(null); } diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeConnection.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeConnection.java index da00695b41b..db9d74d0724 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeConnection.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeConnection.java @@ -13,30 +13,26 @@ package org.eclipse.osee.framework.database.core; import java.io.Closeable; import java.sql.DatabaseMetaData; import java.sql.SQLException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; public abstract class OseeConnection implements Closeable { - protected OseeConnection() { - - } - @Override public abstract void close(); - public abstract boolean isClosed() throws OseeDataStoreException; + public abstract boolean isClosed() throws OseeCoreException; public abstract boolean isStale(); - public abstract DatabaseMetaData getMetaData() throws OseeDataStoreException; + public abstract DatabaseMetaData getMetaData() throws OseeCoreException; - protected abstract void setAutoCommit(boolean autoCommit) throws OseeDataStoreException; + protected abstract void setAutoCommit(boolean autoCommit) throws OseeCoreException; - protected abstract boolean getAutoCommit() throws SQLException; + protected abstract boolean getAutoCommit() throws OseeCoreException; protected abstract void commit() throws SQLException; - protected abstract void rollback() throws OseeDataStoreException; + protected abstract void rollback() throws OseeCoreException; - protected abstract void destroy() throws OseeDataStoreException; + protected abstract void destroy() throws OseeCoreException; } \ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeInfo.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeInfo.java index e267f046082..28949303061 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeInfo.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeInfo.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.database.core; import java.util.HashMap; import java.util.Map; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; /** @@ -30,13 +30,13 @@ public class OseeInfo { private static Map cache = new HashMap(); - public static String getValue(String key) throws OseeDataStoreException { + public static String getValue(String key) throws OseeCoreException { String toReturn = ConnectionHandler.runPreparedQueryFetchString("", GET_VALUE_SQL, key); cache.put(key, toReturn); return toReturn; } - public static String getCachedValue(String key) throws OseeDataStoreException { + public static String getCachedValue(String key) throws OseeCoreException { String cacheValue = cache.get(key); if (cacheValue == null) { cacheValue = getValue(key); @@ -53,7 +53,7 @@ public class OseeInfo { * Note: This call will hit the database every time, so shouldn't be used for often repeated calls. use * isCacheEnabled that will cache the value */ - public static boolean isEnabled(String key) throws OseeDataStoreException { + public static boolean isEnabled(String key) throws OseeCoreException { String dbProperty = OseeInfo.getValue(key); if (Strings.isValid(dbProperty)) { return dbProperty.equals("true"); @@ -67,7 +67,7 @@ public class OseeInfo { *
* Return cached value (value only loaded once per session. Restart will reset value if changed in osee_info */ - public static boolean isCacheEnabled(String key) throws OseeDataStoreException { + public static boolean isCacheEnabled(String key) throws OseeCoreException { String dbProperty = OseeInfo.getCachedValue(key); if (Strings.isValid(dbProperty)) { return dbProperty.equals("true"); @@ -75,17 +75,17 @@ public class OseeInfo { return false; } - public static void setEnabled(String key, boolean enabled) throws OseeDataStoreException { + public static void setEnabled(String key, boolean enabled) throws OseeCoreException { putValue(key, String.valueOf(enabled)); } - public static void putValue(String key, String value) throws OseeDataStoreException { + public static void putValue(String key, String value) throws OseeCoreException { ConnectionHandler.runPreparedUpdate(DELETE_KEY_SQL, key); ConnectionHandler.runPreparedUpdate(INSERT_KEY_VALUE_SQL, key, value); cache.put(key, value); } - public static String getDatabaseGuid() throws OseeDataStoreException { + public static String getDatabaseGuid() throws OseeCoreException { return getValue(DB_ID_KEY); } } \ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeSql.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeSql.java index a6d334a03e4..3b075a5b7db 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeSql.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/OseeSql.java @@ -15,7 +15,7 @@ import java.util.Properties; import org.eclipse.osee.framework.core.enums.ConflictStatus; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.TxChange; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; /** * @author Ryan D. Brooks @@ -79,7 +79,7 @@ public enum OseeSql { this(sql, null); } - public static Properties getSqlProperties(DatabaseMetaData metaData) throws OseeDataStoreException { + public static Properties getSqlProperties(DatabaseMetaData metaData) throws OseeCoreException { Properties sqlProperties = new Properties(); boolean areHintsSupported = SupportedDatabase.areHintsSupported(metaData); for (OseeSql oseeSql : OseeSql.values()) { diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/ResultSetProcessor.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/ResultSetProcessor.java index 0e9de71c903..50300bd6986 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/ResultSetProcessor.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/ResultSetProcessor.java @@ -15,7 +15,8 @@ import java.io.InputStream; import java.sql.Date; import java.sql.Timestamp; import java.sql.Types; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.jdk.core.type.IVariantData; import org.eclipse.osee.framework.jdk.core.type.VariantData; import org.eclipse.osee.framework.jdk.core.util.Lib; @@ -25,7 +26,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; * @author Roberto E. Escobar */ public class ResultSetProcessor { - public static IVariantData parse(IOseeStatement chStmt) throws OseeDataStoreException { + public static IVariantData parse(IOseeStatement chStmt) throws OseeCoreException { IVariantData toReturn = new VariantData(); int numberOfColumns = chStmt.getColumnCount() + 1; for (int index = 1; index < numberOfColumns; index++) { @@ -57,33 +58,24 @@ public class ResultSetProcessor { } break; default: - try { - String value = chStmt.getString(name); - if (Strings.isValid(value) != false) { - value = value.trim(); - } - toReturn.put(upperCasedName, chStmt.getString(name)); - } catch (OseeDataStoreException ex) { - String typeName = chStmt.getColumnTypeName(columnIndex); - throw new OseeDataStoreException(getErrorMessage(name, typeName), ex); + String value = chStmt.getString(name); + if (Strings.isValid(value) != false) { + value = value.trim(); } + toReturn.put(upperCasedName, chStmt.getString(name)); break; } } return toReturn; } - private static String getErrorMessage(String name, String typeName) { - return String.format("Unable to convert [%s] of raw type [%s] to string.", name, typeName); - } - - private static byte[] streamToByteArray(InputStream inputStream) throws OseeDataStoreException { + private static byte[] streamToByteArray(InputStream inputStream) throws OseeCoreException { byte[] toReturn = new byte[0]; if (inputStream != null) { try { toReturn = Lib.inputStreamToBytes(inputStream); } catch (IOException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); } } return toReturn; diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/SupportedDatabase.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/SupportedDatabase.java index 01ac8e432a9..a44632029f2 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/SupportedDatabase.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/core/SupportedDatabase.java @@ -12,7 +12,9 @@ package org.eclipse.osee.framework.database.core; import java.sql.DatabaseMetaData; import java.sql.SQLException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; public enum SupportedDatabase { oracle, @@ -21,9 +23,9 @@ public enum SupportedDatabase { mysql, postgresql; - public static SupportedDatabase getDatabaseType(DatabaseMetaData metaData) throws OseeDataStoreException { + public static SupportedDatabase getDatabaseType(DatabaseMetaData metaData) throws OseeCoreException { + SupportedDatabase toReturn = null; try { - SupportedDatabase toReturn = null; String dbName = metaData.getDatabaseProductName(); String lowerCaseName = dbName.toLowerCase(); if (lowerCaseName.contains(SupportedDatabase.derby.toString())) { @@ -39,28 +41,28 @@ public enum SupportedDatabase { } else { throw new OseeDataStoreException("Unsupported database type: " + dbName); } - return toReturn; } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); } + return toReturn; } - public static boolean isDatabaseType(DatabaseMetaData metaData, SupportedDatabase dbType) throws OseeDataStoreException { + public static boolean isDatabaseType(DatabaseMetaData metaData, SupportedDatabase dbType) throws OseeCoreException { return getDatabaseType(metaData) == dbType; } - public static boolean areHintsSupported(DatabaseMetaData metaData) throws OseeDataStoreException { + public static boolean areHintsSupported(DatabaseMetaData metaData) throws OseeCoreException { try { if (SupportedDatabase.isDatabaseType(metaData, oracle)) { return metaData.getDatabaseMajorVersion() > 10; } } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); } return false; } - public static String getComplementSql(DatabaseMetaData metaData) throws OseeDataStoreException { + public static String getComplementSql(DatabaseMetaData metaData) throws OseeCoreException { return isDatabaseType(metaData, oracle) ? "MINUS" : "EXCEPT"; } } \ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeConnectionImpl.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeConnectionImpl.java index ba11b6820e1..e0a7521cea4 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeConnectionImpl.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeConnectionImpl.java @@ -16,7 +16,8 @@ import java.sql.DatabaseMetaData; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.database.core.OseeConnection; public class OseeConnectionImpl extends OseeConnection { @@ -40,11 +41,12 @@ public class OseeConnectionImpl extends OseeConnection { } @Override - public boolean isClosed() throws OseeDataStoreException { + public boolean isClosed() throws OseeCoreException { try { return conn.isClosed(); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return false; // unreachable since wrapAndThrow() always throws an exception } } @@ -54,11 +56,12 @@ public class OseeConnectionImpl extends OseeConnection { } @Override - public DatabaseMetaData getMetaData() throws OseeDataStoreException { + public DatabaseMetaData getMetaData() throws OseeCoreException { try { return conn.getMetaData(); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } @@ -84,11 +87,11 @@ public class OseeConnectionImpl extends OseeConnection { } @Override - protected void destroy() throws OseeDataStoreException { + protected void destroy() throws OseeCoreException { try { conn.close(); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); } pool.removeConnection(this); } @@ -107,17 +110,22 @@ public class OseeConnectionImpl extends OseeConnection { } @Override - protected void setAutoCommit(boolean autoCommit) throws OseeDataStoreException { + protected void setAutoCommit(boolean autoCommit) throws OseeCoreException { try { conn.setAutoCommit(autoCommit); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); } } @Override - protected boolean getAutoCommit() throws SQLException { - return conn.getAutoCommit(); + protected boolean getAutoCommit() throws OseeCoreException { + try { + return conn.getAutoCommit(); + } catch (SQLException ex) { + OseeExceptions.wrapAndThrow(ex); + return false; // unreachable since wrapAndThrow() always throws an exception + } } @Override @@ -126,11 +134,11 @@ public class OseeConnectionImpl extends OseeConnection { } @Override - protected void rollback() throws OseeDataStoreException { + protected void rollback() throws OseeCoreException { try { conn.rollback(); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); } } } \ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeConnectionPoolImpl.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeConnectionPoolImpl.java index ee4b2a53e85..84a16a28ccb 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeConnectionPoolImpl.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeConnectionPoolImpl.java @@ -17,6 +17,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Level; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.database.core.IConnectionFactory; import org.eclipse.osee.framework.database.core.OseeConnection; import org.eclipse.osee.framework.database.internal.Activator; @@ -59,7 +60,7 @@ public class OseeConnectionPoolImpl { connections.remove(conn); } - public synchronized OseeConnectionImpl getConnection() throws OseeDataStoreException { + public synchronized OseeConnectionImpl getConnection() throws OseeCoreException { for (OseeConnectionImpl connection : connections) { if (connection.lease()) { return connection; @@ -70,21 +71,22 @@ public class OseeConnectionPoolImpl { throw new OseeDataStoreException( "This client has reached the maximum number of allowed simultaneous database connections of : " + MAX_CONNECTIONS_PER_CLIENT); } - try { - OseeConnectionImpl connection = getOseeConnection(); - connections.add(connection); - OseeLog.log(Activator.class, Level.INFO, String.format("DbConnection: [%s] - [%d]", dbUrl, connections.size())); - return connection; - } catch (Throwable th) { - throw new OseeDataStoreException("Unable to get a database connection: ", th); - } + OseeConnectionImpl connection = getOseeConnection(); + connections.add(connection); + OseeLog.log(Activator.class, Level.INFO, String.format("DbConnection: [%s] - [%d]", dbUrl, connections.size())); + return connection; } - private OseeConnectionImpl getOseeConnection() throws Exception { - IConnectionFactory connectionDriver = createConnection(driver); - Connection connection = connectionDriver.getConnection(properties, dbUrl); - connection.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED); - return new OseeConnectionImpl(connection, this); + private OseeConnectionImpl getOseeConnection() throws OseeCoreException { + try { + IConnectionFactory connectionDriver = createConnection(driver); + Connection connection = connectionDriver.getConnection(properties, dbUrl); + connection.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED); + return new OseeConnectionImpl(connection, this); + } catch (Exception ex) { + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception + } } synchronized void returnConnection(OseeConnectionImpl connection) { @@ -94,13 +96,13 @@ public class OseeConnectionPoolImpl { } else { connection.expireLease(); } - } catch (OseeDataStoreException ex) { + } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); removeConnection(connection); } } - synchronized void releaseUneededConnections() throws OseeDataStoreException { + synchronized void releaseUneededConnections() throws OseeCoreException { for (OseeConnectionImpl connection : connections) { if (connection.isStale()) { connection.destroy(); diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeDatabaseServiceImpl.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeDatabaseServiceImpl.java index b753c908244..e41f76905a0 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeDatabaseServiceImpl.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeDatabaseServiceImpl.java @@ -20,6 +20,7 @@ import java.util.logging.Level; import org.eclipse.osee.framework.core.data.IDatabaseInfo; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.util.Conditions; import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.core.IDatabaseInfoProvider; @@ -61,7 +62,7 @@ public class OseeDatabaseServiceImpl implements IOseeDatabaseService { } @Override - public OseeConnection getConnection() throws OseeDataStoreException { + public OseeConnection getConnection() throws OseeCoreException { return getConnection(getDatabaseInfoProvider()); } @@ -81,7 +82,7 @@ public class OseeDatabaseServiceImpl implements IOseeDatabaseService { } @Override - public OseeConnection getConnection(IDatabaseInfo databaseInfo) throws OseeDataStoreException { + public OseeConnection getConnection(IDatabaseInfo databaseInfo) throws OseeCoreException { return getConnectionPool(databaseInfo).getConnection(); } @@ -106,7 +107,7 @@ public class OseeDatabaseServiceImpl implements IOseeDatabaseService { } @Override - public int runPreparedUpdate(OseeConnection connection, String query, O... data) throws OseeDataStoreException { + public int runPreparedUpdate(OseeConnection connection, String query, O... data) throws OseeCoreException { if (connection == null) { return runPreparedUpdate(query, data); } @@ -117,7 +118,7 @@ public class OseeDatabaseServiceImpl implements IOseeDatabaseService { StatementUtil.populateValuesForPreparedStatement(preparedStatement, data); updateCount = preparedStatement.executeUpdate(); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); } finally { StatementUtil.close(preparedStatement); } @@ -125,7 +126,7 @@ public class OseeDatabaseServiceImpl implements IOseeDatabaseService { } @Override - public int runBatchUpdate(OseeConnection connection, String query, List dataList) throws OseeDataStoreException { + public int runBatchUpdate(OseeConnection connection, String query, List dataList) throws OseeCoreException { if (connection == null) { return runBatchUpdate(query, dataList); } @@ -158,7 +159,7 @@ public class OseeDatabaseServiceImpl implements IOseeDatabaseService { if ((exlist = ex.getNextException()) != null) { OseeLog.log(Activator.class, Level.SEVERE, "This is the nested exception", exlist); } - throw new OseeDataStoreException( + throw new OseeCoreException( "sql update failed: \n" + query + "\n" + StatementUtil.getBatchErrorMessage(dataList), ex); } finally { StatementUtil.close(preparedStatement); @@ -167,7 +168,7 @@ public class OseeDatabaseServiceImpl implements IOseeDatabaseService { } @Override - public int runBatchUpdate(String query, List dataList) throws OseeDataStoreException { + public int runBatchUpdate(String query, List dataList) throws OseeCoreException { OseeConnection connection = getConnection(); try { return runBatchUpdate(connection, query, dataList); @@ -177,7 +178,7 @@ public class OseeDatabaseServiceImpl implements IOseeDatabaseService { } @Override - public int runPreparedUpdate(String query, O... data) throws OseeDataStoreException { + public int runPreparedUpdate(String query, O... data) throws OseeCoreException { OseeConnection connection = getConnection(); try { return runPreparedUpdate(connection, query, data); @@ -187,22 +188,18 @@ public class OseeDatabaseServiceImpl implements IOseeDatabaseService { } @Override - public T runPreparedQueryFetchObject(T defaultValue, String query, O... data) throws OseeDataStoreException { + public T runPreparedQueryFetchObject(T defaultValue, String query, O... data) throws OseeCoreException { return runPreparedQueryFetchObject(getStatement(), defaultValue, query, data); } @Override - public T runPreparedQueryFetchObject(OseeConnection connection, T defaultValue, String query, O... data) throws OseeDataStoreException { + public T runPreparedQueryFetchObject(OseeConnection connection, T defaultValue, String query, O... data) throws OseeCoreException { return runPreparedQueryFetchObject(getStatement(connection), defaultValue, query, data); } @SuppressWarnings("unchecked") - private T runPreparedQueryFetchObject(IOseeStatement chStmt, T defaultValue, String query, O... data) throws OseeDataStoreException { - try { - Conditions.checkNotNull(defaultValue, "default value"); - } catch (OseeCoreException ex) { - throw new OseeDataStoreException(ex); - } + private T runPreparedQueryFetchObject(IOseeStatement chStmt, T defaultValue, String query, O... data) throws OseeCoreException { + Conditions.checkNotNull(defaultValue, "default value"); try { chStmt.runPreparedQuery(1, query, data); if (chStmt.next()) { diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeSequenceImpl.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeSequenceImpl.java index 3cc7d8b54a7..7709bee7d9e 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeSequenceImpl.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeSequenceImpl.java @@ -11,6 +11,7 @@ package org.eclipse.osee.framework.database.internal.core; import java.util.HashMap; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.core.IOseeSequence; @@ -55,7 +56,7 @@ public class OseeSequenceImpl implements IOseeSequence { @Override @SuppressWarnings("unchecked") - public synchronized long getNextSequence(String sequenceName) throws OseeDataStoreException { + public synchronized long getNextSequence(String sequenceName) throws OseeCoreException { SequenceRange range = getRange(sequenceName); if (range.lastAvailable == 0) { long lastValue = -1L; @@ -88,89 +89,89 @@ public class OseeSequenceImpl implements IOseeSequence { } @SuppressWarnings("unchecked") - private void internalInitializeSequence(String sequenceName) throws OseeDataStoreException { + private void internalInitializeSequence(String sequenceName) throws OseeCoreException { SequenceRange range = getRange(sequenceName); range.lastAvailable = 0; getDatabase().runPreparedUpdate(INSERT_SEQUENCE, 0, sequenceName); } @Override - public int getNextSessionId() throws OseeDataStoreException { + public int getNextSessionId() throws OseeCoreException { return (int) getNextSequence(TTE_SESSION_SEQ); } @Override - public int getNextTransactionId() throws OseeDataStoreException { + public int getNextTransactionId() throws OseeCoreException { return (int) getNextSequence(TRANSACTION_ID_SEQ); } @Override - public int getNextArtifactId() throws OseeDataStoreException { + public int getNextArtifactId() throws OseeCoreException { return (int) getNextSequence(ART_ID_SEQ); } @Override - public int getNextOseeEnumTypeId() throws OseeDataStoreException { + public int getNextOseeEnumTypeId() throws OseeCoreException { return (int) getNextSequence(ENUM_TYPE_ID_SEQ); } @Override - public int getNextGammaId() throws OseeDataStoreException { + public int getNextGammaId() throws OseeCoreException { return (int) getNextSequence(GAMMA_ID_SEQ); } @Override - public int getNextArtifactTypeId() throws OseeDataStoreException { + public int getNextArtifactTypeId() throws OseeCoreException { return (int) getNextSequence(ART_TYPE_ID_SEQ); } @Override - public int getNextAttributeBaseTypeId() throws OseeDataStoreException { + public int getNextAttributeBaseTypeId() throws OseeCoreException { return (int) getNextSequence(ATTR_BASE_TYPE_ID_SEQ); } @Override - public int getNextAttributeProviderTypeId() throws OseeDataStoreException { + public int getNextAttributeProviderTypeId() throws OseeCoreException { return (int) getNextSequence(ATTR_PROVIDER_TYPE_ID_SEQ); } @Override - public int getNextAttributeId() throws OseeDataStoreException { + public int getNextAttributeId() throws OseeCoreException { return (int) getNextSequence(ATTR_ID_SEQ); } @Override - public int getNextAttributeTypeId() throws OseeDataStoreException { + public int getNextAttributeTypeId() throws OseeCoreException { return (int) getNextSequence(ATTR_TYPE_ID_SEQ); } @Override - public int getNextFactoryId() throws OseeDataStoreException { + public int getNextFactoryId() throws OseeCoreException { return (int) getNextSequence(FACTORY_ID_SEQ); } @Override - public int getNextBranchId() throws OseeDataStoreException { + public int getNextBranchId() throws OseeCoreException { return (int) getNextSequence(BRANCH_ID_SEQ); } @Override - public int getNextRelationTypeId() throws OseeDataStoreException { + public int getNextRelationTypeId() throws OseeCoreException { return (int) getNextSequence(REL_LINK_TYPE_ID_SEQ); } @Override - public int getNextRelationId() throws OseeDataStoreException { + public int getNextRelationId() throws OseeCoreException { return (int) getNextSequence(REL_LINK_ID_SEQ); } @Override - public int getNextImportId() throws OseeDataStoreException { + public int getNextImportId() throws OseeCoreException { return (int) getNextSequence(IMPORT_ID_SEQ); } @Override - public int getNextImportMappedIndexId() throws OseeDataStoreException { + public int getNextImportMappedIndexId() throws OseeCoreException { return (int) getNextSequence(IMPORT_MAPPED_INDEX_SEQ); } diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeStatementImpl.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeStatementImpl.java index 926f756d147..25b2bce1e77 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeStatementImpl.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeStatementImpl.java @@ -21,7 +21,8 @@ import java.sql.SQLException; import java.sql.Time; import java.sql.Timestamp; import java.util.logging.Level; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.database.core.SQL3DataType; import org.eclipse.osee.framework.database.core.SupportedDatabase; @@ -63,7 +64,7 @@ public final class OseeStatementImpl implements IOseeStatement { } @Override - public void runPreparedQuery(String query, Object... data) throws OseeDataStoreException { + public void runPreparedQuery(String query, Object... data) throws OseeCoreException { runPreparedQuery(0, query, data); } @@ -72,7 +73,7 @@ public final class OseeStatementImpl implements IOseeStatement { * to 10,000 */ @Override - public void runPreparedQuery(int fetchSize, String query, Object... data) throws OseeDataStoreException { + public void runPreparedQuery(int fetchSize, String query, Object... data) throws OseeCoreException { try { allowReuse(); @@ -82,7 +83,7 @@ public final class OseeStatementImpl implements IOseeStatement { rSet = preparedStatement.executeQuery(); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); } } @@ -91,7 +92,7 @@ public final class OseeStatementImpl implements IOseeStatement { * as in parameters */ @Override - public void runCallableStatement(String query, Object... data) throws OseeDataStoreException { + public void runCallableStatement(String query, Object... data) throws OseeCoreException { try { allowReuse(); @@ -107,17 +108,17 @@ public final class OseeStatementImpl implements IOseeStatement { rSet = callableStatement.getResultSet(); } } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); } } @Override - public boolean next() throws OseeDataStoreException { + public boolean next() throws OseeCoreException { if (rSet != null) { try { return rSet.next(); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); } } return false; @@ -135,7 +136,7 @@ public final class OseeStatementImpl implements IOseeStatement { connection.close(); connection = null;// this allows for multiple calls to runPreparedQuery to have an open connection } - } catch (OseeDataStoreException ex) { + } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); } } @@ -143,14 +144,14 @@ public final class OseeStatementImpl implements IOseeStatement { /** * allows for multiple uses of this object to have an open connection */ - private void allowReuse() throws OseeDataStoreException { + private void allowReuse() throws OseeCoreException { if (connection == null) { connection = connectionPool.getConnection(); } closePreviousResources(); } - private void closePreviousResources() throws OseeDataStoreException { + private void closePreviousResources() throws OseeCoreException { try { if (rSet != null) { rSet.close(); @@ -162,88 +163,97 @@ public final class OseeStatementImpl implements IOseeStatement { callableStatement.close(); } } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); } } @Override - public InputStream getBinaryStream(String columnName) throws OseeDataStoreException { + public InputStream getBinaryStream(String columnName) throws OseeCoreException { try { return rSet.getBinaryStream(columnName); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } @Override - public InputStream getAsciiStream(String columnName) throws OseeDataStoreException { + public InputStream getAsciiStream(String columnName) throws OseeCoreException { try { return rSet.getAsciiStream(columnName); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } @Override - public String getString(String columnName) throws OseeDataStoreException { + public String getString(String columnName) throws OseeCoreException { try { return rSet.getString(columnName); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } @Override - public float getFloat(String columnName) throws OseeDataStoreException { + public float getFloat(String columnName) throws OseeCoreException { try { return rSet.getFloat(columnName); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return 0.0f; // unreachable since wrapAndThrow() always throws an exceptions } } @Override - public long getLong(String columnName) throws OseeDataStoreException { + public long getLong(String columnName) throws OseeCoreException { try { return rSet.getLong(columnName); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return 0; // unreachable since wrapAndThrow() always throws an exception } } @Override - public int getInt(String columnName) throws OseeDataStoreException { + public int getInt(String columnName) throws OseeCoreException { try { return rSet.getInt(columnName); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return 0; // unreachable since wrapAndThrow() always throws an exception } } @Override - public int getInt(int columnIndex) throws OseeDataStoreException { + public int getInt(int columnIndex) throws OseeCoreException { try { return rSet.getInt(columnIndex); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return 0; // unreachable since wrapAndThrow() always throws an exception } } @Override - public int getCallableInt(int columnIndex) throws OseeDataStoreException { + public int getCallableInt(int columnIndex) throws OseeCoreException { try { return callableStatement.getInt(columnIndex); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return 0; // unreachable since wrapAndThrow() always throws an exception } } @Override - public double getCallableDouble(int columnIndex) throws OseeDataStoreException { + public double getCallableDouble(int columnIndex) throws OseeCoreException { try { return callableStatement.getDouble(columnIndex); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return 0; // unreachable since wrapAndThrow() always throws an exception } } @@ -251,11 +261,12 @@ public final class OseeStatementImpl implements IOseeStatement { * should not be used by application code because it is less readable than using the column name */ @Override - public long getLong(int columnIndex) throws OseeDataStoreException { + public long getLong(int columnIndex) throws OseeCoreException { try { return rSet.getLong(columnIndex); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return 0; // unreachable since wrapAndThrow() always throws an exception } } @@ -263,110 +274,122 @@ public final class OseeStatementImpl implements IOseeStatement { * should not be used by application code because it is less readable than using the column name */ @Override - public String getString(int columnIndex) throws OseeDataStoreException { + public String getString(int columnIndex) throws OseeCoreException { try { return rSet.getString(columnIndex); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } @Override - public Timestamp getTimestamp(String columnName) throws OseeDataStoreException { + public Timestamp getTimestamp(String columnName) throws OseeCoreException { try { return rSet.getTimestamp(columnName); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } @Override - public BigDecimal getBigDecimal(String name) throws OseeDataStoreException { + public BigDecimal getBigDecimal(String name) throws OseeCoreException { try { return rSet.getBigDecimal(name); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } @Override - public Time getTime(String name) throws OseeDataStoreException { + public Time getTime(String name) throws OseeCoreException { try { return rSet.getTime(name); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } @Override - public double getDouble(String columnName) throws OseeDataStoreException { + public double getDouble(String columnName) throws OseeCoreException { try { return rSet.getDouble(columnName); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return 0; // unreachable since wrapAndThrow() always throws an exception } } @Override - public Date getDate(String columnName) throws OseeDataStoreException { + public Date getDate(String columnName) throws OseeCoreException { try { return rSet.getDate(columnName); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } @Override - public boolean wasNull() throws OseeDataStoreException { + public boolean wasNull() throws OseeCoreException { try { return rSet.wasNull(); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return false; // unreachable since wrapAndThrow() always throws an exception } } @Override - public int getColumnCount() throws OseeDataStoreException { + public int getColumnCount() throws OseeCoreException { try { return rSet.getMetaData().getColumnCount(); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return 0; // unreachable since wrapAndThrow() always throws an exception } } @Override - public String getColumnName(int columnIndex) throws OseeDataStoreException { + public String getColumnName(int columnIndex) throws OseeCoreException { try { return rSet.getMetaData().getColumnName(columnIndex); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } @Override - public int getColumnType(int columnIndex) throws OseeDataStoreException { + public int getColumnType(int columnIndex) throws OseeCoreException { try { return rSet.getMetaData().getColumnType(columnIndex); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return 0; // unreachable since wrapAndThrow() always throws an exception } } @Override - public String getColumnTypeName(int columnIndex) throws OseeDataStoreException { + public String getColumnTypeName(int columnIndex) throws OseeCoreException { try { return rSet.getMetaData().getColumnTypeName(columnIndex); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } @Override - public Object getObject(int columnIndex) throws OseeDataStoreException { + public Object getObject(int columnIndex) throws OseeCoreException { try { return rSet.getObject(columnIndex); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } @@ -377,50 +400,52 @@ public final class OseeStatementImpl implements IOseeStatement { * @return the number of rows in the result set */ @Override - public int getRowCount() throws OseeDataStoreException { + public int getRowCount() throws OseeCoreException { try { rSet.last(); return rSet.getRow(); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return 0; // unreachable since wrapAndThrow() always throws an exception } } @Override - public boolean isNullable(int columnIndex) throws OseeDataStoreException { + public boolean isNullable(int columnIndex) throws OseeCoreException { try { return rSet.getMetaData().isNullable(columnIndex) == ResultSetMetaData.columnNullable; } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return false; // unreachable since wrapAndThrow() always throws an exception } } @Override - public String getComplementSql() throws OseeDataStoreException { + public String getComplementSql() throws OseeCoreException { allowReuse(); return SupportedDatabase.getComplementSql(connection.getMetaData()); } @Override - public boolean isDatabaseType(SupportedDatabase type) throws OseeDataStoreException { + public boolean isDatabaseType(SupportedDatabase type) throws OseeCoreException { return SupportedDatabase.isDatabaseType(connection.getMetaData(), type); } @Override - public void updateObject(String columnName, Object value) throws OseeDataStoreException { + public void updateObject(String columnName, Object value) throws OseeCoreException { try { rSet.updateObject(columnName, value); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); } } @Override - public void updateRow() throws OseeDataStoreException { + public void updateRow() throws OseeCoreException { try { rSet.updateRow(); } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); } } } \ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/StaleConnectionCloser.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/StaleConnectionCloser.java index 4915411cecd..c8c3cd9bf84 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/StaleConnectionCloser.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/StaleConnectionCloser.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.database.internal.core; import java.util.TimerTask; import java.util.logging.Level; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.internal.Activator; import org.eclipse.osee.framework.logging.OseeLog; @@ -31,7 +31,7 @@ public class StaleConnectionCloser extends TimerTask { public void run() { try { connectionPool.releaseUneededConnections(); - } catch (OseeDataStoreException ex) { + } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); } } diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/StatementUtil.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/StatementUtil.java index ae34da7ffb8..16edb6c9d56 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/StatementUtil.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/StatementUtil.java @@ -16,7 +16,9 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.List; import java.util.logging.Level; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.database.core.SQL3DataType; import org.eclipse.osee.framework.database.internal.Activator; import org.eclipse.osee.framework.logging.OseeLog; @@ -82,7 +84,7 @@ public class StatementUtil { } } - public static void populateValuesForPreparedStatement(PreparedStatement preparedStatement, O... data) throws OseeDataStoreException { + public static void populateValuesForPreparedStatement(PreparedStatement preparedStatement, O... data) throws OseeCoreException { try { int preparedIndex = 0; for (Object dataValue : data) { @@ -115,7 +117,7 @@ public class StatementUtil { } } } catch (SQLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); } } } diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateArtifactVersionTxOperation.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateArtifactVersionTxOperation.java index 1d67ac3da1d..18e548ed811 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateArtifactVersionTxOperation.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/ConsolidateArtifactVersionTxOperation.java @@ -16,7 +16,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.operation.OperationReporter; import org.eclipse.osee.framework.database.IOseeDatabaseServiceProvider; @@ -312,7 +311,7 @@ public class ConsolidateArtifactVersionTxOperation extends AbstractDbTxOperation return String.format(sql, archived ? "_archived" : ""); } - private void writeAddressingChanges(boolean archived, boolean force) throws OseeDataStoreException { + private void writeAddressingChanges(boolean archived, boolean force) throws OseeCoreException { String archivedStr = archived ? "_archived" : ""; if (addressingToDelete.size() > 99960 || force) { deleteTxsCounter += diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/InvalidTxCurrentsAndModTypes.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/InvalidTxCurrentsAndModTypes.java index 88afb20a85f..70e4903bef7 100644 --- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/InvalidTxCurrentsAndModTypes.java +++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/operation/InvalidTxCurrentsAndModTypes.java @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.TransactionDetailsType; import org.eclipse.osee.framework.core.enums.TxChange; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.OperationReporter; import org.eclipse.osee.framework.database.core.ConnectionHandler; @@ -53,7 +53,7 @@ public class InvalidTxCurrentsAndModTypes extends AbstractOperation { txsTableName = archived ? "_archived" : ""; } - private void fixIssues(IProgressMonitor monitor) throws OseeDataStoreException { + private void fixIssues(IProgressMonitor monitor) throws OseeCoreException { if (isFixOperationEnabled) { checkForCancelledStatus(monitor); ConnectionHandler.runBatchUpdate(String.format(DELETE_ADDRESS, txsTableName), purgeData); diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/UnsubscribeTransaction.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/UnsubscribeTransaction.java index 9ce3792e72e..f6f6b8f2401 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/UnsubscribeTransaction.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/UnsubscribeTransaction.java @@ -18,7 +18,6 @@ import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.TransactionDetailsType; import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.RelationType; @@ -99,7 +98,7 @@ public final class UnsubscribeTransaction extends AbstractDbTxOperation { } @SuppressWarnings("unchecked") - private void createNewTxAddressing(OseeConnection connection) throws OseeDataStoreException { + private void createNewTxAddressing(OseeConnection connection) throws OseeCoreException { int transactionId = getDatabaseService().getSequence().getNextTransactionId(); String comment = String.format("User %s requested unsubscribe from group %s", unsubscribeData.getUserId(), diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/AtsResourceProvider.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/AtsResourceProvider.java index b6a7ccff02b..21520ac23dc 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/AtsResourceProvider.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/AtsResourceProvider.java @@ -52,7 +52,7 @@ public class AtsResourceProvider implements IResourceProvider { try { toReturn = new URI(rawPath); } catch (URISyntaxException ex) { - throw new MalformedLocatorException(rawPath, ex); + throw new MalformedLocatorException(ex); } } return toReturn; diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/OperationData.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/OperationData.java index 70785db8b05..f4af80ca28e 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/OperationData.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/OperationData.java @@ -15,6 +15,7 @@ import java.util.ArrayList; import java.util.Collection; import javax.xml.xpath.XPath; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.jdk.core.type.PropertyStore; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -102,7 +103,7 @@ public final class OperationData { } } } catch (Exception ex) { - throw new OseeCoreException(ex); + OseeExceptions.wrapAndThrow(ex); } return toReturn; } diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/ArtifactUtil.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/ArtifactUtil.java index 76e789c56b7..a1f42f14bc3 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/ArtifactUtil.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/ArtifactUtil.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.manager.servlet.data; import org.eclipse.osee.framework.core.enums.BranchArchivedState; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; /** @@ -33,37 +33,37 @@ public class ArtifactUtil { private static String URI_BY_GUID_AND_BRANCH_GUID = URI_BY_GUID_PREFIX + ", osee_branch ob1 WHERE art1.art_id = attr1.art_id AND attr1.attr_type_id = attyp1.attr_type_id AND oapt1.attr_provider_type_id = attyp1.attr_provider_type_id AND attr1.gamma_id = txs1.gamma_id AND txs1.branch_id = ob1.branch_id AND txs1.tx_current = 1 AND art1.guid = ? AND NOT oapt1.attribute_provider_class LIKE ? AND ob1.branch_guid = ?"; - public static String getUri(String guid, int branchId) throws OseeDataStoreException { + public static String getUri(String guid, int branchId) throws OseeCoreException { BranchArchivedState state = isArchived(branchId); return getUri(state, URI_BY_GUID_AND_BRANCH_ID, guid, DEFAULT_ATTRIBUTE_DATA_PROVIDER, branchId); } - public static String getUri(String guid, String branchName) throws OseeDataStoreException { + public static String getUri(String guid, String branchName) throws OseeCoreException { BranchArchivedState state = isArchived(branchName); return getUri(state, URI_BY_GUID_AND_BRANCH_NAME, guid, DEFAULT_ATTRIBUTE_DATA_PROVIDER, branchName); } - public static String getUriByGuids(String branchGuid, String artifactGuid) throws OseeDataStoreException { + public static String getUriByGuids(String branchGuid, String artifactGuid) throws OseeCoreException { BranchArchivedState state = isArchivedBranchGuid(branchGuid); return getUri(state, URI_BY_GUID_AND_BRANCH_GUID, artifactGuid, DEFAULT_ATTRIBUTE_DATA_PROVIDER, branchGuid); } - private static BranchArchivedState isArchivedBranchGuid(String branchGuid) throws OseeDataStoreException { + private static BranchArchivedState isArchivedBranchGuid(String branchGuid) throws OseeCoreException { return BranchArchivedState.valueOf(ConnectionHandler.runPreparedQueryFetchInt(0, "Select archived from osee_branch where branch_guid = ?", branchGuid)); } - private static BranchArchivedState isArchived(int branchId) throws OseeDataStoreException { + private static BranchArchivedState isArchived(int branchId) throws OseeCoreException { return BranchArchivedState.valueOf(ConnectionHandler.runPreparedQueryFetchInt(0, "Select archived from osee_branch where branch_id = ?", branchId)); } - private static BranchArchivedState isArchived(String branchName) throws OseeDataStoreException { + private static BranchArchivedState isArchived(String branchName) throws OseeCoreException { return BranchArchivedState.valueOf(ConnectionHandler.runPreparedQueryFetchInt(0, "Select archived from osee_branch where branch_name like ?", branchName)); } - private static String getUri(BranchArchivedState state, String query, Object... dataBindings) throws OseeDataStoreException { + private static String getUri(BranchArchivedState state, String query, Object... dataBindings) throws OseeCoreException { String sql = String.format(query, getTransactionTable(state)); return ConnectionHandler.runPreparedQueryFetchString("", sql, dataBindings); } diff --git a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMq.java b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMq.java index 7ddc606e7be..943164941c7 100644 --- a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMq.java +++ b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ConnectionNodeActiveMq.java @@ -19,7 +19,6 @@ import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.logging.Level; - import javax.jms.Connection; import javax.jms.DeliveryMode; import javax.jms.ExceptionListener; @@ -31,10 +30,9 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TemporaryTopic; import javax.jms.Topic; - import org.apache.activemq.ActiveMQConnectionFactory; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeWrappedException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.jdk.core.type.CompositeKeyHashMap; import org.eclipse.osee.framework.jdk.core.type.Pair; import org.eclipse.osee.framework.logging.OseeLog; @@ -101,7 +99,7 @@ class ConnectionNodeActiveMq implements ConnectionNodeFailoverSupport, MessageLi connection.start(); started = true; } catch (Throwable ex) { - throw new OseeWrappedException(ex); + OseeExceptions.wrapAndThrow(ex); } } @@ -130,12 +128,9 @@ class ConnectionNodeActiveMq implements ConnectionNodeFailoverSupport, MessageLi // OseeLog.log(Activator.class, Level.FINE, String.format("Sending message %s - %s", topic.getName(), topic.getGuid())); statusCallback.success(); } - } catch (JMSException ex) { - statusCallback.fail(ex); - throw new OseeWrappedException(ex); - } catch (NullPointerException ex) { + } catch (Exception ex) { statusCallback.fail(ex); - throw new OseeWrappedException(ex); + OseeExceptions.wrapAndThrow(ex); } } diff --git a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ReplyConnectionActiveMqImpl.java b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ReplyConnectionActiveMqImpl.java index 0332d2c4ae6..9872296eb63 100644 --- a/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ReplyConnectionActiveMqImpl.java +++ b/plugins/org.eclipse.osee.framework.messaging/src/org/eclipse/osee/framework/messaging/internal/activemq/ReplyConnectionActiveMqImpl.java @@ -17,7 +17,7 @@ import javax.jms.Message; import javax.jms.MessageProducer; import javax.jms.Session; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeWrappedException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.messaging.OseeMessagingStatusCallback; import org.eclipse.osee.framework.messaging.ReplyConnection; @@ -62,7 +62,7 @@ class ReplyConnectionActiveMqImpl implements ReplyConnection { OseeLog.log(Activator.class, Level.INFO, String.format("Sending Reply Message %s", message.toString())); } catch (JMSException ex) { statusCallback.fail(ex); - throw new OseeWrappedException(ex); + OseeExceptions.wrapAndThrow(ex); } } diff --git a/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/util/AIFile.java b/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/util/AIFile.java index 11148ffdc24..7e2e7ce20c9 100644 --- a/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/util/AIFile.java +++ b/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/util/AIFile.java @@ -11,13 +11,11 @@ package org.eclipse.osee.framework.plugin.core.util; import java.io.File; -import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -42,10 +40,8 @@ public final class AIFile { file.create(in, true, null); in.close(); } - } catch (CoreException ex) { - throw new OseeCoreException(ex); - } catch (IOException ex) { - throw new OseeCoreException(ex); + } catch (Exception ex) { + OseeExceptions.wrapAndThrow(ex); } } diff --git a/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/util/OseeData.java b/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/util/OseeData.java index 198e452ee0a..8432f7b3581 100644 --- a/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/util/OseeData.java +++ b/plugins/org.eclipse.osee.framework.plugin.core/src/org/eclipse/osee/framework/plugin/core/util/OseeData.java @@ -22,6 +22,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.internal.PluginCoreActivator; @@ -114,7 +115,8 @@ public class OseeData { } return folder; } catch (CoreException ex) { - throw new OseeCoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } } \ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.resource.locator.attribute/src/org/eclipse/osee/framework/resource/locator/attribute/AttributeLocatorProvider.java b/plugins/org.eclipse.osee.framework.resource.locator.attribute/src/org/eclipse/osee/framework/resource/locator/attribute/AttributeLocatorProvider.java index 20dcc29da96..8ee0cd0a193 100644 --- a/plugins/org.eclipse.osee.framework.resource.locator.attribute/src/org/eclipse/osee/framework/resource/locator/attribute/AttributeLocatorProvider.java +++ b/plugins/org.eclipse.osee.framework.resource.locator.attribute/src/org/eclipse/osee/framework/resource/locator/attribute/AttributeLocatorProvider.java @@ -15,7 +15,7 @@ import java.io.Reader; import java.io.StringReader; import java.net.URI; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.resource.management.IResourceLocator; import org.eclipse.osee.framework.resource.management.IResourceLocatorProvider; @@ -67,7 +67,7 @@ public class AttributeLocatorProvider implements IResourceLocatorProvider { return Strings.isValid(value) && value.startsWith(getSupportedProtocol() + "://"); } - private String generatePath(String seed, String name) throws MalformedLocatorException, OseeDataStoreException { + private String generatePath(String seed, String name) throws OseeCoreException { StringBuilder builder = new StringBuilder(); builder.append(getSupportedProtocol()); builder.append("://"); @@ -81,7 +81,7 @@ public class AttributeLocatorProvider implements IResourceLocatorProvider { builder.append("/"); } } catch (IOException ex) { - throw new MalformedLocatorException(ex); + OseeExceptions.wrapAndThrow(ex); } builder.append(name); diff --git a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/ITaggerStatistics.java b/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/ITaggerStatistics.java index 9b37f4801cc..7f8dbd74689 100644 --- a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/ITaggerStatistics.java +++ b/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/ITaggerStatistics.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.search.engine; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; /** * @author Roberto E. Escobar @@ -39,8 +39,8 @@ public interface ITaggerStatistics { public ITagItemStatistics getMostTagsTask(); - public long getTagsInSystem() throws OseeDataStoreException; + public long getTagsInSystem() throws OseeCoreException; - public long getTotalQueryIdsInQueue() throws OseeDataStoreException; + public long getTotalQueryIdsInQueue() throws OseeCoreException; } diff --git a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/attribute/AttributeDataStore.java b/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/attribute/AttributeDataStore.java index ab1f80b8d7c..5035cba685c 100644 --- a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/attribute/AttributeDataStore.java +++ b/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/attribute/AttributeDataStore.java @@ -18,7 +18,6 @@ import java.util.List; import java.util.Set; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.type.AttributeType; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; @@ -51,7 +50,7 @@ public final class AttributeDataStore { // Utility Class } - public static Collection getAttribute(final OseeConnection connection, final int tagQueueQueryId) throws OseeDataStoreException { + public static Collection getAttribute(final OseeConnection connection, final int tagQueueQueryId) throws OseeCoreException { final Collection attributeData = new ArrayList(); IOseeStatement chStmt = ConnectionHandler.getStatement(connection); @@ -132,7 +131,7 @@ public final class AttributeDataStore { return builder.toString(); } - public static int getTotalTaggableItems(OseeConnection connection, final int branchId) throws OseeDataStoreException { + public static int getTotalTaggableItems(OseeConnection connection, final int branchId) throws OseeCoreException { return ConnectionHandler.runPreparedQueryFetchInt(connection, -1, getBranchTaggingQueries(branchId, true), getAllTaggableGammasByBranchQueryData(branchId)); } diff --git a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/tagger/InputStreamTagProcessor.java b/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/tagger/InputStreamTagProcessor.java index 6d862fc6867..96fd817c5d6 100644 --- a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/tagger/InputStreamTagProcessor.java +++ b/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/tagger/InputStreamTagProcessor.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.search.engine.internal.tagger; import java.io.InputStream; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.OseeConnection; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.jdk.core.util.io.xml.AbstractSaxHandler; @@ -53,7 +53,7 @@ final class InputStreamTagProcessor extends InputToTagQueueTx { } @Override - public void startElementFound(String uri, String localName, String name, Attributes attributes) throws NumberFormatException, OseeDataStoreException { + public void startElementFound(String uri, String localName, String name, Attributes attributes) throws NumberFormatException, OseeCoreException { if (name.equalsIgnoreCase("entry")) { String gammaId = attributes.getValue("gammaId"); if (Strings.isValid(gammaId)) { diff --git a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/tagger/InputToTagQueueTx.java b/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/tagger/InputToTagQueueTx.java index 7d1d1539228..62aed94fe04 100644 --- a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/tagger/InputToTagQueueTx.java +++ b/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/tagger/InputToTagQueueTx.java @@ -14,7 +14,6 @@ package org.eclipse.osee.framework.search.engine.internal.tagger; import java.util.ArrayList; import java.util.List; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.database.core.DbTransaction; import org.eclipse.osee.framework.database.core.JoinUtility; @@ -84,7 +83,7 @@ public abstract class InputToTagQueueTx extends DbTransaction { } } - protected void addEntry(OseeConnection connection, long gammaId) throws OseeDataStoreException { + protected void addEntry(OseeConnection connection, long gammaId) throws OseeCoreException { if (currentJoinQuery == null) { currentJoinQuery = JoinUtility.createTagQueueJoinQuery(); } @@ -98,7 +97,7 @@ public abstract class InputToTagQueueTx extends DbTransaction { return this.isCacheAll != true && this.currentJoinQuery != null && this.currentJoinQuery.size() > this.cacheLimit; } - private void storeQueryIds(OseeConnection connection) throws OseeDataStoreException { + private void storeQueryIds(OseeConnection connection) throws OseeCoreException { if (currentJoinQuery != null && !currentJoinQuery.isEmpty()) { currentJoinQuery.store(connection); queryIds.add(currentJoinQuery.getQueryId()); diff --git a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/tagger/TaggerRunnable.java b/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/tagger/TaggerRunnable.java index 292521246a5..e9aecf2875d 100644 --- a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/tagger/TaggerRunnable.java +++ b/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/tagger/TaggerRunnable.java @@ -17,7 +17,6 @@ import java.util.LinkedList; import java.util.Set; import java.util.logging.Level; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.core.DbTransaction; import org.eclipse.osee.framework.database.core.JoinUtility; import org.eclipse.osee.framework.database.core.JoinUtility.JoinItem; @@ -130,7 +129,7 @@ class TaggerRunnable implements Runnable { this.currentTag = null; } - private Collection getDataFromQueryId(OseeConnection connection, int queryId, final int numberOfRetries) throws OseeDataStoreException { + private Collection getDataFromQueryId(OseeConnection connection, int queryId, final int numberOfRetries) throws OseeCoreException { Collection attributeDatas = AttributeDataStore.getAttribute(connection, getTagQueueQueryId()); // Re-try in case query id hasn't been committed to the database int retry = 0; @@ -194,7 +193,7 @@ class TaggerRunnable implements Runnable { } } - private void checkSizeStoreIfNeeded(OseeConnection connection) throws OseeDataStoreException { + private void checkSizeStoreIfNeeded(OseeConnection connection) throws OseeCoreException { int cummulative = 0; boolean needsStorage = false; for (SearchTag item : this.searchTags) { @@ -209,7 +208,7 @@ class TaggerRunnable implements Runnable { } } - private void store(OseeConnection connection, Collection toStore) throws OseeDataStoreException { + private void store(OseeConnection connection, Collection toStore) throws OseeCoreException { tagDataStore.storeTags(connection, toStore); for (SearchTag item : toStore) { item.clearCache(); diff --git a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/tagger/TaggerStatistics.java b/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/tagger/TaggerStatistics.java index 692916d3fe3..1de85775aa9 100644 --- a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/tagger/TaggerStatistics.java +++ b/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/tagger/TaggerStatistics.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.search.engine.internal.tagger; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.search.engine.ITagItemStatistics; import org.eclipse.osee.framework.search.engine.ITaggerStatistics; import org.eclipse.osee.framework.search.engine.TagListenerAdapter; @@ -115,12 +115,12 @@ public class TaggerStatistics extends TagListenerAdapter implements Cloneable, I } @Override - public long getTagsInSystem() throws OseeDataStoreException { + public long getTagsInSystem() throws OseeCoreException { return tagDataStore != null ? tagDataStore.getTotalTags() : 0; } @Override - public long getTotalQueryIdsInQueue() throws OseeDataStoreException { + public long getTotalQueryIdsInQueue() throws OseeCoreException { return tagDataStore != null ? tagDataStore.getTotalQueryIdsInQueue() : 0; } diff --git a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/utility/SearchTagDataStore.java b/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/utility/SearchTagDataStore.java index ff5400f2aaa..06e788a5963 100644 --- a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/utility/SearchTagDataStore.java +++ b/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/utility/SearchTagDataStore.java @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; @@ -47,15 +47,15 @@ public class SearchTagDataStore { this.databaseService = databaseService; } - public long getTotalQueryIdsInQueue() throws OseeDataStoreException { + public long getTotalQueryIdsInQueue() throws OseeCoreException { return databaseService.runPreparedQueryFetchObject(-1L, SELECT_TOTAL_QUERY_IDS_IN_QUEUE); } - public long getTotalTags() throws OseeDataStoreException { + public long getTotalTags() throws OseeCoreException { return databaseService.runPreparedQueryFetchObject(-1L, SELECT_TOTAL_TAGS); } - public int deleteTags(OseeConnection connection, int queryId) throws OseeDataStoreException { + public int deleteTags(OseeConnection connection, int queryId) throws OseeCoreException { int numberDeleted = 0; IOseeStatement chStmt = databaseService.getStatement(connection); try { @@ -73,11 +73,11 @@ public class SearchTagDataStore { return numberDeleted; } - public int deleteTags(OseeConnection connection, Collection locators) throws OseeDataStoreException { + public int deleteTags(OseeConnection connection, Collection locators) throws OseeCoreException { return deleteTags(connection, locators.toArray(new IAttributeLocator[locators.size()])); } - public int deleteTags(OseeConnection connection, IAttributeLocator... locators) throws OseeDataStoreException { + public int deleteTags(OseeConnection connection, IAttributeLocator... locators) throws OseeCoreException { int numberDeleted = 0; if (locators.length > 0) { List datas = new ArrayList(); @@ -89,11 +89,11 @@ public class SearchTagDataStore { return numberDeleted; } - public int storeTags(OseeConnection connection, Collection searchTags) throws OseeDataStoreException { + public int storeTags(OseeConnection connection, Collection searchTags) throws OseeCoreException { return storeTags(connection, searchTags.toArray(new SearchTag[searchTags.size()])); } - public static int storeTags(OseeConnection connection, SearchTag... searchTags) throws OseeDataStoreException { + public static int storeTags(OseeConnection connection, SearchTag... searchTags) throws OseeCoreException { int updated = 0; if (searchTags != null && searchTags.length > 0) { for (SearchTag searchTag : searchTags) { @@ -111,7 +111,7 @@ public class SearchTagDataStore { return fetchTagEntries(connection, codedTags.toArray(new Long[codedTags.size()])); } - public static Set fetchTagEntries(OseeConnection connection, Long... codedTags) throws OseeDataStoreException { + public static Set fetchTagEntries(OseeConnection connection, Long... codedTags) throws OseeCoreException { final Set toReturn = new HashSet(); for (Long codedTag : codedTags) { diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/app/DataStoreBackupApplication.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/app/DataStoreBackupApplication.java index d1c62bb38cd..ad60a2f6bd2 100644 --- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/app/DataStoreBackupApplication.java +++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/app/DataStoreBackupApplication.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import org.eclipse.equinox.app.IApplication; import org.eclipse.equinox.app.IApplicationContext; import org.eclipse.osee.framework.branch.management.ExportOptions; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.jdk.core.util.Lib; @@ -38,7 +38,7 @@ import org.eclipse.osee.framework.server.admin.internal.Activator; public class DataStoreBackupApplication implements IApplication { private static final String ALL_BRANCHES_QUERY = "select branch_id from osee_branch"; - private List getAllBranches() throws OseeDataStoreException { + private List getAllBranches() throws OseeCoreException { List toReturn = new ArrayList(); IOseeStatement chStmt = ConnectionHandler.getStatement(); try { diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/CompressedContentFix.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/CompressedContentFix.java index fb52bd263e5..5b8520e62a2 100644 --- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/CompressedContentFix.java +++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/CompressedContentFix.java @@ -19,7 +19,6 @@ import java.net.URLEncoder; import java.util.Map; import java.util.logging.Level; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; @@ -95,7 +94,7 @@ public class CompressedContentFix { try { initializeData(); doWork(time); - } catch (OseeDataStoreException ex) { + } catch (OseeCoreException ex) { OseeLog.log(Activator.class, Level.SEVERE, ex); } finally { clear(); @@ -109,7 +108,7 @@ public class CompressedContentFix { isRunning = false; } - private void initializeData() throws OseeDataStoreException { + private void initializeData() throws OseeCoreException { nativeExtension = Util.getArtIdMap("Extension"); nameMap = Util.getArtIdMap("Name"); } diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/Util.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/Util.java index 3055ea9c02a..e42c3b7f3fc 100644 --- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/Util.java +++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/Util.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.server.admin.conversion; import java.util.HashMap; import java.util.Map; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; @@ -27,7 +27,7 @@ public class Util { private static final String sqlExtensionTypes = "SELECT attr1.art_id, attr1.value FROM osee_attribute attr1 WHERE attr1.ATTR_TYPE_ID = ?"; - public static Map getArtIdMap(String attrTypeName) throws OseeDataStoreException { + public static Map getArtIdMap(String attrTypeName) throws OseeCoreException { Map toReturn = new HashMap(250); IOseeStatement chStmt = ConnectionHandler.getStatement(); diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/search/TaggerAllWorker.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/search/TaggerAllWorker.java index d16c0bf1947..9e9219e5b69 100644 --- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/search/TaggerAllWorker.java +++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/search/TaggerAllWorker.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.database.core.JoinUtility; @@ -40,7 +40,7 @@ class TaggerAllWorker extends BaseServerCommand { this.processor = null; } - private void fetchAndProcessGammas(OseeConnection connection, int branchId, TagProcessListener processor) throws OseeDataStoreException { + private void fetchAndProcessGammas(OseeConnection connection, int branchId, TagProcessListener processor) throws OseeCoreException { IOseeStatement chStmt = ConnectionHandler.getStatement(connection); try { chStmt.runPreparedQuery(AttributeDataStore.getAllTaggableGammasByBranchQuery(branchId), @@ -128,7 +128,7 @@ class TaggerAllWorker extends BaseServerCommand { Activator.getInstance().getSearchTagger().stopTaggingByQueueQueryId(toStop); } - public void storeAndAddQueryId(OseeConnection connection, TagQueueJoinQuery joinQuery) throws OseeDataStoreException { + public void storeAndAddQueryId(OseeConnection connection, TagQueueJoinQuery joinQuery) throws OseeCoreException { if (joinQuery.size() > 0) { joinQuery.store(connection); this.queryIdMap.put(joinQuery.getQueryId(), joinQuery); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DeletionTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DeletionTest.java index 888772d6562..63f6b2f699d 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DeletionTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DeletionTest.java @@ -21,7 +21,6 @@ import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; -import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.database.IOseeDatabaseServiceProvider; @@ -297,7 +296,7 @@ public class DeletionTest { } } - private void checkAttribute(Artifact artifact, Attribute attribute, int value) throws OseeDataStoreException { + private void checkAttribute(Artifact artifact, Attribute attribute, int value) throws OseeCoreException { IOseeStatement chStmt = ConnectionHandler.getStatement(); try { chStmt.runPreparedQuery(CHECK_FOR_ZERO_TX_CURRENT_ATTRIBUTE, artifact.getBranch().getId(), @@ -323,7 +322,7 @@ public class DeletionTest { } } - public void checkRelation(Artifact artifact, RelationLink relation, int value) throws OseeDataStoreException { + public void checkRelation(Artifact artifact, RelationLink relation, int value) throws OseeCoreException { IOseeStatement chStmt = ConnectionHandler.getStatement(); assertTrue( "Relation should be deleted between Parent: " + relation.getAArtifactId() + " and child " + relation.getBArtifactId(), @@ -355,7 +354,7 @@ public class DeletionTest { } } - public static void dumpArtifact(Artifact artifact) throws OseeDataStoreException { + public static void dumpArtifact(Artifact artifact) throws OseeCoreException { IOseeStatement chStmt = ConnectionHandler.getStatement(); try { System.out.println(" Artifact Dump : " + artifact.getName()); @@ -372,7 +371,7 @@ public class DeletionTest { } } - public static void dumpAttribute(Attribute attribute) throws OseeDataStoreException, OseeStateException { + public static void dumpAttribute(Attribute attribute) throws OseeDataStoreException, OseeCoreException { IOseeStatement chStmt = ConnectionHandler.getStatement(); try { System.out.println(" Attribute Dump"); @@ -390,7 +389,7 @@ public class DeletionTest { } } - public static void dumpRelation(RelationLink relation, Artifact artifact) throws OseeDataStoreException { + public static void dumpRelation(RelationLink relation, Artifact artifact) throws OseeCoreException { IOseeStatement chStmt = ConnectionHandler.getStatement(); try { System.out.println(" Relation Dump"); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DuplicateHridTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DuplicateHridTest.java index 92573415a54..96ab6b61be7 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DuplicateHridTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/DuplicateHridTest.java @@ -12,6 +12,7 @@ package org.eclipse.osee.framework.skynet.core.test.cases; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.jdk.core.util.HumanReadableId; @@ -29,7 +30,7 @@ public class DuplicateHridTest { } @org.junit.Test - public void testDuplicatePrevention() throws OseeDataStoreException { + public void testDuplicatePrevention() throws OseeCoreException { String known_duplicate = get_used_HRID(); String random_HRID = generate_random_HRID(); assertFalse("Duplicate check returned false positive", Artifact.isUniqueHRID(known_duplicate)); @@ -39,7 +40,7 @@ public class DuplicateHridTest { } /* Queries the database and grabs the first HRID it sees */ - private static String get_used_HRID() throws OseeDataStoreException { + private static String get_used_HRID() throws OseeCoreException { String toReturn = ConnectionHandler.runPreparedQueryFetchString("", GET_ARTIFACTS); if (!HumanReadableId.isValid(toReturn)) { throw new OseeDataStoreException("No valid HRIDs found"); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/BootStrapUser.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/BootStrapUser.java index 75c0f1bad50..3cfe21181b2 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/BootStrapUser.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/BootStrapUser.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core; import org.eclipse.osee.framework.core.data.SystemUser; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; /** * @author Ryan D. Brooks @@ -21,14 +21,11 @@ public class BootStrapUser extends User { public static BootStrapUser instance; - private BootStrapUser() throws OseeDataStoreException { + private BootStrapUser() throws OseeCoreException { super(null, null, null, null, null); } - /** - * @return the instance - */ - public static BootStrapUser getInstance() throws OseeDataStoreException { + public static BootStrapUser getInstance() throws OseeCoreException { if (instance == null) { instance = new BootStrapUser(); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java index 1b2ebbc4201..ac5d773d9e5 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/User.java @@ -20,7 +20,6 @@ import org.eclipse.osee.framework.core.enums.BranchArchivedState; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.ArtifactType; @@ -42,7 +41,7 @@ public class User extends Artifact { SystemGroup.Everyone.addMember(this); } - public User(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public User(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humanReadableId, branch, artifactType); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java index 7dec479b5aa..7aa5feb89b9 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java @@ -118,7 +118,7 @@ public class Artifact extends NamedIdentity implements IArtifact, IAdaptable, Co private ModificationType lastValidModType; private EditState objectEditState; - public Artifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public Artifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(guid, ""); objectEditState = EditState.NO_CHANGE; modType = ModificationType.NEW; @@ -1230,12 +1230,12 @@ public class Artifact extends NamedIdentity implements IArtifact, IAdaptable, Co return humanReadableId; } - private void populateHumanReadableID() throws OseeDataStoreException { + private void populateHumanReadableID() throws OseeCoreException { String hrid = HumanReadableId.generate(); humanReadableId = isUniqueHRID(hrid) ? hrid : HumanReadableId.generate(); } - public static boolean isUniqueHRID(String id) throws OseeDataStoreException { + public static boolean isUniqueHRID(String id) throws OseeCoreException { String DUPLICATE_HRID_SEARCH = "select count(1) from (select DISTINCT(art_id) from osee_artifact where human_readable_id = ?) t1"; return ConnectionHandler.runPreparedQueryFetchLong(0L, DUPLICATE_HRID_SEARCH, id) <= 0; diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java index 0cef4667f6f..0f3ef820447 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactLoader.java @@ -230,14 +230,14 @@ public final class ArtifactLoader { /** * must be call in a try block with a finally clause which calls clearQuery() */ - public static int insertIntoArtifactJoin(OseeConnection connection, List insertParameters) throws OseeDataStoreException { + public static int insertIntoArtifactJoin(OseeConnection connection, List insertParameters) throws OseeCoreException { return ConnectionHandler.runBatchUpdate(connection, INSERT_JOIN_ARTIFACT, insertParameters); } /** * must be call in a try block with a finally clause which calls clearQuery() */ - public static int insertIntoArtifactJoin(List insertParameters) throws OseeDataStoreException { + public static int insertIntoArtifactJoin(List insertParameters) throws OseeCoreException { return insertIntoArtifactJoin(null, insertParameters); } @@ -247,7 +247,7 @@ public final class ArtifactLoader { * @param queryId value gotten from call to getNewQueryId and used in populating the insert parameters for * selectArtifacts */ - public static void clearQuery(int queryId) throws OseeDataStoreException { + public static void clearQuery(int queryId) throws OseeCoreException { ConnectionHandler.runPreparedUpdate(DELETE_FROM_JOIN_ARTIFACT, queryId); } @@ -257,7 +257,7 @@ public final class ArtifactLoader { * @param queryId value gotten from call to getNewQueryId and used in populating the insert parameters for * selectArtifacts */ - public static void clearQuery(OseeConnection connection, int queryId) throws OseeDataStoreException { + public static void clearQuery(OseeConnection connection, int queryId) throws OseeCoreException { if (connection != null) { ConnectionHandler.runPreparedUpdate(connection, DELETE_FROM_JOIN_ARTIFACT, queryId); } else { diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java index bae06821d7f..5ac5d8cabb3 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java @@ -23,6 +23,7 @@ import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist; import org.eclipse.osee.framework.core.model.Branch; @@ -263,7 +264,7 @@ public class ArtifactTypeManager { } } } catch (Exception ex) { - throw new OseeCoreException(ex); + OseeExceptions.wrapAndThrow(ex); } } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Attribute.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Attribute.java index e3f1078d698..2068479d188 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Attribute.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Attribute.java @@ -144,7 +144,8 @@ public abstract class Attribute { } return response; } catch (IOException ex) { - throw new OseeCoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return false; // unreachable since wrapAndThrow() always throws an exception } } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/AttributeLoader.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/AttributeLoader.java index 18eaf666e41..d149105f955 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/AttributeLoader.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/AttributeLoader.java @@ -22,7 +22,6 @@ import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.database.core.OseeSql; @@ -85,7 +84,7 @@ public class AttributeLoader { // do nothing } - public AttrData(IOseeStatement chStmt, boolean historical) throws OseeDataStoreException { + public AttrData(IOseeStatement chStmt, boolean historical) throws OseeCoreException { artifactId = chStmt.getInt("art_id"); branchId = chStmt.getInt("branch_id"); attrId = chStmt.getInt("attr_id"); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java index d8160cf4735..772a08ee550 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeArtifacts.java @@ -18,7 +18,6 @@ import java.util.List; import java.util.Set; import java.util.logging.Level; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.core.ConnectionHandler; @@ -184,7 +183,7 @@ public class PurgeArtifacts extends DbTransaction { } } - public void insertSelectItems(OseeConnection connection, String tableName, String artifactJoinSql, int transactionJoinId, Timestamp insertTime, int queryId) throws OseeDataStoreException { + public void insertSelectItems(OseeConnection connection, String tableName, String artifactJoinSql, int transactionJoinId, Timestamp insertTime, int queryId) throws OseeCoreException { IOseeDatabaseService databaseService = Activator.getInstance().getOseeDatabaseService(); String sql = String.format(INSERT_SELECT_ITEM, tableName, artifactJoinSql); databaseService.runPreparedUpdate(connection, sql, transactionJoinId, insertTime, queryId); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionOperation.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionOperation.java index 9ee1c365a67..c57f22065a8 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionOperation.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionOperation.java @@ -20,7 +20,6 @@ import java.util.Set; import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.exception.TransactionDoesNotExist; import org.eclipse.osee.framework.core.model.Branch; @@ -199,7 +198,7 @@ public class PurgeTransactionOperation extends AbstractDbTxOperation { return null; } - private void getAffectedArtifacts(OseeConnection connection, int transactionQueryId) throws OseeDataStoreException { + private void getAffectedArtifacts(OseeConnection connection, int transactionQueryId) throws OseeCoreException { artifactJoinId = ArtifactLoader.getNewQueryId(); ConnectionHandler.runPreparedUpdate(connection, LOAD_ARTIFACTS, artifactJoinId, transactionQueryId, artifactJoinId, transactionQueryId, artifactJoinId, transactionQueryId, artifactJoinId, transactionQueryId); @@ -234,13 +233,13 @@ public class PurgeTransactionOperation extends AbstractDbTxOperation { return fromToTxData; } - private void deleteTransactionsFromTxDetails(OseeConnection connection, IProgressMonitor monitor, int queryId, double workPercentage) throws OseeDataStoreException { + private void deleteTransactionsFromTxDetails(OseeConnection connection, IProgressMonitor monitor, int queryId, double workPercentage) throws OseeCoreException { monitor.subTask("Deleting Tx"); ConnectionHandler.runPreparedUpdate(connection, DELETE_TRANSACTION_FROM_TRANSACTION_DETAILS, queryId); monitor.worked(calculateWork(workPercentage)); } - private void deleteItemEntriesForTransactions(OseeConnection connection, IProgressMonitor monitor, int txsToDeleteQueryId, double workPercentage) throws OseeDataStoreException { + private void deleteItemEntriesForTransactions(OseeConnection connection, IProgressMonitor monitor, int txsToDeleteQueryId, double workPercentage) throws OseeCoreException { monitor.subTask("Deleting Tx Items"); TransactionJoinQuery txGammasToDelete = JoinUtility.createTransactionJoinQuery(); try { @@ -260,7 +259,7 @@ public class PurgeTransactionOperation extends AbstractDbTxOperation { monitor.worked(calculateWork(workPercentage)); } - private void populateJoinQueryFromSql(OseeConnection connection, TransactionJoinQuery joinQuery, String sql, String txFieldName, Object... data) throws OseeDataStoreException { + private void populateJoinQueryFromSql(OseeConnection connection, TransactionJoinQuery joinQuery, String sql, String txFieldName, Object... data) throws OseeCoreException { IOseeStatement chStmt = ConnectionHandler.getStatement(connection); try { chStmt.runPreparedQuery(sql, data); @@ -272,7 +271,7 @@ public class PurgeTransactionOperation extends AbstractDbTxOperation { } } - private void updateTxCurrent(OseeConnection conn, IProgressMonitor monitor, double workPercentage) throws OseeDataStoreException { + private void updateTxCurrent(OseeConnection conn, IProgressMonitor monitor, double workPercentage) throws OseeCoreException { monitor.setTaskName("Updating Previous Tx to Current"); ConnectionHandler.runPreparedUpdate(conn, UPDATE_TXS, artifactJoinId, artifactJoinId, artifactJoinId); monitor.worked(calculateWork(workPercentage)); @@ -284,7 +283,7 @@ public class PurgeTransactionOperation extends AbstractDbTxOperation { } } - private void setChildBranchBaselineTxs(OseeConnection connection, IProgressMonitor monitor, HashCollection transactions, double workPercentage) throws OseeDataStoreException { + private void setChildBranchBaselineTxs(OseeConnection connection, IProgressMonitor monitor, HashCollection transactions, double workPercentage) throws OseeCoreException { List data = new ArrayList(); monitor.setTaskName("Update Baseline Txs for Child Branches"); for (TxDeleteInfo entry : transactions.getValues()) { diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/RevertAction.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/RevertAction.java index b7006271085..bf6d801fc30 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/RevertAction.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/RevertAction.java @@ -163,7 +163,7 @@ public class RevertAction { System.out.println(String.format(" Displayed all the data in %s", Lib.getElapseString(time))); } - private void setTxCurrentForRevertedObjects() throws OseeDataStoreException { + private void setTxCurrentForRevertedObjects() throws OseeCoreException { int count2; long time = System.currentTimeMillis(); count2 = ConnectionHandler.runBatchUpdate(connection, SET_TX_CURRENT_REVERT, gammaIdsBaseline); @@ -176,7 +176,7 @@ public class RevertAction { } } - private void updateArtifactVersionTxCurrents(int branchId, int artId) throws OseeDataStoreException { + private void updateArtifactVersionTxCurrents(int branchId, int artId) throws OseeCoreException { if (DEBUG) { IOseeStatement chStmt = ConnectionHandler.getStatement(connection); try { diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UpdateMergeBranch.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UpdateMergeBranch.java index f1fbecb5976..9a1afdd82a4 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UpdateMergeBranch.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/UpdateMergeBranch.java @@ -22,7 +22,6 @@ import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.DbTransaction; @@ -183,7 +182,7 @@ public class UpdateMergeBranch extends DbTransaction { } } - private static void insertGammas(OseeConnection connection, String sql, int baselineTransactionNumber, int queryId, Branch sourceBranch, Branch mergeBranch) throws OseeDataStoreException { + private static void insertGammas(OseeConnection connection, String sql, int baselineTransactionNumber, int queryId, Branch sourceBranch, Branch mergeBranch) throws OseeCoreException { ConnectionHandler.runPreparedUpdate(connection, sql, baselineTransactionNumber, TxChange.CURRENT.getValue(), mergeBranch.getId(), sourceBranch.getId(), queryId); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/ArtifactOperation.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/ArtifactOperation.java index 3bd6f902efe..5c29173eefe 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/ArtifactOperation.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/operation/ArtifactOperation.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.artifact.operation; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -25,7 +25,7 @@ public abstract class ArtifactOperation extends Artifact implements WorkflowStep public static final String PROVIDES_ACCEPTABLE_INPUT = "Provides Acceptable Input"; public static final String ARTIFACT_NAME = "Artifact Operation"; - public ArtifactOperation(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException { + public ArtifactOperation(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeCoreException { super(parentFactory, guid, humanReadableId, branch, artifactType); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AbstractArtifactSearchCriteria.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AbstractArtifactSearchCriteria.java index 3a7feeef443..916fd7c6b8f 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AbstractArtifactSearchCriteria.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AbstractArtifactSearchCriteria.java @@ -25,7 +25,7 @@ public abstract class AbstractArtifactSearchCriteria { public abstract void addJoinArtId(ArtifactQueryBuilder builder, boolean left) throws OseeDataStoreException; @SuppressWarnings("unused") - public void cleanUp() throws OseeDataStoreException { + public void cleanUp() throws OseeCoreException { // provided for subclass implementation } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryBuilder.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryBuilder.java index 9dbb95031bc..827b3985d46 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryBuilder.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/ArtifactQueryBuilder.java @@ -28,7 +28,6 @@ import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.core.exception.MultipleArtifactsExist; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.OseeWrappedException; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.database.core.ConnectionHandler; @@ -375,7 +374,7 @@ public class ArtifactQueryBuilder { return query; } - private void addToGuidJoin() throws OseeDataStoreException { + private void addToGuidJoin() throws OseeCoreException { guidJoinQuery = JoinUtility.createCharJoinQuery(ClientSessionManager.getSessionId()); for (String guid : guids) { guidJoinQuery.add(guid); @@ -483,7 +482,7 @@ public class ArtifactQueryBuilder { } } - private void clearCriteria() throws OseeDataStoreException { + private void clearCriteria() throws OseeCoreException { if (this.criteria != null) { for (AbstractArtifactSearchCriteria critiri : criteria) { critiri.cleanUp(); diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeCriteria.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeCriteria.java index 4b1ac658555..c23fd105e9f 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeCriteria.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/search/AttributeCriteria.java @@ -214,7 +214,7 @@ public class AttributeCriteria extends AbstractArtifactSearchCriteria { } @Override - public void cleanUp() throws OseeDataStoreException { + public void cleanUp() throws OseeCoreException { if (joinQuery != null) { joinQuery.delete(); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeExtensionManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeExtensionManager.java index a6508d61b20..27ddccfe84b 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeExtensionManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeExtensionManager.java @@ -20,8 +20,8 @@ import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.Platform; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.exception.OseeStateException; -import org.eclipse.osee.framework.core.exception.OseeWrappedException; import org.eclipse.osee.framework.jdk.core.type.Pair; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.plugin.core.util.ExtensionPoints; @@ -94,13 +94,13 @@ public class AttributeExtensionManager { } @SuppressWarnings("unchecked") - private Class loadClass(String bundleName, String className) throws OseeWrappedException { + private Class loadClass(String bundleName, String className) throws OseeCoreException { Class toReturn = null; try { Bundle bundle = Platform.getBundle(bundleName); toReturn = bundle.loadClass(className); } catch (ClassNotFoundException ex) { - throw new OseeWrappedException(String.format("Unable to Load: [%s - %s]", bundleName, className), ex); + OseeExceptions.wrapAndThrow(ex); } return toReturn; } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeResourceProcessor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeResourceProcessor.java index 08b7c3540f1..de738722d1b 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeResourceProcessor.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeResourceProcessor.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.skynet.core.attribute; import java.net.MalformedURLException; import java.net.URL; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.skynet.core.artifact.Attribute; import org.eclipse.osee.framework.skynet.core.attribute.providers.DataStore; @@ -44,16 +44,13 @@ public class AttributeResourceProcessor extends AbstractResourceProcessor { try { return AttributeURL.getStorageURL(seed, name, extension); } catch (MalformedURLException ex) { - throw new OseeDataStoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } @Override - public String createStorageName() throws OseeDataStoreException { - try { - return BinaryContentUtils.getStorageName(attribute); - } catch (OseeStateException ex) { - throw new OseeDataStoreException(ex); - } + public String createStorageName() throws OseeStateException { + return BinaryContentUtils.getStorageName(attribute); } } \ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/CompressedContentAttribute.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/CompressedContentAttribute.java index 81fe123e3e6..865bf9b61df 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/CompressedContentAttribute.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/CompressedContentAttribute.java @@ -54,7 +54,8 @@ public final class CompressedContentAttribute extends BinaryAttribute links = getFlattenedList(relationsByType.getValues(threadLocalKey.get().getKey(artifact))); if (!links.isEmpty()) { diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeData.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeData.java index 4ca675cd660..93c9e2f4e09 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeData.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ChangeData.java @@ -15,6 +15,7 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.util.Conditions; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -63,7 +64,8 @@ public class ChangeData { } return foundChanges; } catch (Exception ex) { - throw new OseeCoreException(ex); + OseeExceptions.wrapAndThrow(ex); + return null; // unreachable since wrapAndThrow() always throws an exception } } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java index 0bafdeffc38..24d2a1bcf83 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java @@ -26,7 +26,6 @@ import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.exception.BranchMergeException; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.database.core.ConnectionHandler; @@ -297,7 +296,7 @@ public class ConflictManagerInternal { /** * @return Returns True if the destination gamma does not exist on a branch else false if it does. */ - private static boolean isAttributeConflictValidOnBranch(int destinationGammaId, Branch branch, int endTransactionNumber) throws OseeDataStoreException { + private static boolean isAttributeConflictValidOnBranch(int destinationGammaId, Branch branch, int endTransactionNumber) throws OseeCoreException { String sql = "select count(1) from osee_txs txs where txs.gamma_id = ? and txs.branch_id = ? and txs.transaction_id <= ?"; return ConnectionHandler.runPreparedQueryFetchInt(0, sql, destinationGammaId, branch.getId(), diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java index 6ff6ea4a769..1d28cd0d64b 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java @@ -82,7 +82,7 @@ public final class SkynetTransaction extends AbstractOperation { this(BranchManager.getBranch(branch), comment); } - private int getNewAttributeId(Artifact artifact, Attribute attribute) throws OseeDataStoreException { + private int getNewAttributeId(Artifact artifact, Attribute attribute) throws OseeCoreException { IOseeStatement chStmt = ConnectionHandler.getStatement(); AttributeType attributeType = attribute.getAttributeType(); int attrId = -1; @@ -105,7 +105,7 @@ public final class SkynetTransaction extends AbstractOperation { return attrId; } - private int getNewRelationId() throws OseeDataStoreException { + private int getNewRelationId() throws OseeCoreException { return ConnectionHandler.getSequence().getNextRelationId(); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManager.java index 319d87b7ba7..cef3217e87f 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionManager.java @@ -21,7 +21,6 @@ import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.TransactionDetailsType; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.exception.TransactionDoesNotExist; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.TransactionRecord; @@ -85,7 +84,7 @@ public final class TransactionManager { } @SuppressWarnings("unchecked") - public static void setTransactionComment(TransactionRecord transaction, String comment) throws OseeDataStoreException { + public static void setTransactionComment(TransactionRecord transaction, String comment) throws OseeCoreException { ConnectionHandler.runPreparedUpdate(UPDATE_TRANSACTION_COMMENTS, comment, transaction.getId()); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionMonitor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionMonitor.java index 1695d08161b..06c92dd0672 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionMonitor.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/TransactionMonitor.java @@ -13,8 +13,9 @@ package org.eclipse.osee.framework.skynet.core.transaction; import java.util.Map; import java.util.WeakHashMap; import java.util.logging.Level; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.exception.OseeStateException; -import org.eclipse.osee.framework.core.exception.OseeWrappedException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.internal.Activator; @@ -51,13 +52,13 @@ public class TransactionMonitor { txMap.put(key, new TxOperation(transaction)); } - public synchronized void reportTxStart(final Object transaction, Object key) throws OseeWrappedException, OseeStateException { + public synchronized void reportTxStart(final Object transaction, Object key) throws OseeCoreException { TxOperation currentTx = txMap.get(key); if (currentTx == null) { throw new OseeStateException( "reportTxStart called for key: " + key + " but reportTxCreation had not been called."); } else if (currentTx.getState() != TxState.CREATED) { - throw new OseeWrappedException(currentTx.getError()); + OseeExceptions.wrapAndThrow(currentTx.getError()); } if (currentTx.getTransaction().equals(transaction)) { @@ -68,7 +69,7 @@ public class TransactionMonitor { } } - public synchronized void reportTxEnd(final Object transaction, Object key) throws OseeWrappedException, OseeStateException { + public synchronized void reportTxEnd(final Object transaction, Object key) throws OseeCoreException { TxOperation currentTx = txMap.get(key); if (currentTx == null) { throw new OseeStateException( @@ -80,7 +81,7 @@ public class TransactionMonitor { if (currentTx.getTransaction().equals(transaction)) { txMap.put(key, null); } else { - throw new OseeWrappedException(currentTx.getError()); + OseeExceptions.wrapAndThrow(currentTx.getError()); } } diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/DbUtil.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/DbUtil.java index a071357870b..7194f0d37dc 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/DbUtil.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/DbUtil.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.utility; import java.util.Collection; import java.util.Map; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; /** @@ -25,13 +25,13 @@ public final class DbUtil { // Utility Class - class should only have static methods } - public static void getTableRowCounts(Map tableCount, Collection tableNames) throws OseeDataStoreException { + public static void getTableRowCounts(Map tableCount, Collection tableNames) throws OseeCoreException { for (String tableName : tableNames) { tableCount.put(tableName, getTableRowCount(tableName)); } } - public static int getTableRowCount(String tableName) throws OseeDataStoreException { + public static int getTableRowCount(String tableName) throws OseeCoreException { return ConnectionHandler.runPreparedQueryFetchInt(0, "SELECT count(1) FROM " + tableName); } diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java index 7a7a7cbd89c..ec1272150ed 100644 --- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java +++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java @@ -18,7 +18,6 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.framework.access.AccessControlManager; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.IActionable; @@ -98,7 +97,7 @@ public class AdminView extends ViewPart implements IActionable { public void run() { try { DbTableTab.refresh(); - } catch (OseeDataStoreException ex) { + } catch (OseeCoreException ex) { OseeLog.log(AdminView.class, Level.SEVERE, ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbDescribe.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbDescribe.java index c1309d79a1b..a2071220194 100644 --- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbDescribe.java +++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbDescribe.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.admin.dbtabletab; import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; @@ -28,7 +28,7 @@ public class DbDescribe { this.dbColumns = null; } - public int indexOfColumn(String name) throws OseeDataStoreException { + public int indexOfColumn(String name) throws OseeCoreException { int toReturn = -1; List items = getDescription(); for (int index = 0; index < items.size(); index++) { @@ -40,7 +40,7 @@ public class DbDescribe { return toReturn; } - public List getDescription() throws OseeDataStoreException { + public List getDescription() throws OseeCoreException { if (dbColumns == null) { dbColumns = new ArrayList(); IOseeStatement chStmt = ConnectionHandler.getStatement(); @@ -63,7 +63,7 @@ public class DbDescribe { return dbColumns; } - public DbTaskList getDbTaskList(List describeList) throws OseeDataStoreException { + public DbTaskList getDbTaskList(List describeList) throws OseeCoreException { DbTaskList taskList = new DbTaskList(); IOseeStatement chStmt = ConnectionHandler.getStatement(); try { diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableTab.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableTab.java index 47efde06dcf..e09196570ab 100644 --- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableTab.java +++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableTab.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.admin.dbtabletab; import java.util.ArrayList; import java.util.logging.Level; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.ui.admin.AdminPlugin; @@ -75,7 +75,7 @@ public class DbTableTab { public void modifyText(ModifyEvent e) { try { handleTableSelect(); - } catch (OseeDataStoreException ex) { + } catch (OseeCoreException ex) { OseeLog.log(AdminPlugin.class, Level.SEVERE, ex); } AdminView.setSaveNeeded(false); @@ -181,7 +181,7 @@ public class DbTableTab { return null; } - public void handleTableSelect() throws OseeDataStoreException { + public void handleTableSelect() throws OseeCoreException { if (dbTableViewer != null) { dbTableViewer.dispose(); } @@ -195,7 +195,7 @@ public class DbTableTab { parent.layout(); } - public static void refresh() throws OseeDataStoreException { + public static void refresh() throws OseeCoreException { if (filterCombo.get().equals("")) { return; } diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableViewer.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableViewer.java index 2df2f68cc70..404b4f281e1 100644 --- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableViewer.java @@ -22,7 +22,7 @@ import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.ui.admin.AdminView; import org.eclipse.osee.framework.ui.admin.dbtabletab.DbDescribe.Describe; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; @@ -59,7 +59,7 @@ public class DbTableViewer { private DbDescribe dbDescribe; private final DbItem dbItem; - public DbTableViewer(Composite parent, int numColumns, DbTableTab dbTab, DbItem dbItem) throws OseeDataStoreException { + public DbTableViewer(Composite parent, int numColumns, DbTableTab dbTab, DbItem dbItem) throws OseeCoreException { this.dbTab = dbTab; this.dbItem = dbItem; getTableDescription(); @@ -204,7 +204,7 @@ public class DbTableViewer { } - public void getTableDescription() throws OseeDataStoreException { + public void getTableDescription() throws OseeCoreException { dbDescribe = new DbDescribe(dbItem); describeList = dbDescribe.getDescription(); } @@ -212,7 +212,7 @@ public class DbTableViewer { /** * Load table with administration items */ - public void load() throws OseeDataStoreException { + public void load() throws OseeCoreException { dbTaskList = dbDescribe.getDbTaskList(describeList); tableViewer.setInput(dbTaskList); refresh(); diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java index 7a74be126cd..b2b5f9c8f9e 100644 --- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java +++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.ui.admin.dbtabletab; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.logging.OseeLevel; @@ -50,7 +50,7 @@ public class OseeInfoDbItem extends DbItem { String query = "SELECT * FROM " + getTableName() + " WHERE OSEE_KEY = " + returnTic(key); chStmt.runPreparedQuery(query); toReturn = chStmt.next(); - } catch (OseeDataStoreException ex) { + } catch (OseeCoreException ex) { OseeLog.log(AdminPlugin.class, OseeLevel.SEVERE_POPUP, ex); } finally { if (chStmt != null) { @@ -73,7 +73,7 @@ public class OseeInfoDbItem extends DbItem { query = "INSERT INTO " + getTableName() + " (OSEE_KEY, OSEE_VALUE) VALUES (?, ?)"; ConnectionHandler.runPreparedUpdate(query, key, value); } - } catch (OseeDataStoreException ex) { + } catch (OseeCoreException ex) { OseeLog.log(AdminPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/SiteGssflRpcr.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/SiteGssflRpcr.java index 1c9e69cc5cc..39fe43babeb 100644 --- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/SiteGssflRpcr.java +++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/SiteGssflRpcr.java @@ -11,6 +11,7 @@ package org.eclipse.osee.framework.ui.admin.dbtabletab; import java.util.logging.Level; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.logging.OseeLog; @@ -44,7 +45,7 @@ public class SiteGssflRpcr extends DbItem { return 100; } - public boolean exists(String program) { + public boolean exists(String program) throws OseeCoreException { try { return ConnectionHandler.runPreparedQueryFetchInt(0, "SELECT count(1) FROM " + getTableName() + " WHERE PROGRAM = ?", returnTic(program)) > 0; @@ -68,7 +69,7 @@ public class SiteGssflRpcr extends DbItem { query = "INSERT INTO " + getTableName() + " (program,directory,program_id) VALUES (?,?,?)"; ConnectionHandler.runPreparedUpdate(query, program, dir, programId); } - } catch (OseeDataStoreException ex) { + } catch (OseeCoreException ex) { OseeLog.log(AdminPlugin.class, Level.SEVERE, ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageManager.java index 5c7473a771e..b91e8b143b2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageManager.java @@ -24,7 +24,6 @@ import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; @@ -102,7 +101,7 @@ public final class ArtifactImageManager { } } - private synchronized static void ensureArtifactTypeImagesLoaded() throws OseeDataStoreException { + private synchronized static void ensureArtifactTypeImagesLoaded() throws OseeCoreException { if (!artifactTypeImagesLoaded) { artifactTypeImagesLoaded = true; // Load base images from database (which can override the ImageManager.registerImage() calls provided @@ -227,11 +226,11 @@ public final class ArtifactImageManager { providersOverrideImageMap.put(artifactTypeName, imageProvider); } - public synchronized static void registerBaseImage(IArtifactType artifactType, KeyedImage oseeImage, ArtifactImageProvider provider) throws OseeDataStoreException { + public synchronized static void registerBaseImage(IArtifactType artifactType, KeyedImage oseeImage, ArtifactImageProvider provider) throws OseeCoreException { registerBaseImage(artifactType.getName(), oseeImage, provider); } - public synchronized static void registerBaseImage(String artifactTypeName, KeyedImage oseeImage, ArtifactImageProvider provider) throws OseeDataStoreException { + public synchronized static void registerBaseImage(String artifactTypeName, KeyedImage oseeImage, ArtifactImageProvider provider) throws OseeCoreException { ensureArtifactTypeImagesLoaded(); boolean alreadyProvided = artifactTypeImageMap.containsKey(artifactTypeName); @@ -306,7 +305,7 @@ public final class ArtifactImageManager { setArtifactTypeImageInDb(ArtifactTypeManager.getType(artifactType), byteInput); } - public static void setArtifactTypeImageInDb(ArtifactType artifactType, ByteArrayInputStream byteInput) throws OseeDataStoreException { + public static void setArtifactTypeImageInDb(ArtifactType artifactType, ByteArrayInputStream byteInput) throws OseeCoreException { Object imageData = byteInput != null ? byteInput : SQL3DataType.BLOB; ConnectionHandler.runPreparedUpdate(UPDATE_ARTIFACT_TYPE_IMAGE, imageData, artifactType.getId()); loadCache(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java index b80252c1bb9..e6ceff7b82e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.access.AccessControlData; import org.eclipse.osee.framework.access.AccessControlManager; import org.eclipse.osee.framework.access.AccessObject; import org.eclipse.osee.framework.core.enums.PermissionEnum; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; @@ -92,7 +92,7 @@ public class PolicyTableViewer { public void removeData(AccessControlData data) { try { AccessControlManager.removeAccessControlDataIf(true, data); - } catch (OseeDataStoreException ex) { + } catch (OseeCoreException ex) { OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); } accessControlList.remove(data.getSubject().getGuid()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/EditTransactionComment.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/EditTransactionComment.java index 2e2e286ea80..9d0b3f0518f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/EditTransactionComment.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/EditTransactionComment.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.action; import java.util.ArrayList; import org.eclipse.jface.action.Action; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -54,7 +54,7 @@ public class EditTransactionComment extends Action { try { TransactionManager.setTransactionComment(record, ed.getEntry()); record.setComment(ed.getEntry()); - } catch (OseeDataStoreException ex) { + } catch (OseeCoreException ex) { OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ArtifactIdWithoutVersionsCheck.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ArtifactIdWithoutVersionsCheck.java index 35ce71f9ba3..7e282102ac6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ArtifactIdWithoutVersionsCheck.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/ArtifactIdWithoutVersionsCheck.java @@ -16,7 +16,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.jdk.core.util.AHTML; @@ -95,7 +95,7 @@ public class ArtifactIdWithoutVersionsCheck extends DatabaseHealthOperation { checkForCancelledStatus(monitor); } - private Set getInvalidEntries(IProgressMonitor monitor, Set allInvalidArtIds, String query, boolean hasItemId) throws OseeDataStoreException { + private Set getInvalidEntries(IProgressMonitor monitor, Set allInvalidArtIds, String query, boolean hasItemId) throws OseeCoreException { Set toReturn = new HashSet(); IOseeStatement chStmt = ConnectionHandler.getStatement(); try { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AttributeBackingDataCheck.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AttributeBackingDataCheck.java index 936d9eb6a78..4188abeedad 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AttributeBackingDataCheck.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AttributeBackingDataCheck.java @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.SubMonitor; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.core.client.server.HttpUrlBuilderClient; import org.eclipse.osee.framework.core.data.OseeServerContext; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.HttpProcessor; import org.eclipse.osee.framework.core.util.HttpProcessor.AcquireResult; import org.eclipse.osee.framework.database.core.ConnectionHandler; @@ -75,7 +75,7 @@ public class AttributeBackingDataCheck extends DatabaseHealthOperation { subMonitor.worked(10); } - private List getInvalidAttributeData(SubMonitor subMonitor) throws OseeDataStoreException { + private List getInvalidAttributeData(SubMonitor subMonitor) throws OseeCoreException { List data = new ArrayList(); IOseeStatement chStmt = ConnectionHandler.getStatement(); try { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/BranchStateHealthCheck.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/BranchStateHealthCheck.java index 80af9b4c5f4..73b22aab8e2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/BranchStateHealthCheck.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/BranchStateHealthCheck.java @@ -20,8 +20,7 @@ import java.util.Map; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.enums.BranchType; -import org.eclipse.osee.framework.core.exception.OseeArgumentException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.jdk.core.util.AHTML; @@ -168,7 +167,7 @@ public class BranchStateHealthCheck extends DatabaseHealthOperation { } } - private Collection getAllBranchData() throws OseeDataStoreException, OseeArgumentException { + private Collection getAllBranchData() throws OseeCoreException { Map data = new HashMap(); IOseeStatement chStmt = ConnectionHandler.getStatement(); try { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/CleanUpBackingData.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/CleanUpBackingData.java index 81f90395adf..35b81ca31d7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/CleanUpBackingData.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/CleanUpBackingData.java @@ -15,7 +15,7 @@ import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.nebula.widgets.xviewer.XViewerColumn.SortDataType; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.ui.skynet.results.table.ResultsEditorTableTab; @@ -40,7 +40,7 @@ public class CleanUpBackingData extends DatabaseHealthOperation { super("Data with no TXS Addressing and empty transactions"); } - private void processNotAddressedGammas(String tableName) throws OseeDataStoreException { + private void processNotAddressedGammas(String tableName) throws OseeCoreException { checkForCancelledStatus(monitor); List notAddressedGammas = new LinkedList(); @@ -70,7 +70,7 @@ public class CleanUpBackingData extends DatabaseHealthOperation { monitor.worked(calculateWork(0.10)); } - private void processEmptyTransactions() throws OseeDataStoreException { + private void processEmptyTransactions() throws OseeCoreException { checkForCancelledStatus(monitor); List emptyTransactions = new LinkedList(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateAttributes.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateAttributes.java index bd6a4b8869f..db63a0d05cb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateAttributes.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateAttributes.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.dbHealth; import java.util.LinkedList; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.jdk.core.util.AHTML; @@ -40,7 +40,7 @@ public class DuplicateAttributes extends DatabaseHealthOperation { super("Duplicate Attribute Errors"); } - private DuplicateAttributeData createAttributeData(IOseeStatement chStmt) throws OseeDataStoreException { + private DuplicateAttributeData createAttributeData(IOseeStatement chStmt) throws OseeCoreException { AttributeData attributeData1 = new AttributeData(chStmt.getInt("attr_id_1"), chStmt.getInt("gamma_id_1"), chStmt.getString("value_1"), chStmt.getString("uri_1")); @@ -51,7 +51,7 @@ public class DuplicateAttributes extends DatabaseHealthOperation { attributeData2); } - private boolean isAttributeIdSetToCurrent(int attrId) throws OseeDataStoreException { + private boolean isAttributeIdSetToCurrent(int attrId) throws OseeCoreException { return ConnectionHandler.runPreparedQueryFetchInt(-1, FILTER_DELTED, attrId) != -1; } @@ -134,7 +134,7 @@ public class DuplicateAttributes extends DatabaseHealthOperation { } - private int showAttributeCleanUpDecisions(List values, boolean canFixAutomatically, StringBuffer builder) throws OseeDataStoreException { + private int showAttributeCleanUpDecisions(List values, boolean canFixAutomatically, StringBuffer builder) throws OseeCoreException { int count = 0; for (DuplicateAttributeData duplicate : values) { String fixMessage; @@ -186,7 +186,7 @@ public class DuplicateAttributes extends DatabaseHealthOperation { } //--- Find out if there is an attribute that is on every branch that has either one of the attributes ---// - private void loadBranchesWhereOnlyOneIsUsed(AttributeData attributeData, int otherAttrId) throws OseeDataStoreException { + private void loadBranchesWhereOnlyOneIsUsed(AttributeData attributeData, int otherAttrId) throws OseeCoreException { IOseeStatement chStmt = ConnectionHandler.getStatement(); try { chStmt.runPreparedQuery(String.format(BRANCHES_WITH_ONLY_ATTR, chStmt.getComplementSql()), diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateHRID.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateHRID.java index 0a9b780317b..bfc4307e1b2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateHRID.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DuplicateHRID.java @@ -18,7 +18,6 @@ import java.util.List; import java.util.Map; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.jdk.core.util.AHTML; @@ -139,7 +138,7 @@ public class DuplicateHRID extends DatabaseHealthOperation { } } - private List getDuplicateHRIDArtifacts(IProgressMonitor monitor) throws OseeDataStoreException { + private List getDuplicateHRIDArtifacts(IProgressMonitor monitor) throws OseeCoreException { List duplicateItems = new LinkedList(); IOseeStatement chStmt1 = ConnectionHandler.getStatement(); try { @@ -159,7 +158,7 @@ public class DuplicateHRID extends DatabaseHealthOperation { return duplicateItems; } - private String getAdditionalCounts(String query, String hrid) throws OseeDataStoreException { + private String getAdditionalCounts(String query, String hrid) throws OseeCoreException { return String.valueOf(ConnectionHandler.runPreparedQueryFetchInt(-1, query, new Object[] {"%" + hrid + "%"})); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/MultipleParentRelations.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/MultipleParentRelations.java index 1bc0a333bb7..f40618abc4a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/MultipleParentRelations.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/MultipleParentRelations.java @@ -17,7 +17,6 @@ import java.util.List; import java.util.Map; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.jdk.core.util.AHTML; @@ -215,7 +214,7 @@ public class MultipleParentRelations extends DatabaseHealthOperation { //public LocalRelationLink(int branchId, int childArtId, int gammaId1, int gammaId2, int parentArtId1, int parentArtId2, //int relLinkId1, int relLinkId2, Timestamp time1, Timestamp time2, int transactionId1, int transactionId2) { - private void loadData() throws OseeDataStoreException { + private void loadData() throws OseeCoreException { IOseeStatement chStmt = ConnectionHandler.getStatement(); try { chStmt.runPreparedQuery(GET_DUPLICATE_DEFAULT_HIER_LINKS); @@ -231,7 +230,7 @@ public class MultipleParentRelations extends DatabaseHealthOperation { } } - private void setAuthors(LocalRelationLink link) throws OseeDataStoreException { + private void setAuthors(LocalRelationLink link) throws OseeCoreException { IOseeStatement chStmt = ConnectionHandler.getStatement(); try { chStmt.runPreparedQuery(GET_AUTHOR, link.transactionId1); @@ -251,7 +250,7 @@ public class MultipleParentRelations extends DatabaseHealthOperation { } } - private void setData(LocalRelationLink link) throws OseeDataStoreException { + private void setData(LocalRelationLink link) throws OseeCoreException { IOseeStatement chStmt = ConnectionHandler.getStatement(); try { chStmt.runPreparedQuery(GET_ARTIFACT_NAME, link.parentArtId1); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationIntegrityCheck.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationIntegrityCheck.java index cba6709b49a..1c178b165e0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationIntegrityCheck.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RelationIntegrityCheck.java @@ -18,7 +18,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.jdk.core.type.DoubleKeyHashMap; @@ -157,7 +156,7 @@ public class RelationIntegrityCheck extends DatabaseHealthOperation { checkForCancelledStatus(monitor); } - private void deleteInvalidRelationAddressing() throws OseeDataStoreException { + private void deleteInvalidRelationAddressing() throws OseeCoreException { List rowsToDelete = new LinkedList(); for (LocalRelationLink relLink : deleteMap.allValues()) { rowsToDelete.add(new Object[] {relLink.gammaId, relLink.relTransId}); @@ -199,7 +198,7 @@ public class RelationIntegrityCheck extends DatabaseHealthOperation { updateMap = null; } - private void runInsert(List insertParameters, String sql, String taskName) throws OseeDataStoreException { + private void runInsert(List insertParameters, String sql, String taskName) throws OseeCoreException { monitor.subTask(taskName); if (insertParameters.size() != 0) { ConnectionHandler.runBatchUpdate(sql, insertParameters); @@ -238,7 +237,7 @@ public class RelationIntegrityCheck extends DatabaseHealthOperation { builder.append(DESCRIPTION[x]); } - private void loadData(String description, String sql, boolean forDelete) throws OseeDataStoreException { + private void loadData(String description, String sql, boolean forDelete) throws OseeCoreException { monitor.subTask(description); IOseeStatement chStmt = ConnectionHandler.getStatement(); DoubleKeyHashMap map = forDelete ? deleteMap : updateMap; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java index 84ac8d3664c..d23eef1c758 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/RepeatEnumerationAttributeValues.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.enums.TxChange; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.AttributeType; @@ -121,7 +121,7 @@ public class RepeatEnumerationAttributeValues extends DatabaseHealthOperation { return "Deletes the repeat attribute values using a transaction directly on the branch"; } - private Set getRepeatEnumeratedAttrs(IProgressMonitor monitor, Branch branch) throws OseeDataStoreException { + private Set getRepeatEnumeratedAttrs(IProgressMonitor monitor, Branch branch) throws OseeCoreException { Set attrData = new HashSet(); IOseeStatement chStmt = ConnectionHandler.getStatement(); try { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RenderingUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RenderingUtil.java index 576e88d1916..8e0fcbaa7b4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RenderingUtil.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RenderingUtil.java @@ -123,7 +123,7 @@ public final class RenderingUtil { return renderFolder; } catch (CoreException ex) { OseeExceptions.wrapAndThrow(ex); - return null; // this line can never execute since the previous line always throws an exception + return null; // unreachable since wrapAndThrow() always throws an exception } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetViews.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetViews.java index 03912026197..ef8eb8b25ae 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetViews.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetViews.java @@ -11,6 +11,7 @@ package org.eclipse.osee.framework.ui.skynet.util; import java.util.logging.Level; +import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.core.OseeInfo; import org.eclipse.osee.framework.jdk.core.util.Strings; @@ -30,7 +31,7 @@ public class SkynetViews { private static final String MEMENTO_SOURCE_GUID = "sourceDbGuid"; - public static boolean isSourceValid(IMemento memento) { + public static boolean isSourceValid(IMemento memento) throws OseeCoreException { boolean result = false; if (memento != null) { String dbId = memento.getString(MEMENTO_SOURCE_GUID); @@ -53,7 +54,7 @@ public class SkynetViews { if (memento != null) { try { memento.putString(MEMENTO_SOURCE_GUID, OseeInfo.getDatabaseGuid()); - } catch (OseeDataStoreException ex) { + } catch (OseeCoreException ex) { OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, "Unable to set memento source db guid"); } } -- cgit v1.2.3