Format code

Author: bchapuis

baremaps-calcite/src/main/java/org/apache/baremaps/calcite/flatgeobuf/FlatGeoBufTable.java

@@ -62,7 +62,7 @@ public FlatGeoBufTable(File file) throws IOException {
     this.file = file;
     this.reader = new FlatGeoBufReader(FileChannel.open(file.toPath(), StandardOpenOption.READ));
     this.tableName = file.getName();
-    
+
     // Read header to get columns information
     FlatGeoBuf.Header header = reader.readHeader();
     this.columns = header.columns();
@@ -89,12 +89,12 @@ private RelDataType createRowType(RelDataTypeFactory typeFactory) {
     for (FlatGeoBuf.Column column : columns) {
       SqlTypeName sqlTypeName = mapFlatGeoBufTypeToSqlType(column.type());
       RelDataType fieldType = typeFactory.createSqlType(sqlTypeName);
-      
+
       // Handle nullability
       if (column.nullable()) {
         fieldType = typeFactory.createTypeWithNullability(fieldType, true);
       }
-      
+
       builder.add(column.name(), fieldType);
     }
 
@@ -178,10 +178,10 @@ public boolean moveNext() {
 
         // Convert feature to row
         List<Object> values = new ArrayList<>();
-        
+
         // Add properties
         values.addAll(feature.properties());
-        
+
         // Add geometry
         values.add(feature.geometry());
 

baremaps-calcite/src/main/java/org/apache/baremaps/calcite/postgis/PostgisSchema.java

@@ -32,8 +32,9 @@
 /**
  * A Calcite schema backed by PostGIS.
  * 
- * <p>This schema exposes tables in a PostgreSQL database with PostGIS extensions 
- * as Calcite tables.</p>
+ * <p>
+ * This schema exposes tables in a PostgreSQL database with PostGIS extensions as Calcite tables.
+ * </p>
  */
 public class PostgisSchema extends AbstractSchema {
 
@@ -56,15 +57,15 @@ public PostgisSchema(DataSource dataSource, String schemaName) {
   protected Map<String, Table> getTableMap() {
     if (tableMap == null) {
       tableMap = new HashMap<>();
-      
+
       try {
         // Use DatabaseMetadata to get all tables in the schema
         DatabaseMetadata metadata = new DatabaseMetadata(dataSource);
-        var tables = metadata.getTableMetaData(null, schemaName, null, new String[]{"BASE TABLE"});
-        
+        var tables = metadata.getTableMetaData(null, schemaName, null, new String[] {"BASE TABLE"});
+
         // Find tables with geometry columns
         Set<String> tablesWithGeometry = findTablesWithGeometry();
-        
+
         // Create a PostgisTable for each table with geometry columns
         for (TableMetadata tableMetadata : tables) {
           String tableName = tableMetadata.table().tableName();
@@ -76,10 +77,10 @@ protected Map<String, Table> getTableMap() {
         throw new RuntimeException("Error getting tables from schema: " + schemaName, e);
       }
     }
-    
+
     return tableMap;
   }
-  
+
   /**
    * Find all tables that have geometry columns.
    *
@@ -90,10 +91,10 @@ private Set<String> findTablesWithGeometry() throws SQLException {
     try (Connection connection = dataSource.getConnection()) {
       // Query to get all tables with geometry columns
       String sql = "SELECT DISTINCT f_table_name FROM geometry_columns WHERE f_table_schema = ?";
-      
+
       try (var stmt = connection.prepareStatement(sql)) {
         stmt.setString(1, schemaName);
-        
+
         try (ResultSet rs = stmt.executeQuery()) {
           Set<String> result = new java.util.HashSet<>();
           while (rs.next()) {
@@ -104,4 +105,4 @@ private Set<String> findTablesWithGeometry() throws SQLException {
       }
     }
   }
-} 
+}

baremaps-calcite/src/main/java/org/apache/baremaps/calcite/postgis/PostgisSchemaFactory.java

@@ -17,6 +17,8 @@
 
 package org.apache.baremaps.calcite.postgis;
 
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -26,14 +28,14 @@
 import org.apache.calcite.schema.Schema;
 import org.apache.calcite.schema.SchemaFactory;
 import org.apache.calcite.schema.SchemaPlus;
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
 
 /**
  * A factory for {@link PostgisSchema} schemas.
  * 
- * <p>This schema factory connects to a PostgreSQL database with PostGIS extensions
- * and exposes tables as Calcite tables.</p>
+ * <p>
+ * This schema factory connects to a PostgreSQL database with PostGIS extensions and exposes tables
+ * as Calcite tables.
+ * </p>
  */
 public class PostgisSchemaFactory implements SchemaFactory {
 
@@ -51,14 +53,14 @@ public Schema create(SchemaPlus parentSchema, String name, Map<String, Object> o
     String username = (String) operand.get("username");
     String password = (String) operand.get("password");
     String schema = (String) operand.getOrDefault("schema", "public");
-    
+
     if (jdbcUrl == null) {
       throw new IllegalArgumentException("'jdbcUrl' must be specified");
     }
 
     DataSource dataSource = createDataSource(jdbcUrl, username, password);
     validatePostgisAvailability(dataSource);
-    
+
     return new PostgisSchema(dataSource, schema);
   }
 
@@ -79,10 +81,10 @@ private static DataSource createDataSource(String jdbcUrl, String username, Stri
     config.setMaximumPoolSize(5);
     config.setAutoCommit(true);
     config.setConnectionTestQuery("SELECT 1");
-    
+
     return new HikariDataSource(config);
   }
-  
+
   /**
    * Validates that the database is PostgreSQL with PostGIS extension installed.
    *
@@ -92,15 +94,15 @@ private static DataSource createDataSource(String jdbcUrl, String username, Stri
   private static void validatePostgisAvailability(DataSource dataSource) {
     try (Connection connection = dataSource.getConnection()) {
       DatabaseMetadata metadata = new DatabaseMetadata(dataSource);
-      
+
       // Get database metadata
       java.sql.DatabaseMetaData dbMetadata = connection.getMetaData();
       String productName = dbMetadata.getDatabaseProductName();
-      
+
       if (!"PostgreSQL".equalsIgnoreCase(productName)) {
         throw new IllegalArgumentException("Database is not PostgreSQL: " + productName);
       }
-      
+
       // Check for PostGIS extension
       try (ResultSet rs = connection.createStatement().executeQuery(
           "SELECT postgis_version()")) {
@@ -110,13 +112,14 @@ private static void validatePostgisAvailability(DataSource dataSource) {
       } catch (SQLException e) {
         throw new IllegalArgumentException("PostGIS extension not installed", e);
       }
-      
+
       // Check for geometry_columns table
       try {
-        var tables = metadata.getTableMetaData(null, "public", "geometry_columns", 
-            new String[]{"TABLE", "VIEW"});
+        var tables = metadata.getTableMetaData(null, "public", "geometry_columns",
+            new String[] {"TABLE", "VIEW"});
         if (tables.isEmpty()) {
-          throw new IllegalArgumentException("geometry_columns table not found, PostGIS setup is incomplete");
+          throw new IllegalArgumentException(
+              "geometry_columns table not found, PostGIS setup is incomplete");
         }
       } catch (SQLException e) {
         throw new IllegalArgumentException("Failed to query geometry_columns table", e);
@@ -125,4 +128,4 @@ private static void validatePostgisAvailability(DataSource dataSource) {
       throw new RuntimeException("Failed to connect to PostgreSQL database", e);
     }
   }
-} 
+}

baremaps-calcite/src/main/java/org/apache/baremaps/calcite/postgis/PostgisTable.java

@@ -20,12 +20,11 @@
 import java.sql.*;
 import java.util.*;
 import javax.sql.DataSource;
-
 import org.apache.baremaps.calcite.data.DataColumn;
 import org.apache.baremaps.calcite.data.DataColumnFixed;
 import org.apache.baremaps.calcite.data.DataSchema;
-import org.apache.baremaps.postgres.metadata.DatabaseMetadata;
 import org.apache.baremaps.postgres.metadata.ColumnResult;
+import org.apache.baremaps.postgres.metadata.DatabaseMetadata;
 import org.apache.calcite.DataContext;
 import org.apache.calcite.linq4j.AbstractEnumerable;
 import org.apache.calcite.linq4j.Enumerable;
@@ -40,8 +39,8 @@
 import org.locationtech.jts.io.WKBReader;
 
 /**
- * A Calcite table implementation for PostGIS. This table allows querying spatial data
- * directly from a PostGIS-enabled PostgreSQL database.
+ * A Calcite table implementation for PostGIS. This table allows querying spatial data directly from
+ * a PostGIS-enabled PostgreSQL database.
  */
 public class PostgisTable extends AbstractTable implements ScannableTable {
 
@@ -69,7 +68,7 @@ public PostgisTable(DataSource dataSource, String tableName) throws SQLException
    * @param typeFactory the type factory
    * @throws SQLException if an SQL error occurs
    */
-  public PostgisTable(DataSource dataSource, String tableName, RelDataTypeFactory typeFactory) 
+  public PostgisTable(DataSource dataSource, String tableName, RelDataTypeFactory typeFactory)
       throws SQLException {
     this.dataSource = dataSource;
     this.tableName = tableName;
@@ -85,31 +84,32 @@ public PostgisTable(DataSource dataSource, String tableName, RelDataTypeFactory
    */
   private DataSchema discoverSchema() throws SQLException {
     List<DataColumn> columns = new ArrayList<>();
-    
+
     // Use DatabaseMetadata to get column information
     DatabaseMetadata metadata = new DatabaseMetadata(dataSource);
-    var tableMetadata = metadata.getTableMetaData(null, null, tableName, new String[]{"TABLE", "VIEW"})
-        .stream()
-        .filter(meta -> meta.table().tableName().equalsIgnoreCase(tableName))
-        .findFirst()
-        .orElseThrow(() -> new SQLException("Table not found: " + tableName));
-    
+    var tableMetadata =
+        metadata.getTableMetaData(null, null, tableName, new String[] {"TABLE", "VIEW"})
+            .stream()
+            .filter(meta -> meta.table().tableName().equalsIgnoreCase(tableName))
+            .findFirst()
+            .orElseThrow(() -> new SQLException("Table not found: " + tableName));
+
     // Get geometry column information separately since it's PostGIS specific
     Map<String, String> geometryTypes = getGeometryTypes();
-    
+
     for (ColumnResult column : tableMetadata.columns()) {
       String columnName = column.columnName();
       String dataType = column.typeName();
       boolean isNullable = "YES".equalsIgnoreCase(column.isNullable());
-      
+
       // Determine column cardinality
-      DataColumn.Cardinality cardinality = isNullable ? 
-          DataColumn.Cardinality.OPTIONAL : DataColumn.Cardinality.REQUIRED;
-      
+      DataColumn.Cardinality cardinality =
+          isNullable ? DataColumn.Cardinality.OPTIONAL : DataColumn.Cardinality.REQUIRED;
+
       // Create a data column based on the type
       RelDataTypeFactory typeFactory = new org.apache.calcite.jdbc.JavaTypeFactoryImpl();
       RelDataType relDataType;
-      
+
       if ("geometry".equalsIgnoreCase(dataType) && geometryTypes.containsKey(columnName)) {
         // This is a geometry column
         relDataType = typeFactory.createSqlType(SqlTypeName.GEOMETRY);
@@ -118,13 +118,13 @@ private DataSchema discoverSchema() throws SQLException {
         relDataType = PostgisTypeConversion.postgresTypeToRelDataType(
             typeFactory, dataType);
       }
-      
+
       columns.add(new DataColumnFixed(columnName, cardinality, relDataType));
     }
-    
+
     return new DataSchema(tableName, columns);
   }
-  
+
   /**
    * Gets geometry column types for the current table.
    *
@@ -133,14 +133,14 @@ private DataSchema discoverSchema() throws SQLException {
    */
   private Map<String, String> getGeometryTypes() throws SQLException {
     Map<String, String> geometryTypes = new HashMap<>();
-    
+
     try (Connection connection = dataSource.getConnection()) {
       // Query to get geometry column information
       String sql = "SELECT f_geometry_column, type FROM geometry_columns WHERE f_table_name = ?";
-      
+
       try (PreparedStatement stmt = connection.prepareStatement(sql)) {
         stmt.setString(1, tableName);
-        
+
         try (ResultSet rs = stmt.executeQuery()) {
           while (rs.next()) {
             String column = rs.getString("f_geometry_column");
@@ -150,10 +150,10 @@ private Map<String, String> getGeometryTypes() throws SQLException {
         }
       }
     }
-    
+
     return geometryTypes;
   }
-  
+
   @Override
   public RelDataType getRowType(RelDataTypeFactory typeFactory) {
     return rowType;
@@ -216,18 +216,18 @@ public PostgisEnumerator(DataSource dataSource, DataSchema schema) {
 
     private String buildSelectQuery() {
       List<String> columnProjections = new ArrayList<>();
-      
+
       for (DataColumn column : schema.columns()) {
         // Special handling for geometry columns to get WKB format
         if (column.sqlTypeName() == SqlTypeName.GEOMETRY) {
-          columnProjections.add(String.format("ST_AsBinary(\"%s\") AS \"%s\"", 
+          columnProjections.add(String.format("ST_AsBinary(\"%s\") AS \"%s\"",
               column.name(), column.name()));
         } else {
           columnProjections.add(String.format("\"%s\"", column.name()));
         }
       }
-      
-      return "SELECT " + String.join(", ", columnProjections) + 
+
+      return "SELECT " + String.join(", ", columnProjections) +
           " FROM \"" + schema.name() + "\"";
     }
 
@@ -236,15 +236,15 @@ private Object[] convertCurrentRow() throws SQLException {
       for (int i = 0; i < schema.columns().size(); i++) {
         DataColumn column = schema.columns().get(i);
         Object value;
-        
+
         // Special handling for geometry columns
         if (column.sqlTypeName() == SqlTypeName.GEOMETRY) {
           byte[] wkb = resultSet.getBytes(i + 1);
           value = deserializeWkb(wkb);
         } else {
           value = resultSet.getObject(i + 1);
         }
-        
+
         values[i] = value;
       }
       return values;
@@ -274,7 +274,7 @@ public boolean moveNext() {
           current = null;
           return false;
         }
-        
+
         current = convertCurrentRow();
         hasNext = resultSet.next();
         return true;
@@ -321,4 +321,4 @@ public void close() {
       }
     }
   }
-} 
+}