JsonbConfigurationSupport -> JsonbConfiguration

Author: Martin Fekete

rsql-jpa/src/main/java/io/github/perplexhub/rsql/jsonb/JsonbConfiguration.java

@@ -1,48 +1,29 @@
 package io.github.perplexhub.rsql.jsonb;
 
+import lombok.Builder;
+
 /**
- * jsonb expression configuration
+ * convenient way to define configuration, based on default values
+ *
+ * @param pathExists   Postgresql {@code jsonb_path_exists} function to use
+ * @param pathExistsTz Postgresql {@code jsonb_path_exists_tz} function to use
+ * @param useDateTime  enable temporal values support
  */
-public interface JsonbConfiguration {
-
-    JsonbConfiguration DEFAULT = new JsonbConfiguration() {
+@Builder
+public record JsonbConfiguration(String pathExists, String pathExistsTz, boolean useDateTime) {
 
-        @Override
-        public String pathExists() {
-            return "jsonb_path_exists";
-        }
-
-        @Override
-        public String pathExistsTz() {
-            return "jsonb_path_exists_tz";
-        }
+    public static final JsonbConfiguration DEFAULT = JsonbConfiguration.builder().build();
 
-        @Override
-        public boolean useDateTime() {
-            return false;
+    public static class JsonbConfigurationBuilder {
+        JsonbConfigurationBuilder() {
+            pathExists = "jsonb_path_exists";
+            pathExistsTz = "jsonb_path_exists_tz";
+            useDateTime = false;
         }
+    }
 
-        @Override
-        public String toString() {
-            return String.format("pathExists:%s,pathExistsTz:%s,useDateTime:%b", pathExists(), pathExistsTz(), useDateTime());
-        }
-    };
-
-    /**
-     *
-     * @return Postgresql {@code jsonb_path_exists} function to use
-     */
-    String pathExists();
-
-    /**
-     *
-     * @return Postgresql {@code jsonb_path_exists_tz} function to use
-     */
-    String pathExistsTz();
-
-    /**
-     *
-     * @return enable temporal values support
-     */
-    boolean useDateTime();
+    @Override
+    public String toString() {
+        return String.format("pathExists:%s,pathExistsTz:%s,useDateTime:%b", pathExists, pathExistsTz, useDateTime);
+    }
 }

rsql-jpa/src/main/java/io/github/perplexhub/rsql/jsonb/JsonbConfigurationSupport.java

@@ -1,6 +1,6 @@
 package io.github.perplexhub.rsql;
 
-import io.github.perplexhub.rsql.jsonb.JsonbConfigurationSupport;
+import io.github.perplexhub.rsql.jsonb.JsonbConfiguration;
 import io.github.perplexhub.rsql.model.EntityWithJsonb;
 import io.github.perplexhub.rsql.model.JsonbEntity;
 import io.github.perplexhub.rsql.model.PostgresJsonEntity;
@@ -87,7 +87,7 @@ void testJsonSearchOfTemporal(List<PostgresJsonEntity> entities, String rsql, Li
         repository.saveAllAndFlush(entities);
 
         //when
-        List<PostgresJsonEntity> result = repository.findAll(toSpecification(QuerySupport.builder().rsqlQuery(rsql).jsonbConfiguration(JsonbConfigurationSupport.builder().useDateTime(true).build()).build()));
+        List<PostgresJsonEntity> result = repository.findAll(toSpecification(QuerySupport.builder().rsqlQuery(rsql).jsonbConfiguration(JsonbConfiguration.builder().useDateTime(true).build()).build()));
 
         //then
         assertThat(result)
@@ -728,7 +728,7 @@ void testJsonSearchCustomFunction(List<PostgresJsonEntity> entities, String rsql
         repository.saveAllAndFlush(entities);
 
         //when
-        List<PostgresJsonEntity> result = repository.findAll(toSpecification(QuerySupport.builder().rsqlQuery(rsql).jsonbConfiguration(JsonbConfigurationSupport.builder().pathExists("my_jsonb_path_exists").build()).build()));
+        List<PostgresJsonEntity> result = repository.findAll(toSpecification(QuerySupport.builder().rsqlQuery(rsql).jsonbConfiguration(JsonbConfiguration.builder().pathExists("my_jsonb_path_exists").build()).build()));
 
         //then
         assertThat(result)

rsql-jpa/src/test/java/io/github/perplexhub/rsql/RSQLJPASupportPostgresJsonTest.java

@@ -29,7 +29,7 @@ void testJsonbPathExpression(ComparisonOperator operator, String keyPath, List<S
     @ParameterizedTest
     @MethodSource("temporal")
     void testJsonbPathExpressionWithTemporal(ComparisonOperator operator, String keyPath, List<String> arguments, String expectedJsonbFunction, String expectedJsonbPath) {
-        JsonbExpressionBuilder builder = new JsonbExpressionBuilder(operator, keyPath, arguments, JsonbConfigurationSupport.builder().useDateTime(true).build());
+        JsonbExpressionBuilder builder = new JsonbExpressionBuilder(operator, keyPath, arguments, JsonbConfiguration.builder().useDateTime(true).build());
         var expression = builder.getJsonPathExpression();
         assertEquals(expectedJsonbFunction, expression.jsonbFunction());
         assertEquals(expectedJsonbPath, expression.jsonbPath());
@@ -38,7 +38,7 @@ void testJsonbPathExpressionWithTemporal(ComparisonOperator operator, String key
     @ParameterizedTest
     @MethodSource("customized")
     void testJsonbPathExpressionCustomized(ComparisonOperator operator, String keyPath, List<String> arguments, String expectedJsonbFunction, String expectedJsonbPath) {
-        JsonbExpressionBuilder builder = new JsonbExpressionBuilder(operator, keyPath, arguments, JsonbConfigurationSupport.builder().pathExists("my_jsonb_path_exists").pathExistsTz("my_jsonb_path_exists_tz").useDateTime(true).build());
+        JsonbExpressionBuilder builder = new JsonbExpressionBuilder(operator, keyPath, arguments, JsonbConfiguration.builder().pathExists("my_jsonb_path_exists").pathExistsTz("my_jsonb_path_exists_tz").useDateTime(true).build());
         var expression = builder.getJsonPathExpression();
         assertEquals(expectedJsonbFunction, expression.jsonbFunction());
         assertEquals(expectedJsonbPath, expression.jsonbPath());