Apply suggestions

Author: KodaiD

core/src/main/java/com/scalar/db/storage/cosmos/CosmosAdmin.java

@@ -57,13 +57,13 @@ public class CosmosAdmin implements DistributedStorageAdmin {
 
   public static final String TABLE_METADATA_CONTAINER = "metadata";
   public static final String NAMESPACES_CONTAINER = "namespaces";
-  @VisibleForTesting public static final String STORED_PROCEDURE_FILE_NAME = "mutate.js";
   private static final String ID = "id";
   private static final String CONCATENATED_PARTITION_KEY = "concatenatedPartitionKey";
   private static final String PARTITION_KEY_PATH = "/" + CONCATENATED_PARTITION_KEY;
   private static final String CLUSTERING_KEY_PATH_PREFIX = "/clusteringKey/";
   private static final String SECONDARY_INDEX_KEY_PATH_PREFIX = "/values/";
   private static final String EXCLUDED_PATH = "/*";
+  @VisibleForTesting public static final String STORED_PROCEDURE_FILE_NAME = "mutate.js";
   private static final String STORED_PROCEDURE_PATH =
       "cosmosdb_stored_procedure/" + STORED_PROCEDURE_FILE_NAME;
   private static final StorageInfo STORAGE_INFO =

core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTest.java

@@ -2187,6 +2187,12 @@ public void dropNamespace_WithNonScalarDBTableLeftForOracle_ShouldThrowIllegalAr
         RdbEngine.ORACLE);
   }
 
+  @Test
+  public void dropNamespace_WithNonScalarDBTableLeftForSqlite_ShouldThrowIllegalArgumentException()
+      throws Exception {
+    // Do nothing. SQLite does not have a concept of namespaces.
+  }
+
   @Test
   public void dropNamespace_WithNonScalarDBTableLeftForDb2_ShouldThrowIllegalArgumentException()
       throws Exception {
@@ -2203,19 +2209,14 @@ private void dropNamespace_WithNonScalarDBTableLeftForX_ShouldThrowIllegalArgume
     Statement dropNamespaceStatementMock = mock(Statement.class);
     PreparedStatement deleteFromNamespaceTableMock = mock(PreparedStatement.class);
     Statement selectNamespaceStatementMock = mock(Statement.class);
-    if (rdbEngine != RdbEngine.SQLITE) {
-      PreparedStatement getTableNamesPrepStmt = mock(PreparedStatement.class);
-      when(connection.createStatement())
-          .thenReturn(dropNamespaceStatementMock, selectNamespaceStatementMock);
-      ResultSet emptyResultSet = mock(ResultSet.class);
-      when(emptyResultSet.next()).thenReturn(true).thenReturn(false);
-      when(getTableNamesPrepStmt.executeQuery()).thenReturn(emptyResultSet);
-      when(connection.prepareStatement(anyString()))
-          .thenReturn(getTableNamesPrepStmt, deleteFromNamespaceTableMock);
-    } else {
-      when(connection.createStatement()).thenReturn(selectNamespaceStatementMock);
-      when(connection.prepareStatement(anyString())).thenReturn(deleteFromNamespaceTableMock);
-    }
+    PreparedStatement getTableNamesPrepStmt = mock(PreparedStatement.class);
+    when(connection.createStatement())
+        .thenReturn(dropNamespaceStatementMock, selectNamespaceStatementMock);
+    ResultSet emptyResultSet = mock(ResultSet.class);
+    when(emptyResultSet.next()).thenReturn(true).thenReturn(false);
+    when(getTableNamesPrepStmt.executeQuery()).thenReturn(emptyResultSet);
+    when(connection.prepareStatement(anyString()))
+        .thenReturn(getTableNamesPrepStmt, deleteFromNamespaceTableMock);
     when(dataSource.getConnection()).thenReturn(connection);
     // Namespaces table does not contain other namespaces
     ResultSet resultSet = mock(ResultSet.class);