diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitAdminIntegrationTestWithCosmos.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitAdminIntegrationTestWithCosmos.java index 2d3e1e3573..95ab2e4960 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitAdminIntegrationTestWithCosmos.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitAdminIntegrationTestWithCosmos.java @@ -2,7 +2,6 @@ import com.scalar.db.transaction.consensuscommit.ConsensusCommitAdminIntegrationTestBase; import java.util.Map; -import java.util.Optional; import java.util.Properties; public class ConsensusCommitAdminIntegrationTestWithCosmos @@ -13,26 +12,6 @@ protected Properties getProps(String testName) { return CosmosEnv.getProperties(testName); } - @Override - protected String getNamespace1() { - return getNamespace(super.getNamespace1()); - } - - @Override - protected String getNamespace2() { - return getNamespace(super.getNamespace2()); - } - - @Override - protected String getNamespace3() { - return getNamespace(super.getNamespace3()); - } - - private String getNamespace(String namespace) { - Optional databasePrefix = CosmosEnv.getDatabasePrefix(); - return databasePrefix.map(prefix -> prefix + namespace).orElse(namespace); - } - @Override protected Map getCreationOptions() { return CosmosEnv.getCreationOptions(); diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitAdminRepairTableIntegrationTestWithCosmos.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitAdminRepairTableIntegrationTestWithCosmos.java index 22dc8d7577..e538a364d8 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitAdminRepairTableIntegrationTestWithCosmos.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitAdminRepairTableIntegrationTestWithCosmos.java @@ -6,7 +6,6 @@ import com.scalar.db.transaction.consensuscommit.ConsensusCommitAdminRepairTableIntegrationTestBase; import com.scalar.db.util.AdminTestUtils; import java.util.Map; -import java.util.Optional; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -18,16 +17,6 @@ protected Properties getProps(String testName) { return CosmosEnv.getProperties(testName); } - @Override - protected String getNamespace() { - return getNamespace(super.getNamespace()); - } - - private String getNamespace(String namespace) { - Optional databasePrefix = CosmosEnv.getDatabasePrefix(); - return databasePrefix.map(prefix -> prefix + namespace).orElse(namespace); - } - @Override protected Map getCreationOptions() { return CosmosEnv.getCreationOptions(); diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitIntegrationTestWithCosmos.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitIntegrationTestWithCosmos.java index 81eece0ae2..f996084c2e 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitIntegrationTestWithCosmos.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitIntegrationTestWithCosmos.java @@ -2,7 +2,6 @@ import com.scalar.db.transaction.consensuscommit.ConsensusCommitIntegrationTestBase; import java.util.Map; -import java.util.Optional; import java.util.Properties; public class ConsensusCommitIntegrationTestWithCosmos extends ConsensusCommitIntegrationTestBase { @@ -12,13 +11,6 @@ protected Properties getProps(String testName) { return CosmosEnv.getProperties(testName); } - @Override - protected String getNamespaceBaseName() { - String namespaceBaseName = super.getNamespaceBaseName(); - Optional databasePrefix = CosmosEnv.getDatabasePrefix(); - return databasePrefix.map(prefix -> prefix + namespaceBaseName).orElse(namespaceBaseName); - } - @Override protected Map getCreationOptions() { return CosmosEnv.getCreationOptions(); diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitSpecificIntegrationTestWithCosmos.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitSpecificIntegrationTestWithCosmos.java index 6e2d42de3d..7cc70a3544 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitSpecificIntegrationTestWithCosmos.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/ConsensusCommitSpecificIntegrationTestWithCosmos.java @@ -2,7 +2,6 @@ import com.scalar.db.transaction.consensuscommit.ConsensusCommitSpecificIntegrationTestBase; import java.util.Map; -import java.util.Optional; import java.util.Properties; public class ConsensusCommitSpecificIntegrationTestWithCosmos @@ -13,21 +12,6 @@ protected Properties getProperties(String testName) { return CosmosEnv.getProperties(testName); } - @Override - protected String getNamespace1() { - return getNamespace(super.getNamespace1()); - } - - @Override - protected String getNamespace2() { - return getNamespace(super.getNamespace2()); - } - - private String getNamespace(String namespace) { - Optional databasePrefix = CosmosEnv.getDatabasePrefix(); - return databasePrefix.map(prefix -> prefix + namespace).orElse(namespace); - } - @Override protected Map getCreationOptions() { return CosmosEnv.getCreationOptions(); diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosAdminIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosAdminIntegrationTest.java index 644c1fe065..7b46ebb40d 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosAdminIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosAdminIntegrationTest.java @@ -2,7 +2,6 @@ import com.scalar.db.api.DistributedStorageAdminIntegrationTestBase; import java.util.Map; -import java.util.Optional; import java.util.Properties; public class CosmosAdminIntegrationTest extends DistributedStorageAdminIntegrationTestBase { @@ -12,26 +11,6 @@ protected Properties getProperties(String testName) { return CosmosEnv.getProperties(testName); } - @Override - protected String getNamespace1() { - return getNamespace(super.getNamespace1()); - } - - @Override - protected String getNamespace2() { - return getNamespace(super.getNamespace2()); - } - - @Override - protected String getNamespace3() { - return getNamespace(super.getNamespace3()); - } - - private String getNamespace(String namespace) { - Optional databasePrefix = CosmosEnv.getDatabasePrefix(); - return databasePrefix.map(prefix -> prefix + namespace).orElse(namespace); - } - @Override protected Map getCreationOptions() { return CosmosEnv.getCreationOptions(); diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosAdminRepairTableIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosAdminRepairTableIntegrationTest.java index 5c18f243b3..5458b3afd8 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosAdminRepairTableIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosAdminRepairTableIntegrationTest.java @@ -6,7 +6,6 @@ import com.scalar.db.exception.storage.ExecutionException; import com.scalar.db.util.AdminTestUtils; import java.util.Map; -import java.util.Optional; import java.util.Properties; import org.junit.jupiter.api.Test; @@ -18,16 +17,6 @@ protected Properties getProperties(String testName) { return CosmosEnv.getProperties(testName); } - @Override - protected String getNamespace() { - return getNamespace(super.getNamespace()); - } - - private String getNamespace(String namespace) { - Optional databasePrefix = CosmosEnv.getDatabasePrefix(); - return databasePrefix.map(prefix -> prefix + namespace).orElse(namespace); - } - @Override protected Map getCreationOptions() { return CosmosEnv.getCreationOptions(); diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosColumnValueIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosColumnValueIntegrationTest.java index f7513204da..5aa6648f9e 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosColumnValueIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosColumnValueIntegrationTest.java @@ -2,7 +2,6 @@ import com.scalar.db.api.DistributedStorageColumnValueIntegrationTestBase; import java.util.Map; -import java.util.Optional; import java.util.Properties; public class CosmosColumnValueIntegrationTest @@ -12,13 +11,6 @@ protected Properties getProperties(String testName) { return CosmosEnv.getProperties(testName); } - @Override - protected String getNamespace() { - String namespace = super.getNamespace(); - Optional databasePrefix = CosmosEnv.getDatabasePrefix(); - return databasePrefix.map(prefix -> prefix + namespace).orElse(namespace); - } - @Override protected Map getCreationOptions() { return CosmosEnv.getCreationOptions(); diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosConditionalMutationIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosConditionalMutationIntegrationTest.java index 6d5e1ccba7..109a183121 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosConditionalMutationIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosConditionalMutationIntegrationTest.java @@ -6,7 +6,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.Properties; public class CosmosConditionalMutationIntegrationTest @@ -16,13 +15,6 @@ protected Properties getProperties(String testName) { return CosmosEnv.getProperties(testName); } - @Override - protected String getNamespace() { - String namespace = super.getNamespace(); - Optional databasePrefix = CosmosEnv.getDatabasePrefix(); - return databasePrefix.map(prefix -> prefix + namespace).orElse(namespace); - } - @Override protected int getThreadNum() { return 3; diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosEnv.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosEnv.java index c1c0c755b0..acb57b434f 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosEnv.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosEnv.java @@ -2,16 +2,12 @@ import com.google.common.collect.ImmutableMap; import com.scalar.db.config.DatabaseConfig; -import com.scalar.db.transaction.consensuscommit.ConsensusCommitConfig; -import com.scalar.db.transaction.consensuscommit.Coordinator; import java.util.Map; -import java.util.Optional; import java.util.Properties; public final class CosmosEnv { private static final String PROP_COSMOS_URI = "scalardb.cosmos.uri"; private static final String PROP_COSMOS_PASSWORD = "scalardb.cosmos.password"; - private static final String PROP_COSMOS_DATABASE_PREFIX = "scalardb.cosmos.database_prefix"; private static final String PROP_COSMOS_CREATE_OPTIONS = "scalardb.cosmos.create_options"; private static final ImmutableMap DEFAULT_COSMOS_CREATE_OPTIONS = @@ -22,35 +18,19 @@ private CosmosEnv() {} public static Properties getProperties(String testName) { String contactPoint = System.getProperty(PROP_COSMOS_URI); String password = System.getProperty(PROP_COSMOS_PASSWORD); - Optional databasePrefix = getDatabasePrefix(); Properties props = new Properties(); props.setProperty(DatabaseConfig.CONTACT_POINTS, contactPoint); props.setProperty(DatabaseConfig.PASSWORD, password); props.setProperty(DatabaseConfig.STORAGE, "cosmos"); - if (databasePrefix.isPresent()) { - // Add the prefix and testName as a metadata database suffix - props.setProperty( - CosmosConfig.TABLE_METADATA_DATABASE, - databasePrefix.get() + CosmosAdmin.METADATA_DATABASE + "_" + testName); - - props.setProperty( - ConsensusCommitConfig.COORDINATOR_NAMESPACE, - databasePrefix.get() + Coordinator.NAMESPACE); - } else { - // Add testName as a metadata database suffix - props.setProperty( - CosmosConfig.TABLE_METADATA_DATABASE, CosmosAdmin.METADATA_DATABASE + "_" + testName); - } + // Add testName as a metadata database suffix + props.setProperty( + CosmosConfig.TABLE_METADATA_DATABASE, CosmosAdmin.METADATA_DATABASE + "_" + testName); return props; } - public static Optional getDatabasePrefix() { - return Optional.ofNullable(System.getProperty(PROP_COSMOS_DATABASE_PREFIX)); - } - public static Map getCreationOptions() { String createOptionsString = System.getProperty(PROP_COSMOS_CREATE_OPTIONS); if (createOptionsString == null) { diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosIntegrationTest.java index 2fa4f46afc..797ecad64d 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosIntegrationTest.java @@ -2,7 +2,6 @@ import com.scalar.db.api.DistributedStorageIntegrationTestBase; import java.util.Map; -import java.util.Optional; import java.util.Properties; public class CosmosIntegrationTest extends DistributedStorageIntegrationTestBase { @@ -12,13 +11,6 @@ protected Properties getProperties(String testName) { return CosmosEnv.getProperties(testName); } - @Override - protected String getNamespace() { - String namespace = super.getNamespace(); - Optional databasePrefix = CosmosEnv.getDatabasePrefix(); - return databasePrefix.map(prefix -> prefix + namespace).orElse(namespace); - } - @Override protected Map getCreationOptions() { return CosmosEnv.getCreationOptions(); diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosMultipleClusteringKeyScanIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosMultipleClusteringKeyScanIntegrationTest.java index 080653ee4a..ad97f1a7c3 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosMultipleClusteringKeyScanIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosMultipleClusteringKeyScanIntegrationTest.java @@ -5,7 +5,6 @@ import com.scalar.db.api.DistributedStorageMultipleClusteringKeyScanIntegrationTestBase; import com.scalar.db.io.DataType; import java.util.Map; -import java.util.Optional; import java.util.Properties; public class CosmosMultipleClusteringKeyScanIntegrationTest @@ -16,13 +15,6 @@ protected Properties getProperties(String testName) { return CosmosEnv.getProperties(testName); } - @Override - protected String getNamespaceBaseName() { - String namespaceBaseName = super.getNamespaceBaseName(); - Optional databasePrefix = CosmosEnv.getDatabasePrefix(); - return databasePrefix.map(prefix -> prefix + namespaceBaseName).orElse(namespaceBaseName); - } - @Override protected ListMultimap getClusteringKeyTypes() { // Return types without BLOB because blob is not supported for clustering key for now diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosMultiplePartitionKeyIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosMultiplePartitionKeyIntegrationTest.java index 0d7e4309b7..bc6a1b6ad6 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosMultiplePartitionKeyIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosMultiplePartitionKeyIntegrationTest.java @@ -2,7 +2,6 @@ import com.scalar.db.api.DistributedStorageMultiplePartitionKeyIntegrationTestBase; import java.util.Map; -import java.util.Optional; import java.util.Properties; public class CosmosMultiplePartitionKeyIntegrationTest @@ -12,13 +11,6 @@ protected Properties getProperties(String testName) { return CosmosEnv.getProperties(testName); } - @Override - protected String getNamespaceBaseName() { - String namespaceBaseName = super.getNamespaceBaseName(); - Optional databasePrefix = CosmosEnv.getDatabasePrefix(); - return databasePrefix.map(prefix -> prefix + namespaceBaseName).orElse(namespaceBaseName); - } - @Override protected int getThreadNum() { return 3; diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosSchemaLoaderIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosSchemaLoaderIntegrationTest.java index 490795e609..78d2998252 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosSchemaLoaderIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosSchemaLoaderIntegrationTest.java @@ -2,7 +2,6 @@ import com.scalar.db.schemaloader.SchemaLoaderIntegrationTestBase; import com.scalar.db.util.AdminTestUtils; -import java.util.Optional; import java.util.Properties; public class CosmosSchemaLoaderIntegrationTest extends SchemaLoaderIntegrationTestBase { @@ -12,21 +11,6 @@ protected Properties getProperties(String testName) { return CosmosEnv.getProperties(testName); } - @Override - protected String getNamespace1() { - return getNamespace(super.getNamespace1()); - } - - @Override - protected String getNamespace2() { - return getNamespace(super.getNamespace2()); - } - - private String getNamespace(String namespace) { - Optional databasePrefix = CosmosEnv.getDatabasePrefix(); - return databasePrefix.map(prefix -> prefix + namespace).orElse(namespace); - } - @Override protected AdminTestUtils getAdminTestUtils(String testName) { return new CosmosAdminTestUtils(getProperties(testName)); diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosSecondaryIndexIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosSecondaryIndexIntegrationTest.java index 4fa96b9b00..e021b487ca 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosSecondaryIndexIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosSecondaryIndexIntegrationTest.java @@ -2,7 +2,6 @@ import com.scalar.db.api.DistributedStorageSecondaryIndexIntegrationTestBase; import java.util.Map; -import java.util.Optional; import java.util.Properties; public class CosmosSecondaryIndexIntegrationTest @@ -12,13 +11,6 @@ protected Properties getProperties(String testName) { return CosmosEnv.getProperties(testName); } - @Override - protected String getNamespace() { - String namespace = super.getNamespace(); - Optional databasePrefix = CosmosEnv.getDatabasePrefix(); - return databasePrefix.map(prefix -> prefix + namespace).orElse(namespace); - } - @Override protected Map getCreationOptions() { return CosmosEnv.getCreationOptions(); diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosSingleClusteringKeyScanIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosSingleClusteringKeyScanIntegrationTest.java index 5fee773aff..c3e77f4c1a 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosSingleClusteringKeyScanIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosSingleClusteringKeyScanIntegrationTest.java @@ -4,7 +4,6 @@ import com.scalar.db.io.DataType; import java.util.HashSet; import java.util.Map; -import java.util.Optional; import java.util.Properties; import java.util.Set; @@ -15,13 +14,6 @@ protected Properties getProperties(String testName) { return CosmosEnv.getProperties(testName); } - @Override - protected String getNamespace() { - String namespace = super.getNamespace(); - Optional databasePrefix = CosmosEnv.getDatabasePrefix(); - return databasePrefix.map(prefix -> prefix + namespace).orElse(namespace); - } - @Override protected Set getClusteringKeyTypes() { // Return types without BLOB because blob is not supported for clustering key for now diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosSinglePartitionKeyIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosSinglePartitionKeyIntegrationTest.java index e959fa7f28..82c81e1c23 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosSinglePartitionKeyIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosSinglePartitionKeyIntegrationTest.java @@ -2,7 +2,6 @@ import com.scalar.db.api.DistributedStorageSinglePartitionKeyIntegrationTestBase; import java.util.Map; -import java.util.Optional; import java.util.Properties; public class CosmosSinglePartitionKeyIntegrationTest @@ -12,13 +11,6 @@ protected Properties getProperties(String testName) { return CosmosEnv.getProperties(testName); } - @Override - protected String getNamespace() { - String namespace = super.getNamespace(); - Optional databasePrefix = CosmosEnv.getDatabasePrefix(); - return databasePrefix.map(prefix -> prefix + namespace).orElse(namespace); - } - @Override protected Map getCreationOptions() { return CosmosEnv.getCreationOptions(); diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosWithReservedKeywordIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosWithReservedKeywordIntegrationTest.java index 0a368f5c75..cbae4c4982 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosWithReservedKeywordIntegrationTest.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/CosmosWithReservedKeywordIntegrationTest.java @@ -2,7 +2,6 @@ import com.scalar.db.api.DistributedStorageWithReservedKeywordIntegrationTestBase; import java.util.Map; -import java.util.Optional; import java.util.Properties; public class CosmosWithReservedKeywordIntegrationTest @@ -15,9 +14,7 @@ protected Properties getProperties(String testName) { @Override protected String getNamespace() { - String namespace = "reserved_keyword_test"; - Optional databasePrefix = CosmosEnv.getDatabasePrefix(); - return databasePrefix.map(prefix -> prefix + namespace).orElse(namespace); + return "reserved_keyword_test"; } @Override diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/TwoPhaseConsensusCommitIntegrationTestWithCosmos.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/TwoPhaseConsensusCommitIntegrationTestWithCosmos.java index 42c04f4c98..76c13a37a7 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/TwoPhaseConsensusCommitIntegrationTestWithCosmos.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/TwoPhaseConsensusCommitIntegrationTestWithCosmos.java @@ -2,7 +2,6 @@ import com.scalar.db.transaction.consensuscommit.TwoPhaseConsensusCommitIntegrationTestBase; import java.util.Map; -import java.util.Optional; import java.util.Properties; public class TwoPhaseConsensusCommitIntegrationTestWithCosmos @@ -13,13 +12,6 @@ protected Properties getProps1(String testName) { return CosmosEnv.getProperties(testName); } - @Override - protected String getNamespaceBaseName() { - String namespaceBaseName = super.getNamespaceBaseName(); - Optional databasePrefix = CosmosEnv.getDatabasePrefix(); - return databasePrefix.map(prefix -> prefix + namespaceBaseName).orElse(namespaceBaseName); - } - @Override protected Map getCreationOptions() { return CosmosEnv.getCreationOptions(); diff --git a/core/src/integration-test/java/com/scalar/db/storage/cosmos/TwoPhaseConsensusCommitSpecificIntegrationTestWithCosmos.java b/core/src/integration-test/java/com/scalar/db/storage/cosmos/TwoPhaseConsensusCommitSpecificIntegrationTestWithCosmos.java index 086ce2a161..6059c3d3d5 100644 --- a/core/src/integration-test/java/com/scalar/db/storage/cosmos/TwoPhaseConsensusCommitSpecificIntegrationTestWithCosmos.java +++ b/core/src/integration-test/java/com/scalar/db/storage/cosmos/TwoPhaseConsensusCommitSpecificIntegrationTestWithCosmos.java @@ -2,7 +2,6 @@ import com.scalar.db.transaction.consensuscommit.TwoPhaseConsensusCommitSpecificIntegrationTestBase; import java.util.Map; -import java.util.Optional; import java.util.Properties; public class TwoPhaseConsensusCommitSpecificIntegrationTestWithCosmos @@ -13,21 +12,6 @@ protected Properties getProperties1(String testName) { return CosmosEnv.getProperties(testName); } - @Override - protected String getNamespace1() { - return getNamespace(super.getNamespace1()); - } - - @Override - protected String getNamespace2() { - return getNamespace(super.getNamespace2()); - } - - private String getNamespace(String namespace) { - Optional databasePrefix = CosmosEnv.getDatabasePrefix(); - return databasePrefix.map(prefix -> prefix + namespace).orElse(namespace); - } - @Override protected Map getCreationOptions() { return CosmosEnv.getCreationOptions();