Refactor materialized views package

apache · Jan 13, 2025 · 948876a · 948876a
1 parent bba9f4b
commit 948876a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 73 deletions.
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/tasks/RefreshMaterializedViews.java b/baremaps-core/src/main/java/org/apache/baremaps/tasks/RefreshMaterializedViews.java
@@ -19,9 +19,9 @@
 
 import java.sql.SQLException;
 import javax.sql.DataSource;
-import org.apache.baremaps.postgres.graph.DatabaseMetadataRetriever;
-import org.apache.baremaps.postgres.graph.DependencyGraphBuilder;
-import org.apache.baremaps.postgres.graph.MaterializedViewRefresher;
+import org.apache.baremaps.postgres.refresh.DatabaseMetadataRetriever;
+import org.apache.baremaps.postgres.refresh.DependencyGraphBuilder;
+import org.apache.baremaps.postgres.refresh.MaterializedViewRefresher;
 import org.apache.baremaps.workflow.Task;
 import org.apache.baremaps.workflow.WorkflowContext;
 import org.slf4j.Logger;
@@ -33,20 +33,22 @@ public class RefreshMaterializedViews implements Task {
 
   private Object database;
 
+  private String schema = "public";
+
   public RefreshMaterializedViews() {
     // Default constructor
   }
 
-  public RefreshMaterializedViews(Object database) {
+  public RefreshMaterializedViews(Object database, String schema) {
     this.database = database;
+    this.schema = schema;
   }
 
   @Override
   public void execute(WorkflowContext context) throws Exception {
     DataSource dataSource = context.getDataSource(database);
     try (var connection = dataSource.getConnection()) {
       LOGGER.info("Connected to PostgreSQL database.");
-      var schema = "public";
 
       // 1. Retrieve database objects (tables, views, materialized views).
       var objects = DatabaseMetadataRetriever.getObjects(connection, schema);

diff --git a/baremaps-postgres/src/main/java/org/apache/baremaps/postgres/graph/RefreshApp.java b/baremaps-postgres/src/main/java/org/apache/baremaps/postgres/graph/RefreshApp.java
diff --git a/...gres/graph/DatabaseMetadataRetriever.java → ...es/refresh/DatabaseMetadataRetriever.java b/...gres/graph/DatabaseMetadataRetriever.java → ...es/refresh/DatabaseMetadataRetriever.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.postgres.graph;
+package org.apache.baremaps.postgres.refresh;
 
 import java.sql.Connection;
 import java.sql.SQLException;

diff --git a/...ostgres/graph/DependencyGraphBuilder.java → ...tgres/refresh/DependencyGraphBuilder.java b/...ostgres/graph/DependencyGraphBuilder.java → ...tgres/refresh/DependencyGraphBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.postgres.graph;
+package org.apache.baremaps.postgres.refresh;
 
 import com.google.common.graph.GraphBuilder;
 import com.google.common.graph.MutableGraph;
@@ -25,8 +25,8 @@
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import org.apache.baremaps.postgres.graph.DatabaseMetadataRetriever.DatabaseDependency;
-import org.apache.baremaps.postgres.graph.DatabaseMetadataRetriever.DatabaseObject;
+import org.apache.baremaps.postgres.refresh.DatabaseMetadataRetriever.DatabaseDependency;
+import org.apache.baremaps.postgres.refresh.DatabaseMetadataRetriever.DatabaseObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...gres/graph/MaterializedViewRefresher.java → ...es/refresh/MaterializedViewRefresher.java b/...gres/graph/MaterializedViewRefresher.java → ...es/refresh/MaterializedViewRefresher.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.baremaps.postgres.graph;
+package org.apache.baremaps.postgres.refresh;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
-import org.apache.baremaps.postgres.graph.DatabaseMetadataRetriever.DatabaseIndex;
-import org.apache.baremaps.postgres.graph.DatabaseMetadataRetriever.DatabaseObject;
-import org.apache.baremaps.postgres.graph.DatabaseMetadataRetriever.ObjectType;
+import org.apache.baremaps.postgres.refresh.DatabaseMetadataRetriever.DatabaseIndex;
+import org.apache.baremaps.postgres.refresh.DatabaseMetadataRetriever.DatabaseObject;
+import org.apache.baremaps.postgres.refresh.DatabaseMetadataRetriever.ObjectType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;