Allow configuring Apache Calcite properties through QueryContextBuilder#setProperty

Author: beikov

connector/entity-view/src/main/java/com/blazebit/query/connector/view/EntityViewSchemaProvider.java

@@ -50,7 +50,6 @@ public EntityViewSchemaProvider() {
                 EntityViewConnectorConfig.ENTITY_VIEW_FILTER.getPropertyName() );
         PropertyProvider<EntityManager> entityManagerProvider = configurationProvider.getPropertyProvider(
             EntityViewConnectorConfig.ENTITY_MANAGER.getPropertyName() );
-        PropertyProvider<DataFetchContext> dataContextSupplier = configurationProvider;
 
         final ImmutableMap.Builder<Class<?>, EntityViewTable<?>> builder = ImmutableMap.builder();
 
@@ -61,7 +60,7 @@ public EntityViewSchemaProvider() {
                         new EntityViewTable<>(
                                 entityViewManager,
                                 entityManagerProvider,
-                                dataContextSupplier,
+                                configurationProvider,
                                 viewType
                         )
                 );

core/api/src/main/java/com/blazebit/query/spi/QueryContextBuilder.java

@@ -33,9 +33,7 @@ public interface QueryContextBuilder {
      * @param value    The property value
      * @return {@code this} object for method chaining
      */
-    default QueryContextBuilder setProperty(String property, Object value) {
-        return setPropertyProvider(property, (context) -> value);
-    }
+    QueryContextBuilder setProperty(String property, Object value);
 
     /**
      * Sets the given supplier as value provider for the given property name.
@@ -44,16 +42,17 @@ default QueryContextBuilder setProperty(String property, Object value) {
      * @param provider The property value provider
      * @return {@code this} object for method chaining
      */
-    QueryContextBuilder setPropertyProvider(String property, PropertyProvider provider);
+    QueryContextBuilder setPropertyProvider(String property, PropertyProvider<?> provider);
 
     /**
      * Returns the property provider for the property name.
      *
      * @param property The property name
+     * @param <X> The expected value type
      * @return the property provider for the property name
      * @throws IllegalArgumentException If no property provider exists
      */
-    PropertyProvider getPropertyProvider(String property);
+    <X> PropertyProvider<X> getPropertyProvider(String property);
 
     /**
      * Registers a fully qualified alias for a schema object type.

core/impl/src/main/java/com/blazebit/query/impl/QueryContextBuilderImpl.java

@@ -16,6 +16,7 @@
 package com.blazebit.query.impl;
 
 import com.blazebit.query.QueryContext;
+import com.blazebit.query.spi.DataFetchContext;
 import com.blazebit.query.spi.DataFetcher;
 import com.blazebit.query.spi.PropertyProvider;
 import com.blazebit.query.spi.QueryContextBuilder;
@@ -24,6 +25,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Properties;
 import java.util.ServiceLoader;
 
 /**
@@ -37,19 +39,26 @@ public class QueryContextBuilderImpl implements QueryContextBuilder {
     final Map<String, SchemaObjectTypeImpl<?>> schemaObjects = new HashMap<>();
     final Map<String, String> schemaObjectNames = new HashMap<>();
 
+    @Override
+    public QueryContextBuilder setProperty(String property, Object value) {
+        propertyProviders.put(property, new PropertyProviderImpl<>(value));
+        return this;
+    }
+
     @Override
     public QueryContextBuilder setPropertyProvider(String property, PropertyProvider provider) {
         propertyProviders.put(property, provider);
         return this;
     }
 
     @Override
-    public PropertyProvider getPropertyProvider(String property) {
-        PropertyProvider propertyProvider = propertyProviders.get(property);
+    public <X> PropertyProvider<X> getPropertyProvider(String property) {
+        PropertyProvider<?> propertyProvider = propertyProviders.get(property);
         if (propertyProvider == null) {
             throw new IllegalArgumentException("No property provider found for property: " + property);
         }
-        return propertyProvider;
+		//noinspection unchecked
+		return (PropertyProvider<X>) propertyProvider;
     }
 
     @Override
@@ -82,4 +91,36 @@ public QueryContextBuilder loadServices() {
     public QueryContext build() {
         return new QueryContextImpl( this );
     }
+
+    public Properties getProperties() {
+        Properties props = new Properties();
+        for ( Map.Entry<String, PropertyProvider<?>> entry : propertyProviders.entrySet() ) {
+            PropertyProvider<?> propertyProvider = entry.getValue();
+            if ( propertyProvider instanceof PropertyProviderImpl ) {
+                props.put( entry.getKey(), ( (PropertyProviderImpl<?>) propertyProvider ).value );
+            }
+        }
+        return props;
+    }
+
+    /**
+     * @author Christian Beikov
+     * @since 1.0.0
+     */
+    private static final class PropertyProviderImpl<X> implements PropertyProvider<X> {
+        private final X value;
+
+        /**
+         * Creates a new property provider.
+         * @param value The value
+         */
+        public PropertyProviderImpl(X value) {
+            this.value = value;
+        }
+
+        @Override
+        public X provide(DataFetchContext context) {
+            return value;
+        }
+    }
 }

core/impl/src/main/java/com/blazebit/query/impl/QueryContextImpl.java

@@ -56,7 +56,7 @@ public class QueryContextImpl implements QueryContext {
 
     public QueryContextImpl(QueryContextBuilderImpl builder) {
         this.configurationProvider = new ConfigurationProviderImpl( ImmutableMap.copyOf( builder.propertyProviders ) );
-        this.calciteDataSource = new CalciteDataSource();
+        this.calciteDataSource = new CalciteDataSource(builder.getProperties());
         this.metamodel = new MetamodelImpl(resolveSchemaObjects( builder, configurationProvider, calciteDataSource ));
     }
 

core/impl/src/main/java/com/blazebit/query/impl/calcite/CalciteDataSource.java

@@ -94,9 +94,9 @@ public class CalciteDataSource extends Driver implements DataSource {
     private final JavaTypeFactory typeFactory;
     private final CalciteSchema rootSchema;
 
-    public CalciteDataSource() {
-        properties = new Properties();
+    public CalciteDataSource(Properties properties) {
         properties.setProperty( "lex", "JAVA" );
+        this.properties = properties;
 
         CalciteConnectionConfig cfg = new CalciteConnectionConfigImpl( properties );
         RelDataTypeSystem typeSystem = cfg.typeSystem( RelDataTypeSystem.class, RelDataTypeSystem.DEFAULT );