Rename ViewMetaDataPersistService.drop()

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/TableMetaDataPersistService.java

@@ -43,6 +43,8 @@ public final class TableMetaDataPersistService {
 
     private final MetaDataVersionPersistService metaDataVersionPersistService;
 
+    private final YamlTableSwapper swapper = new YamlTableSwapper();
+
     /**
      * Load tables.
      *
@@ -64,9 +66,8 @@ public Collection<ShardingSphereTable> load(final String databaseName, final Str
      * @return loaded table
      */
     public ShardingSphereTable load(final String databaseName, final String schemaName, final String tableName) {
-        String tableContent = repository.query(TableMetaDataNodePath.getTableVersionPath(databaseName, schemaName, tableName,
-                repository.query(TableMetaDataNodePath.getTableActiveVersionPath(databaseName, schemaName, tableName))));
-        return new YamlTableSwapper().swapToObject(YamlEngine.unmarshal(tableContent, YamlShardingSphereTable.class));
+        String tableContent = repository.query(TableMetaDataNodePath.getTableVersionPath(databaseName, schemaName, tableName, getActiveVersion(databaseName, schemaName, tableName)));
+        return swapper.swapToObject(YamlEngine.unmarshal(tableContent, YamlShardingSphereTable.class));
     }
 
     /**
@@ -82,13 +83,12 @@ public void persist(final String databaseName, final String schemaName, final Co
             String tableName = each.getName().toLowerCase();
             List<String> versions = metaDataVersionPersistService.getVersions(TableMetaDataNodePath.getTableVersionsPath(databaseName, schemaName, tableName));
             String nextActiveVersion = versions.isEmpty() ? MetaDataVersion.DEFAULT_VERSION : String.valueOf(Integer.parseInt(versions.get(0)) + 1);
-            repository.persist(
-                    TableMetaDataNodePath.getTableVersionPath(databaseName, schemaName, tableName, nextActiveVersion), YamlEngine.marshal(new YamlTableSwapper().swapToYamlConfiguration(each)));
+            repository.persist(TableMetaDataNodePath.getTableVersionPath(databaseName, schemaName, tableName, nextActiveVersion), YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
             if (Strings.isNullOrEmpty(getActiveVersion(databaseName, schemaName, tableName))) {
                 repository.persist(TableMetaDataNodePath.getTableActiveVersionPath(databaseName, schemaName, tableName), MetaDataVersion.DEFAULT_VERSION);
             }
-            metaDataVersions
-                    .add(new MetaDataVersion(TableMetaDataNodePath.getTablePath(databaseName, schemaName, tableName), getActiveVersion(databaseName, schemaName, tableName), nextActiveVersion));
+            metaDataVersions.add(
+                    new MetaDataVersion(TableMetaDataNodePath.getTablePath(databaseName, schemaName, tableName), getActiveVersion(databaseName, schemaName, tableName), nextActiveVersion));
         }
         metaDataVersionPersistService.switchActiveVersion(metaDataVersions);
     }
@@ -100,8 +100,8 @@ private String getActiveVersion(final String databaseName, final String schemaNa
     /**
      * Drop table.
      *
-     * @param databaseName to be dropped database name
-     * @param schemaName to be dropped schema name
+     * @param databaseName database name
+     * @param schemaName schema name
      * @param tableName to be dropped table name
      */
     public void drop(final String databaseName, final String schemaName, final String tableName) {
@@ -111,8 +111,8 @@ public void drop(final String databaseName, final String schemaName, final Strin
     /**
      * Drop tables.
      *
-     * @param databaseName to be dropped database name
-     * @param schemaName to be dropped schema name
+     * @param databaseName database name
+     * @param schemaName schema name
      * @param tables to be dropped tables
      */
     public void drop(final String databaseName, final String schemaName, final Collection<ShardingSphereTable> tables) {

mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/table/ViewMetaDataPersistService.java

@@ -43,6 +43,8 @@ public final class ViewMetaDataPersistService {
 
     private final MetaDataVersionPersistService metaDataVersionPersistService;
 
+    private final YamlViewSwapper swapper = new YamlViewSwapper();
+
     /**
      * Load views.
      *
@@ -63,9 +65,8 @@ public Collection<ShardingSphereView> load(final String databaseName, final Stri
      * @return loaded view
      */
     public ShardingSphereView load(final String databaseName, final String schemaName, final String viewName) {
-        String view = repository.query(ViewMetaDataNodePath.getViewVersionPath(databaseName, schemaName, viewName,
-                repository.query(ViewMetaDataNodePath.getViewActiveVersionPath(databaseName, schemaName, viewName))));
-        return new YamlViewSwapper().swapToObject(YamlEngine.unmarshal(view, YamlShardingSphereView.class));
+        String view = repository.query(ViewMetaDataNodePath.getViewVersionPath(databaseName, schemaName, viewName, getActiveVersion(databaseName, schemaName, viewName)));
+        return swapper.swapToObject(YamlEngine.unmarshal(view, YamlShardingSphereView.class));
     }
 
     /**
@@ -81,8 +82,7 @@ public void persist(final String databaseName, final String schemaName, final Co
             String viewName = each.getName().toLowerCase();
             List<String> versions = metaDataVersionPersistService.getVersions(ViewMetaDataNodePath.getViewVersionsPath(databaseName, schemaName, viewName));
             String nextActiveVersion = versions.isEmpty() ? MetaDataVersion.DEFAULT_VERSION : String.valueOf(Integer.parseInt(versions.get(0)) + 1);
-            repository.persist(ViewMetaDataNodePath.getViewVersionPath(databaseName, schemaName, viewName, nextActiveVersion),
-                    YamlEngine.marshal(new YamlViewSwapper().swapToYamlConfiguration(each)));
+            repository.persist(ViewMetaDataNodePath.getViewVersionPath(databaseName, schemaName, viewName, nextActiveVersion), YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
             if (Strings.isNullOrEmpty(getActiveVersion(databaseName, schemaName, viewName))) {
                 repository.persist(ViewMetaDataNodePath.getViewActiveVersionPath(databaseName, schemaName, viewName), MetaDataVersion.DEFAULT_VERSION);
             }
@@ -96,13 +96,13 @@ private String getActiveVersion(final String databaseName, final String schemaNa
     }
 
     /**
-     * Delete view.
+     * Drop view.
      *
      * @param databaseName database name
      * @param schemaName schema name
-     * @param viewName view name
+     * @param viewName to be dropped view name
      */
-    public void delete(final String databaseName, final String schemaName, final String viewName) {
+    public void drop(final String databaseName, final String schemaName, final String viewName) {
         repository.delete(ViewMetaDataNodePath.getViewPath(databaseName, schemaName, viewName.toLowerCase()));
     }
 }

mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/service/metadata/table/ViewMetaDataPersistServiceTest.java

@@ -82,8 +82,8 @@ void assertPersistWithVersion() {
     }
 
     @Test
-    void assertDelete() {
-        persistService.delete("foo_db", "foo_schema", "foo_view");
+    void assertDrop() {
+        persistService.drop("foo_db", "foo_schema", "foo_view");
         verify(repository).delete("/metadata/foo_db/schemas/foo_schema/views/foo_view");
     }
 }

mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistService.java

@@ -93,7 +93,7 @@ public void alterSchema(final String databaseName, final String schemaName,
         databaseMetaDataFacade.getTable().persist(databaseName, schemaName, alteredTables);
         databaseMetaDataFacade.getView().persist(databaseName, schemaName, alteredViews);
         droppedTables.forEach(each -> databaseMetaDataFacade.getTable().drop(databaseName, schemaName, each));
-        droppedViews.forEach(each -> databaseMetaDataFacade.getView().delete(databaseName, schemaName, each));
+        droppedViews.forEach(each -> databaseMetaDataFacade.getView().drop(databaseName, schemaName, each));
     }
 
     @Override

mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/persist/service/StandaloneMetaDataManagerPersistService.java

@@ -97,7 +97,7 @@ public void alterSchema(final String databaseName, final String schemaName,
         databaseMetaDataFacade.getTable().persist(databaseName, schemaName, alteredTables);
         databaseMetaDataFacade.getView().persist(databaseName, schemaName, alteredViews);
         droppedTables.forEach(each -> databaseMetaDataFacade.getTable().drop(databaseName, schemaName, each));
-        droppedViews.forEach(each -> databaseMetaDataFacade.getView().delete(databaseName, schemaName, each));
+        droppedViews.forEach(each -> databaseMetaDataFacade.getView().drop(databaseName, schemaName, each));
         alteredTables.forEach(each -> metaDataContextManager.getDatabaseMetaDataManager().alterTable(databaseName, schemaName, each));
         alteredViews.forEach(each -> metaDataContextManager.getDatabaseMetaDataManager().alterView(databaseName, schemaName, each));
         droppedTables.forEach(each -> metaDataContextManager.getDatabaseMetaDataManager().dropTable(databaseName, schemaName, each));