Remove other deprecated usages

Author: brfrn169

core/src/integration-test/java/com/scalar/db/storage/multistorage/MultiStorageAdminIntegrationTest.java

@@ -57,7 +57,7 @@ private Map<String, String> getCreationOptions() {
   private void initCassandraAdmin() throws ExecutionException {
     StorageFactory factory =
         StorageFactory.create(MultiStorageEnv.getPropertiesForCassandra(TEST_NAME));
-    cassandraAdmin = factory.getAdmin();
+    cassandraAdmin = factory.getStorageAdmin();
 
     // create tables
     cassandraAdmin.createNamespace(NAMESPACE1, true, getCreationOptions());
@@ -81,7 +81,7 @@ private void initCassandraAdmin() throws ExecutionException {
 
   private void initJdbcAdmin() throws ExecutionException {
     StorageFactory factory = StorageFactory.create(MultiStorageEnv.getPropertiesForJdbc(TEST_NAME));
-    jdbcAdmin = factory.getAdmin();
+    jdbcAdmin = factory.getStorageAdmin();
 
     // create tables
     jdbcAdmin.createNamespace(NAMESPACE1, true);

core/src/integration-test/java/com/scalar/db/storage/multistorage/MultiStorageIntegrationTest.java

@@ -76,14 +76,14 @@ public void beforeAll() throws ExecutionException {
   private void initCassandraAndCassandraAdmin() throws ExecutionException {
     StorageFactory factory =
         StorageFactory.create(MultiStorageEnv.getPropertiesForCassandra(TEST_NAME));
-    cassandraAdmin = factory.getAdmin();
+    cassandraAdmin = factory.getStorageAdmin();
     createTables(cassandraAdmin);
     cassandra = factory.getStorage();
   }
 
   private void initJdbcDatabaseAndJdbcAdmin() throws ExecutionException {
     StorageFactory factory = StorageFactory.create(MultiStorageEnv.getPropertiesForJdbc(TEST_NAME));
-    jdbcAdmin = factory.getAdmin();
+    jdbcAdmin = factory.getStorageAdmin();
     createTables(jdbcAdmin);
     jdbcDatabase = factory.getStorage();
   }

integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminIntegrationTestBase.java

@@ -70,7 +70,7 @@ public void beforeAll() throws Exception {
     initialize(getTestName());
     Properties properties = getProperties(getTestName());
     storageFactory = StorageFactory.create(properties);
-    admin = storageFactory.getAdmin();
+    admin = storageFactory.getStorageAdmin();
     namespace1 = getNamespace1();
     namespace2 = getNamespace2();
     namespace3 = getNamespace3();

integration-test/src/main/java/com/scalar/db/api/DistributedStorageColumnValueIntegrationTestBase.java

@@ -76,7 +76,7 @@ public abstract class DistributedStorageColumnValueIntegrationTestBase {
   public void beforeAll() throws Exception {
     initialize(TEST_NAME);
     StorageFactory factory = StorageFactory.create(getProperties(TEST_NAME));
-    admin = factory.getAdmin();
+    admin = factory.getStorageAdmin();
     namespace = getNamespace();
     createTable();
     storage = factory.getStorage();

integration-test/src/main/java/com/scalar/db/api/DistributedStorageConditionalMutationIntegrationTestBase.java

@@ -88,7 +88,7 @@ public abstract class DistributedStorageConditionalMutationIntegrationTestBase {
   public void beforeAll() throws Exception {
     initialize(TEST_NAME);
     StorageFactory factory = StorageFactory.create(getProperties(TEST_NAME));
-    admin = factory.getAdmin();
+    admin = factory.getStorageAdmin();
     namespace = getNamespace();
     createTable();
     storage = factory.getStorage();

integration-test/src/main/java/com/scalar/db/api/DistributedStorageIntegrationTestBase.java

@@ -62,7 +62,7 @@ public abstract class DistributedStorageIntegrationTestBase {
   public void beforeAll() throws Exception {
     initialize(getTestName());
     StorageFactory factory = StorageFactory.create(getProperties(getTestName()));
-    admin = factory.getAdmin();
+    admin = factory.getStorageAdmin();
     namespace = getNamespace();
     createTable();
     storage = factory.getStorage();

integration-test/src/main/java/com/scalar/db/api/DistributedStorageMultipleClusteringKeyScanIntegrationTestBase.java

@@ -80,7 +80,7 @@ private enum OrderingType {
   public void beforeAll() throws Exception {
     initialize(TEST_NAME);
     StorageFactory factory = StorageFactory.create(getProperties(TEST_NAME));
-    admin = factory.getAdmin();
+    admin = factory.getStorageAdmin();
     namespaceBaseName = getNamespaceBaseName();
     clusteringKeyTypes = getClusteringKeyTypes();
     executorService = Executors.newFixedThreadPool(getThreadNum());

integration-test/src/main/java/com/scalar/db/api/DistributedStorageMultiplePartitionKeyIntegrationTestBase.java

@@ -64,7 +64,7 @@ public abstract class DistributedStorageMultiplePartitionKeyIntegrationTestBase
   public void beforeAll() throws Exception {
     initialize(TEST_NAME);
     StorageFactory factory = StorageFactory.create(getProperties(TEST_NAME));
-    admin = factory.getAdmin();
+    admin = factory.getStorageAdmin();
     namespaceBaseName = getNamespaceBaseName();
     partitionKeyTypes = getPartitionKeyTypes();
     executorService = Executors.newFixedThreadPool(getThreadNum());

integration-test/src/main/java/com/scalar/db/api/DistributedStorageSecondaryIndexIntegrationTestBase.java

@@ -51,7 +51,7 @@ public abstract class DistributedStorageSecondaryIndexIntegrationTestBase {
   public void beforeAll() throws Exception {
     initialize(TEST_NAME);
     StorageFactory factory = StorageFactory.create(getProperties(TEST_NAME));
-    admin = factory.getAdmin();
+    admin = factory.getStorageAdmin();
     namespace = getNamespace();
     secondaryIndexTypes = getSecondaryIndexTypes();
     createTables();

integration-test/src/main/java/com/scalar/db/api/DistributedStorageSingleClusteringKeyScanIntegrationTestBase.java

@@ -61,7 +61,7 @@ private enum OrderingType {
   public void beforeAll() throws Exception {
     initialize(TEST_NAME);
     StorageFactory factory = StorageFactory.create(getProperties(TEST_NAME));
-    admin = factory.getAdmin();
+    admin = factory.getStorageAdmin();
     namespace = getNamespace();
     clusteringKeyTypes = getClusteringKeyTypes();
     createTables();