From 58aee3b10ceeadbe21c1ba539d0b7e5bbbde776a Mon Sep 17 00:00:00 2001
From: Roberto E. Escobar
Date: Wed, 26 Nov 2014 16:43:10 -0700
Subject: feature[ats_ATS139503]: Use JdbcService in ORCS
Change-Id: I4d98347f558b4911522024ef7949353c75c2d1b5
---
.../META-INF/MANIFEST.MF | 2 +-
.../OSGI-INF/activity.schema.resource.xml | 6 +-
.../server/internal/ActivitySchemaResource.java | 7 +-
.../rest/importer/DispoItemDataCopierTest.java | 2 +-
.../integration/DispositionIntegrationTest.java | 2 +-
.../util/DispositionIntegrationRule.java | 5 +-
.../META-INF/MANIFEST.MF | 1 -
.../integration/JdbcJaxRsOAuthStorageTest.java | 2 +-
.../admin/integration/OrcsAccountStorageTest.java | 2 +-
.../admin/integration/OrcsIntegrationRule.java | 9 +-
.../integration/OrcsSubscriptionStorageTest.java | 2 +-
.../META-INF/MANIFEST.MF | 4 +-
.../OSGI-INF/jaxrs.jdbc.oauth.schema.resource.xml | 2 +-
.../OSGI-INF/jaxrs.jdbc.oauth.storage.xml | 4 +-
.../orcs.account.access.schema.resource.xml | 2 +-
.../OSGI-INF/orcs.account.ds.xml | 2 +-
.../internal/AccountSessionDatabaseStore.java | 18 +-
.../internal/AccountSessionSchemaResource.java | 8 +-
.../account/admin/internal/OrcsAccountStorage.java | 12 +-
.../internal/oauth/AbstractDatabaseStorage.java | 28 +--
.../admin/internal/oauth/AuthCodeGrantStorage.java | 10 +-
.../internal/oauth/ClientCredentialStorage.java | 10 +-
.../internal/oauth/JdbcJaxRsOAuthStorage.java | 16 +-
.../admin/internal/oauth/OAuthSchemaResource.java | 15 +-
.../account/admin/internal/oauth/TokenStorage.java | 14 +-
.../META-INF/MANIFEST.MF | 8 +-
.../eclipse/osee/orcs/db/mock/OseeDatabase.java | 11 +-
.../osee/orcs/db/mock/internal/OsgiUtil.java | 85 +++++++--
.../osee/orcs/db/mock/internal/TestDatabase.java | 98 +++++-----
.../osee/orcs/db/mock/internal/TestDbProvider.java | 42 -----
.../META-INF/MANIFEST.MF | 2 -
.../OrcsDbTestSuite.launch | 7 +-
plugins/org.eclipse.osee.orcs.db.test/pom.xml | 5 -
.../osee/orcs/db/intergration/IntegrationUtil.java | 4 +-
.../osee/orcs/db/intergration/LoaderTest.java | 5 +-
.../db/intergration/OseeInfoDataAccessorTest.java | 52 +++---
.../db/internal/loader/DataFactoryImplTest.java | 1 +
.../internal/loader/DataLoaderFactoryImplTest.java | 14 +-
.../db/internal/proxy/VarCharDataProxyTest.java | 16 +-
.../orcs/db/internal/search/QueryTestSuite.java | 2 +-
.../IndexingTaskDatabaseTxCallableTest.java | 153 ---------------
.../IndexingTaskDatabaseTxCallableTest.java | 102 ++++++++++
.../db/internal/sql/join/MockJoinAccessor.java | 12 +-
.../sql/join/TransactionJoinQueryTest.java | 2 +-
.../transaction/TransactionWriterTest.java | 20 +-
.../org.eclipse.osee.orcs.db/META-INF/MANIFEST.MF | 5 +-
.../OSGI-INF/attribute.provider.xml | 2 +-
.../consolidate.artifacts.console.command.xml | 2 +-
.../consolidate.relations.console.command.xml | 2 +-
.../OSGI-INF/convert.type.ids.xml | 4 +-
.../OSGI-INF/data.proxy.factory.provider.xml | 2 +-
.../OSGI-INF/exchange.provider.xml | 2 +-
.../fix.duplicate.attributes.console.command.xml | 2 +-
.../OSGI-INF/locator.provider.attribute.xml | 3 +-
.../OSGI-INF/locator.provider.exchange.xml | 3 +-
.../OSGI-INF/orcs.data.store.impl.xml | 4 +-
.../OSGI-INF/orcs.sql.join.factory.xml | 2 +-
.../OSGI-INF/osee.datastore.schema.resource.xml | 4 +-
.../OSGI-INF/resource.data.proxy.factory.xml | 6 +-
.../OSGI-INF/system.preferences.data.accessor.xml | 4 +-
.../OSGI-INF/tx.currents.console.command.xml | 5 +-
.../OSGI-INF/tx.prune.console.command.xml | 5 +-
.../eclipse/osee/orcs/db/internal/AdminModule.java | 24 +--
.../osee/orcs/db/internal/IdentityManager.java | 23 ++-
.../osee/orcs/db/internal/OrcsDataStoreImpl.java | 25 +--
.../accessor/DatabaseConflictAccessor.java | 22 +--
.../db/internal/accessor/OseeInfoDataAccessor.java | 39 ++--
.../internal/accessor/UpdatePreviousTxCurrent.java | 31 ++--
.../osee/orcs/db/internal/branch/BranchModule.java | 43 +++--
.../callable/AbstractDatastoreCallable.java | 12 +-
.../callable/AbstractDatastoreTxCallable.java | 36 ++--
.../callable/ArchiveUnarchiveBranchCallable.java | 18 +-
.../db/internal/callable/BranchCopyTxCallable.java | 37 ++--
.../callable/ChangeBranchStateCallable.java | 12 +-
.../callable/ChangeBranchTypeCallable.java | 12 +-
.../CheckBranchExchangeIntegrityCallable.java | 6 +-
.../callable/CommitBranchDatabaseCallable.java | 15 +-
.../callable/CommitBranchDatabaseTxCallable.java | 36 ++--
.../internal/callable/CompareDatabaseCallable.java | 17 +-
.../callable/CompositeDatastoreTxCallable.java | 10 +-
...nsolidateArtifactVersionDatabaseTxCallable.java | 48 +++--
.../ConsolidateRelationsDatabaseTxCallable.java | 34 ++--
.../callable/CreateBranchDatabaseTxCallable.java | 61 +++---
.../callable/DeleteRelationDatabaseCallable.java | 28 +--
.../callable/FetchDatastoreInfoCallable.java | 24 +--
.../callable/ImportBranchDatabaseCallable.java | 66 +++----
.../callable/InitializeDatastoreCallable.java | 26 ++-
.../InvalidTxCurrentsAndModTypesCallable.java | 205 +++++++++++++++++++++
.../internal/callable/OrcsTypeLoaderCallable.java | 12 +-
.../PurgeArtifactTypeDatabaseTxCallable.java | 10 +-
.../PurgeAttributeTypeDatabaseTxCallable.java | 40 ++--
.../callable/PurgeBranchDatabaseCallable.java | 23 ++-
.../PurgeRelationTypeDatabaseTxCallable.java | 32 ++--
.../callable/PurgeTransactionTxCallable.java | 40 ++--
.../PurgeUnusedBackingDataAndTransactions.java | 118 ++++++++++++
.../internal/change/ArtifactChangeItemFactory.java | 4 +-
.../change/AttributeChangeItemFactory.java | 4 +-
.../orcs/db/internal/change/ChangeItemLoader.java | 18 +-
.../internal/change/LoadDeltasBetweenBranches.java | 29 +--
.../LoadDeltasBetweenTxsOnTheSameBranch.java | 23 +--
.../internal/change/RelationChangeItemFactory.java | 4 +-
.../orcs/db/internal/conflict/ConflictUtil.java | 2 +-
.../console/AbstractDatastoreConsoleCommand.java | 13 +-
.../ConsolidateArtifactVersionsCommand.java | 4 +-
.../console/ConsolidateRelationsCommand.java | 2 +-
.../console/ConvertLocalTypeIdCommand.java | 30 +--
.../console/FixDuplicateAttributesCommand.java | 26 +--
.../db/internal/console/TxCurrentsCommand.java | 24 +--
.../orcs/db/internal/console/TxPruneCommand.java | 24 +--
.../osee/orcs/db/internal/exchange/ExchangeDb.java | 18 +-
.../db/internal/exchange/ExportItemFactory.java | 26 +--
.../db/internal/exchange/ForeignKeyReader.java | 6 +-
.../orcs/db/internal/exchange/IdTranslator.java | 24 +--
.../db/internal/exchange/PrimaryKeyCollector.java | 4 +-
.../exchange/ReferentialIntegrityConstraint.java | 8 +-
.../db/internal/exchange/SavePointManager.java | 28 +--
.../db/internal/exchange/TranslationManager.java | 24 +--
.../db/internal/exchange/TxCurrentsOpFactory.java | 35 ++--
.../exchange/export/DbTableExportItem.java | 22 +--
.../exchange/export/MetadataExportItem.java | 6 +-
.../exchange/handler/BaseDbSaxHandler.java | 14 +-
.../exchange/handler/BranchDataSaxHandler.java | 24 +--
.../exchange/handler/DbTableSaxHandler.java | 10 +-
.../db/internal/exchange/handler/MetaData.java | 2 +-
.../exchange/handler/MetaDataSaxHandler.java | 16 +-
.../exchange/transform/ExchangeTransformer.java | 21 ++-
.../transform/IOseeExchangeVersionTransformer.java | 9 +-
.../exchange/transform/V0_9_2Transformer.java | 20 +-
.../transform/V0_9_2TxsConsolidateParser.java | 2 +-
.../exchange/transform/V0_9_4Transformer.java | 9 +-
.../db/internal/loader/DataLoaderFactoryImpl.java | 14 +-
.../osee/orcs/db/internal/loader/LoadUtil.java | 6 +-
.../osee/orcs/db/internal/loader/LoaderModule.java | 12 +-
.../orcs/db/internal/loader/SqlObjectLoader.java | 16 +-
.../db/internal/loader/data/OrcsObjectImpl.java | 2 +
.../loader/executors/AbstractLoadExecutor.java | 12 +-
.../ArtifactQueryContextLoadExecutor.java | 16 +-
.../db/internal/loader/executors/LoadExecutor.java | 6 +-
.../loader/executors/QueryContextLoadExecutor.java | 6 +-
.../loader/executors/UuidsLoadExecutor.java | 16 +-
.../loader/processor/AbstractLoadProcessor.java | 6 +-
.../loader/processor/ArtifactLoadProcessor.java | 4 +-
.../loader/processor/AttributeLoadProcessor.java | 4 +-
.../loader/processor/BranchLoadProcessor.java | 4 +-
.../loader/processor/DynamicLoadProcessor.java | 12 +-
.../internal/loader/processor/LoadProcessor.java | 6 +-
.../loader/processor/RelationLoadProcessor.java | 4 +-
.../loader/processor/TransactionLoadProcessor.java | 4 +-
.../orcs/db/internal/proxy/VarCharDataProxy.java | 4 +-
.../resource/OseeDatastoreSchemaResource.java | 7 +-
.../osee/orcs/db/internal/search/Engines.java | 10 +-
.../osee/orcs/db/internal/search/QueryModule.java | 10 +-
.../search/indexer/IndexerCallableFactoryImpl.java | 10 +-
.../search/indexer/QueryEngineIndexerImpl.java | 22 +--
.../callable/DeleteTagSetDatabaseTxCallable.java | 16 +-
.../IndexerDatabaseStatisticsCallable.java | 11 +-
.../callable/PurgeAllTagsDatabaseCallable.java | 12 +-
.../consumer/IndexingTaskDatabaseTxCallable.java | 24 +--
.../AbstractIndexerTxDatabaseCallable.java | 16 +-
.../callable/producer/IndexAllInQueueCallable.java | 4 +-
.../producer/IndexBranchesDatabaseCallable.java | 10 +-
.../callable/producer/IndexerDatabaseCallable.java | 10 +-
.../producer/XmlStreamIndexerDatabaseCallable.java | 10 +-
.../data/GammaQueueIndexerDataSourceLoader.java | 12 +-
.../db/internal/search/util/SecondPassScanner.java | 2 +
.../orcs/db/internal/sql/RelationalConstants.java | 1 -
.../db/internal/sql/join/AbstractJoinQuery.java | 8 +-
.../db/internal/sql/join/ArtifactJoinQuery.java | 2 +-
.../db/internal/sql/join/DatabaseJoinAccessor.java | 29 ++-
.../orcs/db/internal/sql/join/IJoinAccessor.java | 8 +-
.../db/internal/sql/join/JoinCleanerCallable.java | 60 +++---
.../orcs/db/internal/sql/join/SqlJoinFactory.java | 32 ++--
.../db/internal/sql/join/TransactionJoinQuery.java | 2 +-
.../CommitTransactionDatabaseTxCallable.java | 23 ++-
.../db/internal/transaction/TransactionWriter.java | 22 +--
.../orcs/db/internal/transaction/TxModule.java | 15 +-
.../osee/orcs/db/internal/types/TypesModule.java | 16 +-
.../osee/orcs/db/internal/util/Address.java | 139 ++++++++++++++
.../util/DynamicSchemaResourceProvider.java | 19 +-
.../orcs/db/internal/util/IdentityManagerImpl.java | 32 ++--
.../META-INF/MANIFEST.MF | 2 +-
plugins/org.eclipse.osee.orcs.test/pom.xml | 42 +----
.../org/eclipse/osee/orcs/OrcsIntegrationRule.java | 7 +-
.../osee/orcs/api/OrcsAttributeLoadingTest.java | 2 +-
.../osee/orcs/api/OrcsAttributeSearchTest.java | 2 +-
.../eclipse/osee/orcs/api/OrcsBranchQueryTest.java | 2 +-
.../org/eclipse/osee/orcs/api/OrcsBranchTest.java | 2 +-
.../org/eclipse/osee/orcs/api/OrcsPortingTest.java | 6 +-
.../org/eclipse/osee/orcs/api/OrcsQueryTest.java | 2 +-
.../osee/orcs/api/OrcsRelationLoadingTest.java | 2 +-
.../org/eclipse/osee/orcs/api/OrcsScriptTest.java | 2 +-
.../eclipse/osee/orcs/api/OrcsTransactionTest.java | 2 +-
.../org/eclipse/osee/orcs/api/OrcsTxQueryTest.java | 2 +-
plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip | Bin 119154 -> 118599 bytes
194 files changed, 1896 insertions(+), 1530 deletions(-)
delete mode 100644 plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDbProvider.java
delete mode 100644 plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/indexer/IndexingTaskDatabaseTxCallableTest.java
create mode 100644 plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/consumer/IndexingTaskDatabaseTxCallableTest.java
create mode 100644 plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/InvalidTxCurrentsAndModTypesCallable.java
create mode 100644 plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/callable/PurgeUnusedBackingDataAndTransactions.java
create mode 100644 plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/util/Address.java
diff --git a/plugins/org.eclipse.osee.activity.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.activity.server/META-INF/MANIFEST.MF
index fd5e1fd9707..179c53ea314 100644
--- a/plugins/org.eclipse.osee.activity.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.activity.server/META-INF/MANIFEST.MF
@@ -11,9 +11,9 @@ Import-Package: javax.annotation;version="1.2.0",
javax.ws.rs.core;version="2.0.0",
javax.ws.rs.ext;version="2.0.0",
org.eclipse.osee.activity.api,
- org.eclipse.osee.database.schema,
org.eclipse.osee.framework.core.exception,
org.eclipse.osee.framework.jdk.core.type,
org.eclipse.osee.framework.jdk.core.util,
+ org.eclipse.osee.jdbc,
org.eclipse.osee.logger
Bundle-Vendor: Eclipse Open System Engineering Environment
diff --git a/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.schema.resource.xml b/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.schema.resource.xml
index ad1a83eb8a3..942be09a9a5 100644
--- a/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.schema.resource.xml
+++ b/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.schema.resource.xml
@@ -1,7 +1,7 @@
-
-
-
+
+
+
diff --git a/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/ActivitySchemaResource.java b/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/ActivitySchemaResource.java
index 3f5b476c7c7..d4d76a4a199 100644
--- a/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/ActivitySchemaResource.java
+++ b/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/ActivitySchemaResource.java
@@ -15,14 +15,15 @@ import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
-import org.eclipse.osee.database.schema.SchemaResource;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.eclipse.osee.jdbc.JdbcClientConfig;
+import org.eclipse.osee.jdbc.JdbcSchemaResource;
/**
* @author Ryan D. Brooks
*/
-public class ActivitySchemaResource implements SchemaResource {
+public class ActivitySchemaResource implements JdbcSchemaResource {
private static final String SCHEMA_PATH = "schema/ACTIVITY.DS.SCHEMA.xml";
@@ -39,7 +40,7 @@ public class ActivitySchemaResource implements SchemaResource {
}
@Override
- public boolean isApplicable() {
+ public boolean isApplicable(JdbcClientConfig config) {
return true;
}
diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/importer/DispoItemDataCopierTest.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/importer/DispoItemDataCopierTest.java
index 08c17558f76..b66d166e9bb 100644
--- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/importer/DispoItemDataCopierTest.java
+++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/importer/DispoItemDataCopierTest.java
@@ -50,7 +50,7 @@ public class DispoItemDataCopierTest {
public DispoConnector dispoConnector;
@Rule
- public TestRule rule = DispositionIntegrationRule.integrationRule(this, "osee.demo.hsql");
+ public TestRule rule = DispositionIntegrationRule.integrationRule(this);
@Test
public void testCopyItemData() throws Exception {
diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/DispositionIntegrationTest.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/DispositionIntegrationTest.java
index 130456e04b6..594dc815198 100644
--- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/DispositionIntegrationTest.java
+++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/DispositionIntegrationTest.java
@@ -44,7 +44,7 @@ public class DispositionIntegrationTest {
public TemporaryFolder folder = new TemporaryFolder();
@Rule
- public TestRule rule = DispositionIntegrationRule.integrationRule(this, "osee.demo.hsql");
+ public TestRule rule = DispositionIntegrationRule.integrationRule(this);
@OsgiService
public OrcsApi orcsApi;
diff --git a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionIntegrationRule.java b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionIntegrationRule.java
index 66bb9984269..a82f8fb0414 100644
--- a/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionIntegrationRule.java
+++ b/plugins/org.eclipse.osee.disposition.rest.test/src/org/eclipse/osee/disposition/rest/integration/util/DispositionIntegrationRule.java
@@ -30,8 +30,9 @@ public final class DispositionIntegrationRule extends OsgiRule {
// Utility
}
- public static TestRule integrationRule(Object testObject, String dbId) {
- return RuleChain.outerRule(new OseeDatabase(dbId)).around(new OsgiRule(new CheckServices(), testObject));
+ public static TestRule integrationRule(Object testObject) {
+ return RuleChain.outerRule(new OseeDatabase("orcs.jdbc.service")).around(
+ new OsgiRule(new CheckServices(), testObject));
}
public static class CheckServices {
diff --git a/plugins/org.eclipse.osee.orcs.account.admin.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.account.admin.test/META-INF/MANIFEST.MF
index 3599b21ecdc..685bc22edff 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.account.admin.test/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Require-Bundle: org.junit,
org.eclipse.osee.event.osgi,
org.eclipse.osee.logger,
org.eclipse.osee.framework.core,
- org.eclipse.osee.framework.database,
org.eclipse.osee.framework.core.model,
org.eclipse.osee.framework.resource.management
Import-Package: org.eclipse.osee.orcs.db.mock,
diff --git a/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/JdbcJaxRsOAuthStorageTest.java b/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/JdbcJaxRsOAuthStorageTest.java
index db6e802f99f..0bcf2940788 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/JdbcJaxRsOAuthStorageTest.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/JdbcJaxRsOAuthStorageTest.java
@@ -84,7 +84,7 @@ public class JdbcJaxRsOAuthStorageTest {
public static final List REGISTERED_SCOPES = Arrays.asList("scope-1", "scope-2", "scope-3");
@Rule
- public TestRule osgi = OrcsIntegrationRule.integrationRule(this, "osee.demo.hsql");
+ public TestRule osgi = OrcsIntegrationRule.integrationRule(this);
@Rule
public ExpectedException thrown = ExpectedException.none();
diff --git a/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsAccountStorageTest.java b/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsAccountStorageTest.java
index 3fe21642779..e1f3f1aa3d4 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsAccountStorageTest.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsAccountStorageTest.java
@@ -45,7 +45,7 @@ import org.mockito.Mock;
public class OrcsAccountStorageTest {
@Rule
- public TestRule osgi = OrcsIntegrationRule.integrationRule(this, "osee.demo.hsql");
+ public TestRule osgi = OrcsIntegrationRule.integrationRule(this);
@Rule
public ExpectedException thrown = ExpectedException.none();
diff --git a/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsIntegrationRule.java b/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsIntegrationRule.java
index 707c2ad00ec..2a1bc5658fd 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsIntegrationRule.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsIntegrationRule.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.account.admin.integration;
import org.eclipse.osee.account.admin.AccountAdmin;
import org.eclipse.osee.event.EventService;
import org.eclipse.osee.executor.admin.ExecutorAdmin;
-import org.eclipse.osee.framework.database.IOseeDatabaseService;
+import org.eclipse.osee.jdbc.JdbcService;
import org.eclipse.osee.logger.Log;
import org.eclipse.osee.orcs.OrcsApi;
import org.eclipse.osee.orcs.db.mock.OseeDatabase;
@@ -32,8 +32,9 @@ public final class OrcsIntegrationRule extends OsgiRule {
// Utility
}
- public static TestRule integrationRule(Object testObject, String dbId) {
- return RuleChain.outerRule(new OseeDatabase(dbId)).around(new OsgiRule(new CheckServices(), testObject));
+ public static TestRule integrationRule(Object testObject) {
+ return RuleChain.outerRule(new OseeDatabase("orcs.jdbc.service", "account.jdbc.service", "oauth.jdbc.service")).around(
+ new OsgiRule(new CheckServices(), testObject));
}
public static class CheckServices {
@@ -42,7 +43,7 @@ public final class OrcsIntegrationRule extends OsgiRule {
@OsgiService public EventAdmin eventAdmin;
@OsgiService public EventService eventService;
@OsgiService public ExecutorAdmin executorAdmin;
- @OsgiService public IOseeDatabaseService dbService;
+ @OsgiService public JdbcService dbService;
@OsgiService public OrcsApi orcsApi;
@OsgiService public AccountAdmin accountAdmin;
// @formatter:on
diff --git a/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsSubscriptionStorageTest.java b/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsSubscriptionStorageTest.java
index 3b3306aff0c..7a22fd85716 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsSubscriptionStorageTest.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin.test/src/org/eclipse/osee/orcs/account/admin/integration/OrcsSubscriptionStorageTest.java
@@ -45,7 +45,7 @@ public class OrcsSubscriptionStorageTest {
private static final String SUBSCRIPTION_GROUP = "Subscription-Group1";
@Rule
- public TestRule osgi = OrcsIntegrationRule.integrationRule(this, "osee.demo.hsql");
+ public TestRule osgi = OrcsIntegrationRule.integrationRule(this);
@Rule
public ExpectedException thrown = ExpectedException.none();
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.account.admin/META-INF/MANIFEST.MF
index 1b77f232b44..e6b78651985 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.account.admin/META-INF/MANIFEST.MF
@@ -11,17 +11,15 @@ Import-Package: com.google.common.io;version="[11.0.0,15.0.0)",
com.google.gson.reflect,
org.eclipse.osee.account.admin,
org.eclipse.osee.account.admin.ds,
- org.eclipse.osee.database.schema,
org.eclipse.osee.executor.admin,
org.eclipse.osee.framework.core.data,
org.eclipse.osee.framework.core.enums,
org.eclipse.osee.framework.core.exception,
org.eclipse.osee.framework.core.model,
- org.eclipse.osee.framework.database,
- org.eclipse.osee.framework.database.core,
org.eclipse.osee.framework.jdk.core.type,
org.eclipse.osee.framework.jdk.core.util,
org.eclipse.osee.jaxrs.server.security,
+ org.eclipse.osee.jdbc,
org.eclipse.osee.logger,
org.eclipse.osee.orcs,
org.eclipse.osee.orcs.data,
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/OSGI-INF/jaxrs.jdbc.oauth.schema.resource.xml b/plugins/org.eclipse.osee.orcs.account.admin/OSGI-INF/jaxrs.jdbc.oauth.schema.resource.xml
index 61aa8b703a4..a37e9634659 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/OSGI-INF/jaxrs.jdbc.oauth.schema.resource.xml
+++ b/plugins/org.eclipse.osee.orcs.account.admin/OSGI-INF/jaxrs.jdbc.oauth.schema.resource.xml
@@ -3,6 +3,6 @@
-
+
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/OSGI-INF/jaxrs.jdbc.oauth.storage.xml b/plugins/org.eclipse.osee.orcs.account.admin/OSGI-INF/jaxrs.jdbc.oauth.storage.xml
index ac5dc9ed2a5..f896bba2aec 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/OSGI-INF/jaxrs.jdbc.oauth.storage.xml
+++ b/plugins/org.eclipse.osee.orcs.account.admin/OSGI-INF/jaxrs.jdbc.oauth.storage.xml
@@ -5,6 +5,6 @@
-
-
+
+
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/OSGI-INF/orcs.account.access.schema.resource.xml b/plugins/org.eclipse.osee.orcs.account.admin/OSGI-INF/orcs.account.access.schema.resource.xml
index 23dfadb766d..e3854ca6dbb 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/OSGI-INF/orcs.account.access.schema.resource.xml
+++ b/plugins/org.eclipse.osee.orcs.account.admin/OSGI-INF/orcs.account.access.schema.resource.xml
@@ -3,6 +3,6 @@
-
+
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/OSGI-INF/orcs.account.ds.xml b/plugins/org.eclipse.osee.orcs.account.admin/OSGI-INF/orcs.account.ds.xml
index d4eee76aee9..67900bf7d27 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/OSGI-INF/orcs.account.ds.xml
+++ b/plugins/org.eclipse.osee.orcs.account.admin/OSGI-INF/orcs.account.ds.xml
@@ -6,6 +6,6 @@
-
+
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSessionDatabaseStore.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSessionDatabaseStore.java
index 479c8ab9f40..d9161bb042a 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSessionDatabaseStore.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSessionDatabaseStore.java
@@ -17,11 +17,11 @@ import java.util.List;
import java.util.concurrent.Callable;
import org.eclipse.osee.account.admin.AccountSession;
import org.eclipse.osee.executor.admin.CancellableCallable;
-import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.type.ResultSet;
import org.eclipse.osee.framework.jdk.core.type.ResultSets;
import org.eclipse.osee.framework.jdk.core.util.Lib;
+import org.eclipse.osee.jdbc.JdbcClient;
+import org.eclipse.osee.jdbc.JdbcStatement;
import org.eclipse.osee.logger.Log;
/**
@@ -42,12 +42,12 @@ public class AccountSessionDatabaseStore implements AccountSessionStorage {
private static final String DELETE_BY_SESSION_TOKEN = "DELETE FROM osee_account_session WHERE session_token = ?";
private final Log logger;
- private final IOseeDatabaseService dbService;
+ private final JdbcClient jdbcClient;
private final AccountFactory factory;
- public AccountSessionDatabaseStore(Log logger, IOseeDatabaseService dbService, AccountFactory factory) {
+ public AccountSessionDatabaseStore(Log logger, JdbcClient jdbcClient, AccountFactory factory) {
this.logger = logger;
- this.dbService = dbService;
+ this.jdbcClient = jdbcClient;
this.factory = factory;
}
@@ -86,7 +86,7 @@ public class AccountSessionDatabaseStore implements AccountSessionStorage {
@Override
protected ResultSet innerCall() throws Exception {
List list = new LinkedList();
- IOseeStatement chStmt = dbService.getStatement();
+ JdbcStatement chStmt = jdbcClient.getStatement();
try {
chStmt.runPreparedQuery(query, data);
while (chStmt.next()) {
@@ -119,7 +119,7 @@ public class AccountSessionDatabaseStore implements AccountSessionStorage {
for (AccountSession session : datas) {
data.add(asInsert(session));
}
- int result = dbService.runBatchUpdate(INSERT_ACCOUNT_SESSION, data);
+ int result = jdbcClient.runBatchUpdate(INSERT_ACCOUNT_SESSION, data);
return result;
}
};
@@ -135,7 +135,7 @@ public class AccountSessionDatabaseStore implements AccountSessionStorage {
for (AccountSession session : datas) {
data.add(asUpdate(session));
}
- int result = dbService.runBatchUpdate(UPDATE_BY_ACCOUNT_ID_AND_SESSION_TOKEN, data);
+ int result = jdbcClient.runBatchUpdate(UPDATE_BY_ACCOUNT_ID_AND_SESSION_TOKEN, data);
return result;
}
};
@@ -147,7 +147,7 @@ public class AccountSessionDatabaseStore implements AccountSessionStorage {
@Override
protected Integer innerCall() throws Exception {
- return dbService.runPreparedUpdate(DELETE_BY_SESSION_TOKEN, token);
+ return jdbcClient.runPreparedUpdate(DELETE_BY_SESSION_TOKEN, token);
}
};
}
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSessionSchemaResource.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSessionSchemaResource.java
index bb9015c5c24..4de4964ae82 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSessionSchemaResource.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/AccountSessionSchemaResource.java
@@ -15,14 +15,15 @@ import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
-import org.eclipse.osee.database.schema.SchemaResource;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.eclipse.osee.jdbc.JdbcClientConfig;
+import org.eclipse.osee.jdbc.JdbcSchemaResource;
/**
* @author Roberto E. Escobar
*/
-public class AccountSessionSchemaResource implements SchemaResource {
+public class AccountSessionSchemaResource implements JdbcSchemaResource {
private static final String SCHEMA_PATH = "schema/ACCOUNT.DS.SCHEMA.xml";
@@ -39,7 +40,7 @@ public class AccountSessionSchemaResource implements SchemaResource {
}
@Override
- public boolean isApplicable() {
+ public boolean isApplicable(JdbcClientConfig config) {
return true;
}
@@ -55,4 +56,5 @@ public class AccountSessionSchemaResource implements SchemaResource {
private URL getResourceURL() {
return getClass().getResource(SCHEMA_PATH);
}
+
}
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsAccountStorage.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsAccountStorage.java
index 5b2887a8b72..c3f47d62cdb 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsAccountStorage.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/OrcsAccountStorage.java
@@ -21,12 +21,13 @@ import org.eclipse.osee.account.admin.CreateAccountRequest;
import org.eclipse.osee.account.admin.ds.AccountStorage;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.jdk.core.type.Identifiable;
import org.eclipse.osee.framework.jdk.core.type.Identity;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.jdk.core.type.ResultSet;
+import org.eclipse.osee.jdbc.JdbcClient;
+import org.eclipse.osee.jdbc.JdbcService;
import org.eclipse.osee.orcs.data.ArtifactId;
import org.eclipse.osee.orcs.data.ArtifactReadable;
import org.eclipse.osee.orcs.transaction.TransactionBuilder;
@@ -37,17 +38,18 @@ import org.eclipse.osee.orcs.utility.OrcsUtil;
*/
public class OrcsAccountStorage extends AbstractOrcsStorage implements AccountStorage {
- private IOseeDatabaseService dbService;
+ private JdbcService jdbcService;
private AccountSessionStorage sessionStore;
- public void setDatabaseService(IOseeDatabaseService dbService) {
- this.dbService = dbService;
+ public void setJdbcService(JdbcService jdbcService) {
+ this.jdbcService = jdbcService;
}
@Override
public void start() {
super.start();
- sessionStore = new AccountSessionDatabaseStore(getLogger(), dbService, getFactory());
+ JdbcClient jdbcClient = jdbcService.getClient();
+ sessionStore = new AccountSessionDatabaseStore(getLogger(), jdbcClient, getFactory());
}
@Override
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/AbstractDatabaseStorage.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/AbstractDatabaseStorage.java
index 4dc762aaff2..9068c641fe2 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/AbstractDatabaseStorage.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/AbstractDatabaseStorage.java
@@ -15,13 +15,13 @@ import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.Callable;
-import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.database.core.IOseeStatement;
-import org.eclipse.osee.framework.database.core.SQL3DataType;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.ResultSet;
import org.eclipse.osee.framework.jdk.core.type.ResultSets;
import org.eclipse.osee.framework.jdk.core.util.Lib;
+import org.eclipse.osee.jdbc.JdbcClient;
+import org.eclipse.osee.jdbc.JdbcStatement;
+import org.eclipse.osee.jdbc.SQL3DataType;
import org.eclipse.osee.logger.Log;
/**
@@ -30,12 +30,12 @@ import org.eclipse.osee.logger.Log;
public abstract class AbstractDatabaseStorage {
private final Log logger;
- private final IOseeDatabaseService dbService;
+ private final JdbcClient jdbcClient;
- public AbstractDatabaseStorage(Log logger, IOseeDatabaseService dbService) {
+ public AbstractDatabaseStorage(Log logger, JdbcClient jdbcClient) {
super();
this.logger = logger;
- this.dbService = dbService;
+ this.jdbcClient = jdbcClient;
}
protected Object asVarcharOrNull(String value) {
@@ -48,7 +48,7 @@ public abstract class AbstractDatabaseStorage {
protected abstract Object[] asDelete(T item);
- protected abstract T readData(IOseeStatement chStmt);
+ protected abstract T readData(JdbcStatement chStmt);
protected R execute(Callable callable) {
try {
@@ -100,7 +100,7 @@ public abstract class AbstractDatabaseStorage {
@Override
protected ResultSet innerCall() throws Exception {
List list = new LinkedList();
- IOseeStatement chStmt = dbService.getStatement();
+ JdbcStatement chStmt = jdbcClient.getStatement();
try {
chStmt.runPreparedQuery(query, data);
while (chStmt.next()) {
@@ -120,7 +120,7 @@ public abstract class AbstractDatabaseStorage {
@Override
protected Long innerCall() throws Exception {
- return dbService.runPreparedQueryFetchObject(-1L, query, data);
+ return jdbcClient.runPreparedQueryFetchObject(-1L, query, data);
}
};
}
@@ -134,7 +134,7 @@ public abstract class AbstractDatabaseStorage {
for (T item : items) {
data.add(asInsert(item));
}
- return dbService.runBatchUpdate(insertSql, data);
+ return jdbcClient.runBatchUpdate(insertSql, data);
}
};
}
@@ -148,7 +148,7 @@ public abstract class AbstractDatabaseStorage {
for (T item : items) {
data.add(asDelete(item));
}
- return dbService.runBatchUpdate(deleteSql, data);
+ return jdbcClient.runBatchUpdate(deleteSql, data);
}
};
}
@@ -162,7 +162,7 @@ public abstract class AbstractDatabaseStorage {
for (T item : items) {
data.add(asUpdate(item));
}
- return dbService.runBatchUpdate(updateSql, data);
+ return jdbcClient.runBatchUpdate(updateSql, data);
}
};
}
@@ -178,8 +178,8 @@ public abstract class AbstractDatabaseStorage {
this.data = data;
}
- protected IOseeDatabaseService getDbService() {
- return dbService;
+ protected JdbcClient getJdbcClient() {
+ return jdbcClient;
}
@Override
diff --git a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/AuthCodeGrantStorage.java b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/AuthCodeGrantStorage.java
index 33ae320862e..a8b414cb759 100644
--- a/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/AuthCodeGrantStorage.java
+++ b/plugins/org.eclipse.osee.orcs.account.admin/src/org/eclipse/osee/orcs/account/admin/internal/oauth/AuthCodeGrantStorage.java
@@ -13,10 +13,10 @@ package org.eclipse.osee.orcs.account.admin.internal.oauth;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.jaxrs.server.security.OAuthCodeGrant;
+import org.eclipse.osee.jdbc.JdbcClient;
+import org.eclipse.osee.jdbc.JdbcStatement;
import org.eclipse.osee.logger.Log;
/**
@@ -33,8 +33,8 @@ public class AuthCodeGrantStorage extends AbstractDatabaseStorage {
private static final String UPDATE_TOKEN_PARENT_BY_ID =
"UPDATE osee_oauth_token SET parent_token_id = ? WHERE id = ?";
- public TokenStorage(Log logger, IOseeDatabaseService dbService) {
- super(logger, dbService);
+ public TokenStorage(Log logger, JdbcClient jdbcClient) {
+ super(logger, jdbcClient);
}
@Override
@@ -92,7 +92,7 @@ public class TokenStorage extends AbstractDatabaseStorage {
@Override
protected Void innerCall() throws Exception {
- getDbService().runPreparedUpdate(query, data);
+ getJdbcClient().runPreparedUpdate(query, data);
return null;
}
@@ -108,7 +108,7 @@ public class TokenStorage extends AbstractDatabaseStorage {
@Override
protected Void innerCall() throws Exception {
- getDbService().runPreparedUpdate(DELETE_TOKEN_BY_TOKEN_KEY, tokenKey);
+ getJdbcClient().runPreparedUpdate(DELETE_TOKEN_BY_TOKEN_KEY, tokenKey);
return null;
}
@@ -116,7 +116,7 @@ public class TokenStorage extends AbstractDatabaseStorage {
}
@Override
- protected OAuthToken readData(IOseeStatement chStmt) {
+ protected OAuthToken readData(JdbcStatement chStmt) {
final long uuid = chStmt.getLong("id");
final long clientId = chStmt.getLong("client_id");
final long subjectId = chStmt.getLong("subject_id");
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF
index ad890b65e68..ae174019e7e 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF
@@ -7,18 +7,20 @@ Bundle-Vendor: Eclipse Open System Engineering Environment
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.osee.framework.core.data,
org.eclipse.osee.framework.core.exception,
- org.eclipse.osee.framework.database,
- org.eclipse.osee.framework.database.core,
org.eclipse.osee.framework.jdk.core.type,
org.eclipse.osee.framework.jdk.core.util,
org.eclipse.osee.framework.jdk.core.util.annotation,
org.eclipse.osee.framework.jdk.core.util.network,
- org.eclipse.osee.hsqldb,
+ org.eclipse.osee.jdbc,
+ org.json,
org.junit,
org.junit.rules,
org.junit.runner,
org.junit.runners.model,
org.osgi.framework,
+ org.osgi.service.cm,
org.osgi.util.tracker
Export-Package: org.eclipse.osee.orcs.db.mock
Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.equinox.ds,
+ org.eclipse.equinox.cm
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OseeDatabase.java b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OseeDatabase.java
index bd869b6173d..475ec3bf908 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OseeDatabase.java
+++ b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OseeDatabase.java
@@ -21,10 +21,10 @@ import org.junit.runners.model.Statement;
*/
public class OseeDatabase implements TestRule {
- private final String connectionId;
+ private final String[] osgiBindings;
- public OseeDatabase(String connectionId) {
- this.connectionId = connectionId;
+ public OseeDatabase(String... osgiBindings) {
+ this.osgiBindings = osgiBindings;
}
@Override
@@ -32,9 +32,10 @@ public class OseeDatabase implements TestRule {
return new Statement() {
@Override
public void evaluate() throws Throwable {
- Assert.assertNotNull("Connection Id cannot be null", connectionId);
+ Assert.assertNotNull("Osgi Binding cannot be null", osgiBindings);
+ Assert.assertTrue("Osgi Binding cannot be empty", osgiBindings.length > 0);
TestDatabase db =
- new TestDatabase(connectionId, description.getTestClass().getSimpleName(), description.getMethodName());
+ new TestDatabase(description.getTestClass().getSimpleName(), description.getMethodName(), osgiBindings);
try {
db.initialize();
base.evaluate();
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/OsgiUtil.java b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/OsgiUtil.java
index 34b84e64505..9bad66dcd26 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/OsgiUtil.java
+++ b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/OsgiUtil.java
@@ -10,8 +10,7 @@
*******************************************************************************/
package org.eclipse.osee.orcs.db.mock.internal;
-import java.util.Dictionary;
-import org.eclipse.osee.framework.core.exception.OseeExceptions;
+import java.util.Collection;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.junit.Assert;
import org.osgi.framework.Bundle;
@@ -19,7 +18,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.cm.ConfigurationAdmin;
/**
* @author Roberto E. Escobar
@@ -32,16 +31,7 @@ public final class OsgiUtil {
public static T getService(Class clazz) throws OseeCoreException {
Bundle bundle = FrameworkUtil.getBundle(OsgiUtil.class);
- Assert.assertNotNull(bundle);
-
- int bundleState = bundle.getState();
- if (bundleState != Bundle.STARTING && bundleState != Bundle.ACTIVE) {
- try {
- bundle.start();
- } catch (BundleException ex) {
- OseeExceptions.wrapAndThrow(ex);
- }
- }
+ checkStarted(bundle);
BundleContext context = bundle.getBundleContext();
Assert.assertNotNull(context);
@@ -55,21 +45,76 @@ public final class OsgiUtil {
return service;
}
- public static ServiceRegistration registerService(Class class1, S service, Dictionary properties) throws OseeCoreException {
+ public static T getService(Class clazz, String filter, long waitTimeMillis) throws OseeCoreException {
+ Bundle bundle = FrameworkUtil.getBundle(OsgiUtil.class);
+ checkStarted(bundle);
+
+ BundleContext context = bundle.getBundleContext();
+ Assert.assertNotNull(context);
+
+ ServiceReference reference = null;
+ int totalWaitTime = 0;
+ do {
+ try {
+ Collection> references = context.getServiceReferences(clazz, filter);
+ if (references != null && !references.isEmpty()) {
+ reference = references.iterator().next();
+ }
+ } catch (Exception ex) {
+ // do nothing;
+ } finally {
+ try {
+ if (totalWaitTime < waitTimeMillis && reference == null) {
+ Thread.sleep(100);
+ totalWaitTime += 100;
+ }
+ } catch (InterruptedException ex1) {
+ // do nothing;
+ }
+ }
+ } while (totalWaitTime < waitTimeMillis && reference == null);
+ Assert.assertNotNull(String.format("Unable to find service [%s]", clazz), reference);
+
+ T service = context.getService(reference);
+ Assert.assertNotNull(String.format("Unable to find service instance for [%s]", clazz), service);
+ return service;
+ }
+
+ public static Bundle getBundleByName(String bundleName) {
Bundle bundle = FrameworkUtil.getBundle(OsgiUtil.class);
- Assert.assertNotNull(bundle);
+ checkStarted(bundle);
+ BundleContext context = bundle.getBundleContext();
+ Bundle toReturn = null;
+ for (Bundle item : context.getBundles()) {
+ if (bundleName.equals(item.getSymbolicName())) {
+ toReturn = item;
+ break;
+ }
+ }
+ return toReturn;
+ }
+
+ public static ConfigurationAdmin getConfigAdmin() {
+ Bundle cmBundle = getBundleByName("org.eclipse.equinox.cm");
+ checkStarted(cmBundle);
+ try {
+ return getService(ConfigurationAdmin.class);
+ } catch (Exception ex) {
+ throw new OseeCoreException(ex.getCause(), "Error acquiring configuration admin");
+ }
+ }
+
+ private static void checkStarted(Bundle bundle) {
+ Assert.assertNotNull("Bundle cannot be null", bundle);
int bundleState = bundle.getState();
if (bundleState != Bundle.STARTING && bundleState != Bundle.ACTIVE) {
try {
bundle.start();
} catch (BundleException ex) {
- OseeExceptions.wrapAndThrow(ex);
+ throw new OseeCoreException(ex.getCause(), "Error starting bundle [%s]", bundle.getSymbolicName());
}
}
- BundleContext context = bundle.getBundleContext();
- Assert.assertNotNull(context);
-
- return context.registerService(class1, service, properties);
}
+
}
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java
index e525f9b78f4..ed260a82b5f 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java
+++ b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java
@@ -15,19 +15,24 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import org.eclipse.osee.framework.core.data.IDatabaseInfo;
-import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.database.core.IDatabaseInfoProvider;
-import org.eclipse.osee.framework.database.core.OseeConnection;
+import java.util.Dictionary;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Lib;
-import org.eclipse.osee.framework.jdk.core.util.network.PortUtil;
-import org.eclipse.osee.hsqldb.HsqlServerManager;
+import org.eclipse.osee.jdbc.JdbcConstants;
+import org.eclipse.osee.jdbc.JdbcService;
import org.eclipse.osee.orcs.db.mock.OseeDatabase;
+import org.json.JSONArray;
+import org.json.JSONException;
import org.junit.Assert;
import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
/**
* @author Roberto E. Escobar
@@ -36,17 +41,17 @@ public class TestDatabase {
private final String className;
private final String methodName;
+ private final String[] osgiBindings;
- private ServiceRegistration> registration;
private File tempFolder;
- private final String connectionId;
- private String dbId = "";
- private HsqlServerManager hsqlServer;
- public TestDatabase(String connectionId, String className, String methodName) {
- this.connectionId = connectionId;
+ private Configuration configuration;
+ private JdbcService jdbcService;
+
+ public TestDatabase(String className, String methodName, String... osgiBindings) {
this.className = className;
this.methodName = methodName;
+ this.osgiBindings = osgiBindings;
}
private File createTempFolder() {
@@ -76,34 +81,44 @@ public class TestDatabase {
String dbPath = getDbHomePath(tempFolder, "hsql");
- int port = PortUtil.getInstance().getConsecutiveValidPorts(2);
-
- IDatabaseInfo databaseInfo = new DbInfo(connectionId, port, dbPath);
- TestDbProvider provider = new TestDbProvider(databaseInfo);
-
- System.setProperty("osee.db.embedded.server", "");
System.setProperty("osee.application.server.data", tempFolder.getAbsolutePath());
- registerProvider(provider);
- IOseeDatabaseService dbService = OsgiUtil.getService(IOseeDatabaseService.class);
- Assert.assertNotNull(dbService);
+ ConfigurationAdmin configAdmin = OsgiUtil.getConfigAdmin();
- hsqlServer = OsgiUtil.getService(HsqlServerManager.class);
- Assert.assertNotNull(hsqlServer);
+ configuration = configAdmin.getConfiguration("org.eclipse.osee.jdbc.internal.osgi.JdbcComponentFactory", null);
+ configuration.update(newConfig(dbPath));
- dbId = hsqlServer.startServer("0.0.0.0", port, port + 1, databaseInfo);
+ jdbcService = OsgiUtil.getService(JdbcService.class, "(osgi.binding=orcs.jdbc.service)", 5000L);
+ Assert.assertNotNull("Unable to get JdbcService", jdbcService);
+ boolean isAlive = jdbcService.isServerAlive(10000L);
+ Assert.assertEquals("database service is not alive", true, isAlive);
+ }
- OseeConnection connection = dbService.getConnection();
- try {
- Assert.assertNotNull(connection);
- } finally {
- connection.close();
+ private Dictionary newConfig(String dbPath) {
+ Map config = new LinkedHashMap();
+ config.put(JdbcConstants.JDBC_SERVICE__ID, Lib.generateUuid());
+ config.put(JdbcConstants.JDBC_SERVER__DB_DATA_PATH, dbPath);
+ config.put(JdbcConstants.JDBC_SERVER__USE_RANDOM_PORT, true);
+ config.put(JdbcConstants.JDBC_POOL__ENABLED, false);
+ config.put(JdbcConstants.JDBC_POOL__MAX_ACTIVE_CONNECTIONS, 100);
+ config.put(JdbcConstants.JDBC_POOL__MAX_IDLE_CONNECTIONS, 100);
+
+ Set bindings = new HashSet();
+ for (String binding : osgiBindings) {
+ bindings.add(binding);
}
- }
+ config.put(JdbcConstants.JDBC_SERVICE__OSGI_BINDING, bindings);
- private void registerProvider(IDatabaseInfoProvider service) {
- BundleContext context = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
- registration = context.registerService(IDatabaseInfoProvider.class, service, null);
+ JSONArray jsonArray = new JSONArray();
+ try {
+ jsonArray.put(0, config);
+ } catch (JSONException ex) {
+ throw new OseeCoreException(ex);
+ }
+ Hashtable data = new Hashtable();
+ data.put("serviceId", "org.eclipse.osee.jdbc.internal.osgi.JdbcComponentFactory");
+ data.put(JdbcConstants.JDBC_SERVICE__CONFIGS, jsonArray.toString());
+ return data;
}
private String getDbHomePath(File tempFolder, String dbFolder) {
@@ -127,14 +142,15 @@ public class TestDatabase {
}
public void cleanup() {
- if (registration != null) {
- registration.unregister();
+ if (configuration != null) {
+ try {
+ configuration.delete();
+ } catch (IOException ex) {
+ throw new OseeCoreException(ex);
+ }
}
-
System.setProperty("osee.application.server.data", "");
- System.setProperty("osee.db.embedded.server", "");
- boolean isDead = hsqlServer.stopServerWithWait(dbId);
-
+ boolean isDead = jdbcService != null ? !jdbcService.isServerAlive(2000L) : true;
if (isDead) {
if (tempFolder != null) {
Lib.deleteDir(tempFolder);
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDbProvider.java b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDbProvider.java
deleted file mode 100644
index 77febed40da..00000000000
--- a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDbProvider.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.orcs.db.mock.internal;
-
-import org.eclipse.osee.framework.core.data.IDatabaseInfo;
-import org.eclipse.osee.framework.database.core.IDatabaseInfoProvider;
-
-/**
- * @author Roberto E. Escobar
- */
-public class TestDbProvider implements IDatabaseInfoProvider {
-
- private final IDatabaseInfo databaseInfo;
-
- public TestDbProvider(IDatabaseInfo databaseInfo) {
- super();
- this.databaseInfo = databaseInfo;
- }
-
- @Override
- public IDatabaseInfo getDatabaseInfo() {
- return databaseInfo;
- }
-
- @Override
- public int getPriority() {
- return Integer.MIN_VALUE;
- }
-
- @Override
- public String toString() {
- return "Test Db info";
- }
-}
diff --git a/plugins/org.eclipse.osee.orcs.db.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.db.test/META-INF/MANIFEST.MF
index 7e2d6e839ee..8e967f52520 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.orcs.db.test/META-INF/MANIFEST.MF
@@ -9,8 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.osee.framework.core.data,
org.eclipse.osee.framework.core.enums,
org.eclipse.osee.framework.core.exception,
- org.eclipse.osee.framework.database,
- org.eclipse.osee.framework.database.core,
org.eclipse.osee.framework.resource.management,
org.eclipse.osee.framework.resource.management.exception,
org.eclipse.osee.framework.resource.management.util,
diff --git a/plugins/org.eclipse.osee.orcs.db.test/OrcsDbTestSuite.launch b/plugins/org.eclipse.osee.orcs.db.test/OrcsDbTestSuite.launch
index df480bb4b2d..86cf1e7286b 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/OrcsDbTestSuite.launch
+++ b/plugins/org.eclipse.osee.orcs.db.test/OrcsDbTestSuite.launch
@@ -1,9 +1,10 @@
-
-
-
+
+
+
+
diff --git a/plugins/org.eclipse.osee.orcs.db.test/pom.xml b/plugins/org.eclipse.osee.orcs.db.test/pom.xml
index 2683f614cdd..ef7fa7f15a9 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/pom.xml
+++ b/plugins/org.eclipse.osee.orcs.db.test/pom.xml
@@ -49,11 +49,6 @@
org.eclipse.osee.framework.core.dsl
0.0.0
-
- eclipse-plugin
- org.eclipse.osee.hsqldb
- 0.0.0
-
eclipse-plugin
org.eclipse.osee.framework.logging
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/IntegrationUtil.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/IntegrationUtil.java
index 90090065680..afd585aee4f 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/IntegrationUtil.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/IntegrationUtil.java
@@ -32,8 +32,8 @@ public class IntegrationUtil {
private static final Comparator SORT_BY_LOCAL_ID = new IdComparator();
- public static TestRule integrationRule(Object testObject, String dbId) {
- return RuleChain.outerRule(new OseeDatabase(dbId)).around(new OsgiRule(testObject));
+ public static TestRule integrationRule(Object testObject) {
+ return RuleChain.outerRule(new OseeDatabase("orcs.jdbc.service")).around(new OsgiRule(testObject));
}
public static void sort(List extends OrcsData> data) {
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/LoaderTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/LoaderTest.java
index dc75d0eb9ab..b0f9e1a71dd 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/LoaderTest.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/LoaderTest.java
@@ -28,7 +28,6 @@ import java.util.Iterator;
import org.eclipse.osee.executor.admin.HasCancellation;
import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.core.enums.LoadLevel;
-import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.orcs.OrcsSession;
@@ -58,10 +57,10 @@ import org.mockito.MockitoAnnotations;
public class LoaderTest {
@Rule
- public TestRule db = integrationRule(this, "osee.demo.hsql");
+ public TestRule db = integrationRule(this);
// @formatter:off
- @OsgiService private IOseeDatabaseService dbService;
+// @OsgiService private JdbcClient jdbcClient;
@OsgiService private OrcsDataStore dataStore;
@Mock private LoadDataHandler builder;
@Captor private ArgumentCaptor descriptorCaptor;
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/OseeInfoDataAccessorTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/OseeInfoDataAccessorTest.java
index 632d2aba01e..fe0760d8cef 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/OseeInfoDataAccessorTest.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/OseeInfoDataAccessorTest.java
@@ -12,11 +12,11 @@ package org.eclipse.osee.orcs.db.intergration;
import static org.eclipse.osee.orcs.db.intergration.IntegrationUtil.integrationRule;
import java.sql.DatabaseMetaData;
-import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.database.core.OseeConnection;
-import org.eclipse.osee.framework.database.core.SupportedDatabase;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
+import org.eclipse.osee.jdbc.JdbcConnection;
+import org.eclipse.osee.jdbc.JdbcDbType;
+import org.eclipse.osee.jdbc.JdbcService;
import org.eclipse.osee.orcs.core.ds.DataStoreConstants;
import org.eclipse.osee.orcs.db.internal.SqlProvider;
import org.eclipse.osee.orcs.db.internal.accessor.OseeInfoDataAccessor;
@@ -35,17 +35,17 @@ import org.junit.rules.TestRule;
public class OseeInfoDataAccessorTest {
@Rule
- public TestRule db = integrationRule(this, "osee.demo.hsql");
+ public TestRule db = integrationRule(this);
//@formatter:off
- @OsgiService private IOseeDatabaseService dbService;
+ @OsgiService private JdbcService jdbcService;
//@formatter:on
@org.junit.Test
public void testGetSetValue() throws OseeCoreException {
OseeInfoDataAccessor accessor = new OseeInfoDataAccessor();
accessor.setLogger(new MockLog());
- accessor.setDatabaseService(dbService);
+ accessor.setJdbcService(jdbcService);
String value = accessor.getValue("test.data");
Assert.assertEquals("", value);
@@ -61,7 +61,7 @@ public class OseeInfoDataAccessorTest {
public void testSetBinaryDataPath() throws OseeCoreException {
OseeInfoDataAccessor accessor = new OseeInfoDataAccessor();
accessor.setLogger(new MockLog());
- accessor.setDatabaseService(dbService);
+ accessor.setJdbcService(jdbcService);
accessor.putValue(ResourceConstants.BINARY_DATA_PATH, "dummy");
}
@@ -70,7 +70,7 @@ public class OseeInfoDataAccessorTest {
public void testGetBinaryDataPath() throws OseeCoreException {
OseeInfoDataAccessor accessor = new OseeInfoDataAccessor();
accessor.setLogger(new MockLog());
- accessor.setDatabaseService(dbService);
+ accessor.setJdbcService(jdbcService);
String original = accessor.getValue(ResourceConstants.BINARY_DATA_PATH);
Assert.assertEquals(System.getProperty(ResourceConstants.BINARY_DATA_PATH), original);
@@ -88,7 +88,7 @@ public class OseeInfoDataAccessorTest {
public void testSetDatabaseHintsSupported() throws OseeCoreException {
OseeInfoDataAccessor accessor = new OseeInfoDataAccessor();
accessor.setLogger(new MockLog());
- accessor.setDatabaseService(dbService);
+ accessor.setJdbcService(jdbcService);
accessor.putValue(SqlProvider.SQL_DATABASE_HINTS_SUPPORTED_KEY, "dummy");
}
@@ -97,15 +97,15 @@ public class OseeInfoDataAccessorTest {
public void testGetDatabaseHintsSupported() throws OseeCoreException {
OseeInfoDataAccessor accessor = new OseeInfoDataAccessor();
accessor.setLogger(new MockLog());
- accessor.setDatabaseService(dbService);
+ accessor.setJdbcService(jdbcService);
String original = accessor.getValue(SqlProvider.SQL_DATABASE_HINTS_SUPPORTED_KEY);
boolean expected = false;
- OseeConnection connection = dbService.getConnection();
+ JdbcConnection connection = jdbcService.getClient().getConnection();
try {
DatabaseMetaData metaData = connection.getMetaData();
- expected = SupportedDatabase.isDatabaseType(metaData, SupportedDatabase.oracle);
+ expected = JdbcDbType.isDatabaseType(metaData, JdbcDbType.oracle);
} finally {
connection.close();
}
@@ -116,7 +116,7 @@ public class OseeInfoDataAccessorTest {
public void testSetSQLRecursiveKeyword() throws OseeCoreException {
OseeInfoDataAccessor accessor = new OseeInfoDataAccessor();
accessor.setLogger(new MockLog());
- accessor.setDatabaseService(dbService);
+ accessor.setJdbcService(jdbcService);
accessor.putValue(SqlProvider.SQL_RECURSIVE_WITH_KEY, "dummy");
}
@@ -125,15 +125,15 @@ public class OseeInfoDataAccessorTest {
public void testGetSQLRecursiveKeyword() throws OseeCoreException {
OseeInfoDataAccessor accessor = new OseeInfoDataAccessor();
accessor.setLogger(new MockLog());
- accessor.setDatabaseService(dbService);
+ accessor.setJdbcService(jdbcService);
String original = accessor.getValue(SqlProvider.SQL_RECURSIVE_WITH_KEY);
String expected = "";
- OseeConnection connection = dbService.getConnection();
+ JdbcConnection connection = jdbcService.getClient().getConnection();
try {
DatabaseMetaData metaData = connection.getMetaData();
- if (!SupportedDatabase.isDatabaseType(metaData, SupportedDatabase.oracle)) {
+ if (!JdbcDbType.isDatabaseType(metaData, JdbcDbType.oracle)) {
expected = "RECURSIVE";
}
} finally {
@@ -146,7 +146,7 @@ public class OseeInfoDataAccessorTest {
public void testSetSQLRegExpPattern() throws OseeCoreException {
OseeInfoDataAccessor accessor = new OseeInfoDataAccessor();
accessor.setLogger(new MockLog());
- accessor.setDatabaseService(dbService);
+ accessor.setJdbcService(jdbcService);
accessor.putValue(SqlProvider.SQL_REG_EXP_PATTERN_KEY, "dummy");
}
@@ -155,20 +155,20 @@ public class OseeInfoDataAccessorTest {
public void testGetSQLRegExpPattern() throws OseeCoreException {
OseeInfoDataAccessor accessor = new OseeInfoDataAccessor();
accessor.setLogger(new MockLog());
- accessor.setDatabaseService(dbService);
+ accessor.setJdbcService(jdbcService);
String original = accessor.getValue(SqlProvider.SQL_REG_EXP_PATTERN_KEY);
String expected = "";
- OseeConnection connection = dbService.getConnection();
+ JdbcConnection connection = jdbcService.getClient().getConnection();
try {
DatabaseMetaData metaData = connection.getMetaData();
- SupportedDatabase db = SupportedDatabase.getDatabaseType(metaData);
- if (SupportedDatabase.oracle == db) {
+ JdbcDbType db = JdbcDbType.getDatabaseType(metaData);
+ if (JdbcDbType.oracle == db) {
expected = "REGEXP_LIKE (%s, %s)";
- } else if (SupportedDatabase.hsql == db || SupportedDatabase.postgresql == db) {
+ } else if (JdbcDbType.hsql == db || JdbcDbType.postgresql == db) {
expected = "REGEXP_MATCHES (%s, %s)";
- } else if (SupportedDatabase.mysql == db) {
+ } else if (JdbcDbType.mysql == db) {
expected = "(%s REGEXP %s)";
}
} finally {
@@ -181,7 +181,7 @@ public class OseeInfoDataAccessorTest {
public void testSetCheckTagQueueOnStartupAllowed() throws OseeCoreException {
OseeInfoDataAccessor accessor = new OseeInfoDataAccessor();
accessor.setLogger(new MockLog());
- accessor.setDatabaseService(dbService);
+ accessor.setJdbcService(jdbcService);
accessor.putValue(DataStoreConstants.DATASTORE_INDEX_ON_START_UP, "dummy");
}
@@ -190,7 +190,7 @@ public class OseeInfoDataAccessorTest {
public void testGetCheckTagQueueOnStartupAllowed() throws OseeCoreException {
OseeInfoDataAccessor accessor = new OseeInfoDataAccessor();
accessor.setLogger(new MockLog());
- accessor.setDatabaseService(dbService);
+ accessor.setJdbcService(jdbcService);
String original = accessor.getValue(DataStoreConstants.DATASTORE_INDEX_ON_START_UP);
Assert.assertEquals(System.getProperty(DataStoreConstants.DATASTORE_INDEX_ON_START_UP, "false"), original);
@@ -208,7 +208,7 @@ public class OseeInfoDataAccessorTest {
public void testGetKeys() throws OseeCoreException {
OseeInfoDataAccessor accessor = new OseeInfoDataAccessor();
accessor.setLogger(new MockLog());
- accessor.setDatabaseService(dbService);
+ accessor.setJdbcService(jdbcService);
Assert.assertTrue(!accessor.getKeys().isEmpty());
}
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataFactoryImplTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataFactoryImplTest.java
index 5db6473ea46..0e01df089f7 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataFactoryImplTest.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataFactoryImplTest.java
@@ -239,6 +239,7 @@ public class DataFactoryImplTest {
assertEquals("", objData[2]);
}
+ @SuppressWarnings("unchecked")
@Test
public void testCreateRelationData() throws OseeCoreException {
IRelationType relationType = mock(IRelationType.class);
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderFactoryImplTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderFactoryImplTest.java
index ea16098df79..24f9075b92f 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderFactoryImplTest.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderFactoryImplTest.java
@@ -31,10 +31,10 @@ import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.DeletionFlag;
import org.eclipse.osee.framework.core.enums.LoadLevel;
-import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.GUID;
+import org.eclipse.osee.jdbc.JdbcClient;
+import org.eclipse.osee.jdbc.JdbcStatement;
import org.eclipse.osee.logger.Log;
import org.eclipse.osee.orcs.OrcsSession;
import org.eclipse.osee.orcs.core.ds.DataLoader;
@@ -73,8 +73,8 @@ public class DataLoaderFactoryImplTest {
//@formatter:off
@Mock private Log logger;
- @Mock private IOseeDatabaseService dbService;
- @Mock private IOseeStatement chStmt;
+ @Mock private JdbcClient jdbcClient;
+ @Mock private JdbcStatement chStmt;
@Mock private IdentityManager identityService;
@Mock private SqlProvider sqlProvider;
@@ -108,7 +108,7 @@ public class DataLoaderFactoryImplTest {
String sessionId = GUID.create();
when(session.getGuid()).thenReturn(sessionId);
- LoaderModule module = new LoaderModule(logger, dbService, identityService, sqlProvider, null, joinFactory);
+ LoaderModule module = new LoaderModule(logger, jdbcClient, identityService, sqlProvider, null, joinFactory);
SqlObjectLoader loader = module.createSqlObjectLoader(rowDataFactory, null);
spyLoader = spy(loader);
@@ -116,8 +116,8 @@ public class DataLoaderFactoryImplTest {
when(sqlProvider.getSql(OseeSql.QUERY_BUILDER)).thenReturn("/*+ ordered */");
- when(dbService.getStatement()).thenReturn(chStmt);
- when(dbService.runPreparedQueryFetchObject(eq(-1), Matchers.anyString(), eq(BRANCH.getUuid()))).thenReturn(
+ when(jdbcClient.getStatement()).thenReturn(chStmt);
+ when(jdbcClient.runPreparedQueryFetchObject(eq(-1), Matchers.anyString(), eq(BRANCH.getUuid()))).thenReturn(
EXPECTED_HEAD_TX_ID);
when(joinFactory.createArtifactJoinQuery()).thenAnswer(new Answer() {
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/proxy/VarCharDataProxyTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/proxy/VarCharDataProxyTest.java
index 264e0458edb..af919cd8eef 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/proxy/VarCharDataProxyTest.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/proxy/VarCharDataProxyTest.java
@@ -10,11 +10,11 @@
*******************************************************************************/
package org.eclipse.osee.orcs.db.internal.proxy;
-import static org.eclipse.osee.framework.database.IOseeDatabaseService.MAX_VARCHAR_LENGTH;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.Lib;
+import org.eclipse.osee.jdbc.JdbcConstants;
import org.eclipse.osee.orcs.db.mocks.MockDataHandler;
import org.eclipse.osee.orcs.db.mocks.MockLog;
import org.eclipse.osee.orcs.db.mocks.MockResourceNameResolver;
@@ -59,10 +59,10 @@ public class VarCharDataProxyTest {
@Test
public void testSetGetData() throws Exception {
- String longData = Utility.generateData(MAX_VARCHAR_LENGTH + 1);
+ String longData = Utility.generateData(JdbcConstants.JDBC__MAX_VARCHAR_LENGTH + 1);
byte[] zippedData = Utility.asZipped(longData, "myTest.txt");
- String shortStringData = Utility.generateData(MAX_VARCHAR_LENGTH);
+ String shortStringData = Utility.generateData(JdbcConstants.JDBC__MAX_VARCHAR_LENGTH);
MockDataHandler handler = new MockDataHandler();
handler.setContent(zippedData);
@@ -98,7 +98,7 @@ public class VarCharDataProxyTest {
@Test
public void testSetValue() throws Exception {
- String longData = Utility.generateData(MAX_VARCHAR_LENGTH + 1);
+ String longData = Utility.generateData(JdbcConstants.JDBC__MAX_VARCHAR_LENGTH + 1);
byte[] zippedData = Utility.asZipped(longData, "myTest.txt");
MockDataHandler handler = new MockDataHandler();
@@ -127,10 +127,10 @@ public class VarCharDataProxyTest {
@Test
public void testPersist() throws Exception {
- String longData = Utility.generateData(MAX_VARCHAR_LENGTH + 1);
+ String longData = Utility.generateData(JdbcConstants.JDBC__MAX_VARCHAR_LENGTH + 1);
byte[] zippedData = Utility.asZipped(longData, "myTest.txt");
- String shortData = Utility.generateData(MAX_VARCHAR_LENGTH);
+ String shortData = Utility.generateData(JdbcConstants.JDBC__MAX_VARCHAR_LENGTH);
MockDataHandler handler = new MockDataHandler();
handler.setContent(zippedData);
@@ -180,7 +180,7 @@ public class VarCharDataProxyTest {
@Test(expected = OseeCoreException.class)
public void testPersistResolverException() throws Exception {
- String longData = Utility.generateData(MAX_VARCHAR_LENGTH + 1);
+ String longData = Utility.generateData(JdbcConstants.JDBC__MAX_VARCHAR_LENGTH + 1);
byte[] zippedData = Utility.asZipped(longData, "myTest.txt");
MockDataHandler handler = new MockDataHandler();
@@ -204,7 +204,7 @@ public class VarCharDataProxyTest {
@Test
public void testPurge() throws Exception {
- String longData = Utility.generateData(MAX_VARCHAR_LENGTH + 1);
+ String longData = Utility.generateData(JdbcConstants.JDBC__MAX_VARCHAR_LENGTH + 1);
byte[] zippedData = Utility.asZipped(longData, "myTest.txt");
MockDataHandler handler = new MockDataHandler();
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/QueryTestSuite.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/QueryTestSuite.java
index bc1d00f5341..e7ae8f2b385 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/QueryTestSuite.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/QueryTestSuite.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.orcs.db.internal.search;
import org.eclipse.osee.orcs.db.internal.search.engines.EnginesTestSuite;
import org.eclipse.osee.orcs.db.internal.search.handlers.HandlersTestSuite;
-import org.eclipse.osee.orcs.db.internal.search.indexer.IndexingTaskDatabaseTxCallableTest;
+import org.eclipse.osee.orcs.db.internal.search.indexer.callable.consumer.IndexingTaskDatabaseTxCallableTest;
import org.eclipse.osee.orcs.db.internal.search.language.LanguageTestSuite;
import org.eclipse.osee.orcs.db.internal.search.tagger.TaggerTestSuite;
import org.eclipse.osee.orcs.db.internal.search.util.UtilityTestSuite;
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/indexer/IndexingTaskDatabaseTxCallableTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/indexer/IndexingTaskDatabaseTxCallableTest.java
deleted file mode 100644
index 856e5080bd5..00000000000
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/indexer/IndexingTaskDatabaseTxCallableTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.orcs.db.internal.search.indexer;
-
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
-import java.sql.DatabaseMetaData;
-import java.util.ArrayList;
-import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.database.IOseeDatabaseService;
-import org.eclipse.osee.framework.database.core.OseeConnection;
-import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
-import org.eclipse.osee.logger.Log;
-import org.eclipse.osee.orcs.OrcsSession;
-import org.eclipse.osee.orcs.core.ds.IndexedResource;
-import org.eclipse.osee.orcs.core.ds.OrcsDataHandler;
-import org.eclipse.osee.orcs.data.AttributeTypes;
-import org.eclipse.osee.orcs.db.internal.callable.AbstractDatastoreTxCallable;
-import org.eclipse.osee.orcs.db.internal.search.indexer.callable.consumer.IndexingTaskDatabaseTxCallable;
-import org.eclipse.osee.orcs.db.internal.search.tagger.TagCollector;
-import org.eclipse.osee.orcs.db.internal.search.tagger.Tagger;
-import org.eclipse.osee.orcs.db.internal.search.tagger.TaggingEngine;
-import org.eclipse.osee.orcs.search.IndexerCollectorAdapter;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Matchers;
-import org.mockito.Mock;
-
-/**
- * @author Marc A. Potter
- */
-
-public class IndexingTaskDatabaseTxCallableTest {
-
- // @formatter:off
- @Mock private Log logger;
- @Mock private OrcsSession session;
- @Mock private IOseeDatabaseService dbService;
- @Mock private IndexerCollectorAdapter collector;
- @Mock private AttributeTypes types;
- @Mock private IndexedResource resource1;
- @Mock private IndexedResource resource2;
- @Mock private TaggingEngine engine;
- @Mock private DatabaseMetaData metaData;
- @Mock private Tagger tagger;
- // @formatter:on
-
- private class MockConnection extends OseeConnection {
-
- public MockConnection() {
- super();
- }
-
- @Override
- public void close() throws OseeCoreException {
- //
- };
-
- @Override
- public boolean isClosed() throws OseeCoreException {
- return true;
- }
-
- @Override
- public boolean isStale() {
- return false;
- };
-
- @Override
- public DatabaseMetaData getMetaData() throws OseeCoreException {
- return metaData;
- };
-
- @Override
- protected void setAutoCommit(boolean autoCommit) throws OseeCoreException {
- //
- };
-
- @Override
- protected boolean getAutoCommit() throws OseeCoreException {
- return true;
- };
-
- @Override
- protected void commit() throws OseeCoreException {
- //
- };
-
- @Override
- protected void rollback() throws OseeCoreException {
- //
- };
-
- @Override
- protected void destroy() throws OseeCoreException {
- //
- };
-
- }
- private MockConnection connection;
- private AbstractDatastoreTxCallable txCallable;
-
- @Before
- public void setUp() {
- initMocks(this);
- IndexedResourceLoader loader = new IndexedResourceLoader() {
- @Override
- public void loadSource(OrcsDataHandler handler, int tagQueueQueryId) throws OseeCoreException {
- handler.onData(resource1);
- handler.onData(resource2);
- }
- };
- connection = new MockConnection();
- txCallable =
- new IndexingTaskDatabaseTxCallable(logger, session, dbService, loader, engine, collector, -1, false, 10000,
- types);
- }
-
- @Test
- public void testTagging() throws Exception {
- ArrayList sources = new ArrayList();
- sources.add(resource1);
- sources.add(resource2);
- when(resource1.getTypeUuid()).thenReturn(CoreAttributeTypes.Name.getGuid());
- when(resource2.getTypeUuid()).thenReturn(CoreAttributeTypes.QualificationMethod.getGuid());
- when(resource1.getGammaId()).thenReturn(1L);
- when(resource2.getGammaId()).thenReturn(2L);
- when(engine.hasTagger("")).thenReturn(false);
- when(engine.hasTagger("Tag")).thenReturn(true);
- when(engine.getTagger("Tag")).thenReturn(tagger);
- when(dbService.getConnection()).thenReturn(connection);
- when(metaData.getDatabaseProductName()).thenReturn("h2");
- when(types.getByUuid(CoreAttributeTypes.Name.getGuid())).thenReturn(CoreAttributeTypes.Name);
- when(types.getByUuid(CoreAttributeTypes.QualificationMethod.getGuid())).thenReturn(
- CoreAttributeTypes.QualificationMethod);
- when(types.getTaggerId(CoreAttributeTypes.Name)).thenReturn("Tag");
- when(types.getTaggerId(CoreAttributeTypes.QualificationMethod)).thenReturn(null);
- txCallable.call();
- verify(logger, times(1)).error("Field has invalid tagger[%s] provider and cannot be tagged - [Gamma: %s]", null,
- 2L);
- verify(tagger, times(1)).tagIt(Matchers.eq(resource1), Matchers.any(TagCollector.class));
- }
-}
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/consumer/IndexingTaskDatabaseTxCallableTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/consumer/IndexingTaskDatabaseTxCallableTest.java
new file mode 100644
index 00000000000..46114ff1941
--- /dev/null
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/search/indexer/callable/consumer/IndexingTaskDatabaseTxCallableTest.java
@@ -0,0 +1,102 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.orcs.db.internal.search.indexer.callable.consumer;
+
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.MockitoAnnotations.initMocks;
+import java.sql.DatabaseMetaData;
+import java.util.ArrayList;
+import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
+import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.eclipse.osee.jdbc.JdbcClient;
+import org.eclipse.osee.jdbc.JdbcConnection;
+import org.eclipse.osee.logger.Log;
+import org.eclipse.osee.orcs.OrcsSession;
+import org.eclipse.osee.orcs.core.ds.IndexedResource;
+import org.eclipse.osee.orcs.core.ds.OrcsDataHandler;
+import org.eclipse.osee.orcs.data.AttributeTypes;
+import org.eclipse.osee.orcs.db.internal.search.indexer.IndexedResourceLoader;
+import org.eclipse.osee.orcs.db.internal.search.tagger.TagCollector;
+import org.eclipse.osee.orcs.db.internal.search.tagger.Tagger;
+import org.eclipse.osee.orcs.db.internal.search.tagger.TaggingEngine;
+import org.eclipse.osee.orcs.search.IndexerCollectorAdapter;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Matchers;
+import org.mockito.Mock;
+
+/**
+ * @author Marc A. Potter
+ */
+
+public class IndexingTaskDatabaseTxCallableTest {
+
+ // @formatter:off
+ @Mock private Log logger;
+ @Mock private OrcsSession session;
+ @Mock private JdbcClient jdbcClient;
+ @Mock private IndexerCollectorAdapter collector;
+ @Mock private AttributeTypes types;
+ @Mock private IndexedResource resource1;
+ @Mock private IndexedResource resource2;
+ @Mock private TaggingEngine engine;
+ @Mock private DatabaseMetaData metaData;
+ @Mock private Tagger tagger;
+ @Mock private JdbcConnection connection;
+ // @formatter:on
+
+ private IndexingTaskDatabaseTxCallable txCallable;
+
+ @Before
+ public void setUp() {
+ initMocks(this);
+ IndexedResourceLoader loader = new IndexedResourceLoader() {
+ @Override
+ public void loadSource(OrcsDataHandler handler, int tagQueueQueryId) throws OseeCoreException {
+ handler.onData(resource1);
+ handler.onData(resource2);
+ }
+ };
+ txCallable =
+ new IndexingTaskDatabaseTxCallable(logger, session, jdbcClient, loader, engine, collector, -1, false, 10000,
+ types);
+ }
+
+ @Test
+ public void testTagging() throws Exception {
+ ArrayList sources = new ArrayList();
+ sources.add(resource1);
+ sources.add(resource2);
+ when(resource1.getTypeUuid()).thenReturn(CoreAttributeTypes.Name.getGuid());
+ when(resource2.getTypeUuid()).thenReturn(CoreAttributeTypes.QualificationMethod.getGuid());
+ when(resource1.getGammaId()).thenReturn(1L);
+ when(resource2.getGammaId()).thenReturn(2L);
+ when(engine.hasTagger("")).thenReturn(false);
+ when(engine.hasTagger("Tag")).thenReturn(true);
+ when(engine.getTagger("Tag")).thenReturn(tagger);
+
+ when(metaData.getDatabaseProductName()).thenReturn("h2");
+ when(types.getByUuid(CoreAttributeTypes.Name.getGuid())).thenReturn(CoreAttributeTypes.Name);
+ when(types.getByUuid(CoreAttributeTypes.QualificationMethod.getGuid())).thenReturn(
+ CoreAttributeTypes.QualificationMethod);
+ when(types.getTaggerId(CoreAttributeTypes.Name)).thenReturn("Tag");
+ when(types.getTaggerId(CoreAttributeTypes.QualificationMethod)).thenReturn(null);
+
+ txCallable.handleTxWork(connection);
+
+ verify(logger, times(1)).error("Field has invalid tagger[%s] provider and cannot be tagged - [Gamma: %s]", null,
+ 2L);
+ verify(tagger, times(1)).tagIt(Matchers.eq(resource1), Matchers.any(TagCollector.class));
+ }
+
+}
diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/sql/join/MockJoinAccessor.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/sql/join/MockJoinAccessor.java
index 597748a98c8..c375ae7c347 100644
--- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/sql/join/MockJoinAccessor.java
+++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/sql/join/MockJoinAccessor.java
@@ -12,8 +12,8 @@ package org.eclipse.osee.orcs.db.internal.sql.join;
import java.util.Collection;
import java.util.List;
-import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
+import org.eclipse.osee.jdbc.JdbcConnection;
import org.eclipse.osee.orcs.db.internal.sql.join.DatabaseJoinAccessor.JoinItem;
/**
@@ -21,13 +21,13 @@ import org.eclipse.osee.orcs.db.internal.sql.join.DatabaseJoinAccessor.JoinItem;
*/
public class MockJoinAccessor implements IJoinAccessor {
- private OseeConnection connection;
+ private JdbcConnection connection;
private JoinItem joinItem;
private int queryId;
private List