Merge pull request #18 from 3dcitydb/feature-schema-mapping

Add schema mapping API

Author: clausnagel

citydb-cli/src/main/java/org/citydb/cli/deleter/DeleteCommand.java

@@ -90,7 +90,7 @@ public Integer call() throws ExecutionException {
         QueryExecutor executor = QueryExecutor.of(databaseManager.getAdapter());
         Deleter deleter = Deleter.newInstance();
 
-        FeatureStatistics statistics = helper.createFeatureStatistics(databaseManager.getAdapter());
+        FeatureStatistics statistics = new FeatureStatistics(databaseManager.getAdapter());
         IndexOption.Mode indexMode = indexOption.getMode();
         AtomicLong counter = new AtomicLong();
 

citydb-cli/src/main/java/org/citydb/cli/exporter/ExportController.java

@@ -101,7 +101,7 @@ protected boolean doExport() throws ExecutionException {
 
         DatabaseManager databaseManager = helper.connect(connectionOptions, config);
         QueryExecutor executor = QueryExecutor.of(databaseManager.getAdapter());
-        FeatureStatistics statistics = helper.createFeatureStatistics(databaseManager.getAdapter());
+        FeatureStatistics statistics = new FeatureStatistics(databaseManager.getAdapter());
 
         helper.logIndexStatus(Level.INFO, databaseManager.getAdapter());
         initialize(databaseManager);

citydb-cli/src/main/java/org/citydb/cli/importer/ImportController.java

@@ -106,7 +106,7 @@ protected boolean doImport() throws ExecutionException {
         }
 
         DatabaseManager databaseManager = helper.connect(connectionOptions, config);
-        FeatureStatistics statistics = helper.createFeatureStatistics(databaseManager.getAdapter());
+        FeatureStatistics statistics = new FeatureStatistics(databaseManager.getAdapter());
         IndexOption.Mode indexMode = indexOption.getMode();
 
         if (indexMode != IndexOption.Mode.keep) {

citydb-cli/src/main/java/org/citydb/cli/util/CommandHelper.java

@@ -36,7 +36,6 @@
 import org.citydb.io.IOAdapterException;
 import org.citydb.io.IOAdapterManager;
 import org.citydb.logging.LoggerManager;
-import org.citydb.operation.util.FeatureStatistics;
 import org.citydb.plugin.PluginManager;
 
 import java.sql.SQLException;
@@ -103,15 +102,6 @@ public IOAdapterManager createIOAdapterManager() throws ExecutionException {
         return manager;
     }
 
-    public FeatureStatistics createFeatureStatistics(DatabaseAdapter adapter) throws ExecutionException {
-        try {
-            return new FeatureStatistics(adapter.getSchemaAdapter().getObjectClassHelper(),
-                    adapter.getSchemaAdapter().getNamespaceHelper());
-        } catch (SQLException e) {
-            throw new ExecutionException("Failed to create feature statistics helper.", e);
-        }
-    }
-
     public void createIndexes(DatabaseAdapter adapter) throws ExecutionException {
         try {
             IndexHelper indexHelper = adapter.getSchemaAdapter().getIndexHelper();

citydb-database/src/main/java/org/citydb/database/adapter/DatabaseAdapter.java

@@ -21,11 +21,13 @@
 
 package org.citydb.database.adapter;
 
+import org.citydb.database.DatabaseException;
 import org.citydb.database.Pool;
 import org.citydb.database.connection.ConnectionDetails;
 import org.citydb.database.metadata.DatabaseMetadata;
 import org.citydb.database.metadata.DatabaseVersion;
 import org.citydb.database.metadata.SpatialReference;
+import org.citydb.database.schema.SchemaException;
 
 import java.sql.*;
 import java.util.Objects;
@@ -43,7 +45,7 @@ public abstract class DatabaseAdapter {
     public abstract int getDefaultPort();
     public abstract String getConnectionString(String host, int port, String database);
 
-    public final void initialize(Pool pool, ConnectionDetails connectionDetails) throws SQLException {
+    public final void initialize(Pool pool, ConnectionDetails connectionDetails) throws DatabaseException, SQLException {
         this.pool = Objects.requireNonNull(pool, "The database pool must not be null.");
         this.connectionDetails = Objects.requireNonNull(connectionDetails, "The connection details must not be null.");
         schemaAdapter = Objects.requireNonNull(createSchemaAdapter(this), "The schema adapter must not be null.");
@@ -62,6 +64,12 @@ public final void initialize(Pool pool, ConnectionDetails connectionDetails) thr
                     vendorMetadata.getDatabaseMajorVersion(),
                     vendorMetadata.getDatabaseMinorVersion());
         }
+
+        try {
+            schemaAdapter.buildSchemaMapping();
+        } catch (SchemaException e) {
+            throw new DatabaseException("Failed to build schema mapping.", e);
+        }
     }
 
     public SchemaAdapter getSchemaAdapter() {

citydb-database/src/main/java/org/citydb/database/adapter/SchemaAdapter.java

@@ -21,26 +21,19 @@
 
 package org.citydb.database.adapter;
 
-import org.citydb.core.concurrent.LazyInitializer;
 import org.citydb.database.metadata.SpatialReferenceType;
 import org.citydb.database.schema.*;
 
-import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.Set;
 
 public abstract class SchemaAdapter {
     protected final DatabaseAdapter adapter;
-    private final LazyInitializer<DataTypeHelper, SQLException> dataTypeHelper;
-    private final LazyInitializer<NamespaceHelper, SQLException> namespaceHelper;
-    private final LazyInitializer<ObjectClassHelper, SQLException> objectClassHelper;
     private final IndexHelper indexHelper;
+    private SchemaMapping schemaMapping;
 
     protected SchemaAdapter(DatabaseAdapter adapter) {
         this.adapter = adapter;
-        dataTypeHelper = LazyInitializer.of(() -> DataTypeHelper.newInstance(adapter));
-        namespaceHelper = LazyInitializer.of(() -> NamespaceHelper.newInstance(adapter));
-        objectClassHelper = LazyInitializer.of(() -> ObjectClassHelper.newInstance(adapter));
         indexHelper = IndexHelper.newInstance(adapter);
     }
 
@@ -57,16 +50,12 @@ protected SchemaAdapter(DatabaseAdapter adapter) {
     protected abstract String getSpatialReference();
     protected abstract SpatialReferenceType getSpatialReferenceType(String type);
 
-    public DataTypeHelper getDataTypeHelper() throws SQLException {
-        return dataTypeHelper.get();
+    void buildSchemaMapping() throws SchemaException {
+        schemaMapping = SchemaMappingBuilder.newInstance().build(adapter);
     }
 
-    public NamespaceHelper getNamespaceHelper() throws SQLException {
-        return namespaceHelper.get();
-    }
-
-    public ObjectClassHelper getObjectClassHelper() throws SQLException {
-        return objectClassHelper.get();
+    public SchemaMapping getSchemaMapping() {
+        return schemaMapping;
     }
 
     public IndexHelper getIndexHelper() {

citydb-database/src/main/java/org/citydb/database/schema/Column.java

@@ -0,0 +1,42 @@
+/*
+ * citydb-tool - Command-line tool for the 3D City Database
+ * https://www.3dcitydb.org/
+ *
+ * Copyright 2022-2024
+ * virtualcitysystems GmbH, Germany
+ * https://vc.systems/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.citydb.database.schema;
+
+import java.util.Locale;
+
+public class Column {
+    private final String name;
+    private final ColumnType type;
+
+    Column(String name, ColumnType type) {
+        this.name = name.toLowerCase(Locale.ROOT);
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public ColumnType getType() {
+        return type;
+    }
+}

citydb-database/src/main/java/org/citydb/database/schema/ColumnType.java

@@ -0,0 +1,66 @@
+/*
+ * citydb-tool - Command-line tool for the 3D City Database
+ * https://www.3dcitydb.org/
+ *
+ * Copyright 2022-2024
+ * virtualcitysystems GmbH, Germany
+ * https://vc.systems/
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.citydb.database.schema;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+public enum ColumnType {
+    BOOLEAN("boolean"),
+    INTEGER("integer"),
+    DOUBLE("double"),
+    STRING("string"),
+    URI("uri"),
+    TIMESTAMP("timestamp"),
+    ARRAY("array"),
+    BOOLEAN_ARRAY("booleanArray"),
+    INTEGER_ARRAY("integerArray"),
+    DOUBLE_ARRAY("doubleArray"),
+    STRING_ARRAY("stringArray"),
+    GEOMETRY("geometry");
+
+    private final static Map<String, ColumnType> types = new HashMap<>();
+    private final String name;
+
+    static {
+        Arrays.stream(values()).forEach(type -> types.put(type.name.toLowerCase(Locale.ROOT), type));
+    }
+
+    ColumnType(String name) {
+        this.name = name;
+    }
+
+    public static ColumnType of(String name) {
+        return name != null ? types.get(name.toLowerCase(Locale.ROOT)) : null;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}