Merge pull request #324 from turkraft/3.x.x

Left join singular attributes and example fixes

core/src/test/java/com/turkraft/springfilter/NodeMapperTest.java

@@ -52,9 +52,9 @@ void test() {
           return null;
         });
 
-    FilterNode node = filterParser.parse("x : y : z", ctx);
+    FilterNode node = filterParser.parse("x : y ! z", ctx);
 
-    Assertions.assertEquals("x ! y ! z", filterStringConverter.convert(node));
+    Assertions.assertEquals("x ! y : z", filterStringConverter.convert(node));
 
   }
 

jpa-example/pom.xml

@@ -37,7 +37,7 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-jpa</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-validation</artifactId>
@@ -66,6 +66,11 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-devtools</artifactId>
+    </dependency>
+
   </dependencies>
 
   <profiles>
@@ -87,6 +92,7 @@
           <plugin>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-maven-plugin</artifactId>
+            <version>3.1.3</version>
           </plugin>
 
           <plugin>

jpa-example/src/main/java/com/turkraft/springfilter/example/SpringFilterJpaExampleApplication.java

@@ -136,7 +136,7 @@ public List<Company> getCompanies(@Parameter(hidden = true) FilterSpecification<
 
   @Operation(parameters = @Parameter(name = "filter", in = ParameterIn.QUERY,
       schema = @Schema(type = "string"),
-      example = "maritalStatus in ('divorced', 'separated') and (size(staff) > 2 or manager is not null)"))
+      example = "maritalStatus in ['divorced', 'separated'] and (size(staff) > 2 or manager is not null)"))
   @GetMapping(value = "employee")
   public List<Employee> getEmployees(
       @Parameter(hidden = true) FilterSpecification<Employee> filter) {

jpa-example/src/main/java/com/turkraft/springfilter/example/StringToEnumConverterFactory.java

@@ -0,0 +1,37 @@
+package com.turkraft.springfilter.example;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.convert.converter.ConverterFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class StringToEnumConverterFactory
+    implements ConverterFactory<String, Enum> {
+
+  private static class StringToEnumConverter<T extends Enum>
+      implements Converter<String, T> {
+
+    private final Class<T> enumType;
+
+    public StringToEnumConverter(Class<T> enumType) {
+      this.enumType = enumType;
+    }
+
+    public T convert(String source) {
+      for (T constant : enumType.getEnumConstants()) {
+        if (constant.toString().equalsIgnoreCase(source)) {
+          return constant;
+        }
+      }
+      return (T) Enum.valueOf(this.enumType, source.trim());
+    }
+
+  }
+
+  @Override
+  public <T extends Enum> Converter<String, T> getConverter(
+      Class<T> targetType) {
+    return new StringToEnumConverter(targetType);
+  }
+
+}

jpa-example/src/main/java/com/turkraft/springfilter/example/WebConfiguration.java

@@ -0,0 +1,15 @@
+package com.turkraft.springfilter.example;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.format.FormatterRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfiguration implements WebMvcConfigurer {
+
+  @Override
+  public void addFormatters(FormatterRegistry registry) {
+    registry.addConverterFactory(new StringToEnumConverterFactory());
+  }
+
+}

jpa/pom.xml

@@ -82,6 +82,7 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>3.1.3</version>
       </plugin>
 
     </plugins>

jpa/src/main/java/com/turkraft/springfilter/helper/ExpressionHelperImpl.java

@@ -19,6 +19,7 @@
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.criteria.Expression;
 import jakarta.persistence.criteria.From;
+import jakarta.persistence.criteria.JoinType;
 import jakarta.persistence.criteria.MapJoin;
 import jakarta.persistence.criteria.Path;
 import jakarta.persistence.criteria.Root;
@@ -93,7 +94,10 @@ public Path<?> getPath(RootContext rootContext, String fieldPath) {
 
       if (shouldJoin) {
         if (!rootContext.getPaths().containsKey(chain)) {
-          rootContext.getPaths().put(chain, ((From<?, ?>) path).join(field));
+          rootContext.getPaths().put(chain, ((From<?, ?>) path).join(field,
+              nextPath.getModel().getBindableType() == BindableType.SINGULAR_ATTRIBUTE
+                  ? JoinType.LEFT
+                  : JoinType.INNER));
         }
         nextPath = rootContext.getPaths().get(chain);
       }

mongo-example/pom.xml

@@ -77,6 +77,7 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>3.1.3</version>
       </plugin>
 
     </plugins>
@@ -102,6 +103,7 @@
           <plugin>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-maven-plugin</artifactId>
+            <version>3.1.3</version>
           </plugin>
 
           <plugin>

mongo-example/src/main/java/com/turkraft/springfilter/example/SpringFilterMongoExampleApplication.java

@@ -98,7 +98,8 @@ public void run(String... args) {
 
   @Operation(hidden = true)
   @GetMapping("/")
-  public void index(HttpServletResponse response) throws IOException {
+  public void index(HttpServletResponse response)
+      throws IOException {
     response.sendRedirect("swagger-ui.html");
   }
 
@@ -120,7 +121,7 @@ public List<Company> getCompanies(
 
   @Operation(parameters = @Parameter(name = "filter", in = ParameterIn.QUERY,
       schema = @Schema(type = "string"),
-      example = "maritalStatus in ('divorced', 'separated') and (size(staff) > 2 or manager is not null)"))
+      example = "maritalStatus in ['DIVORCED', 'SEPARATED'] and (size(staff) > 2 or manager is not null)"))
   @GetMapping(value = "employee")
   public List<Employee> getEmployees(
       @Parameter(hidden = true) @Filter(entityClass = Employee.class) Document filter) {

mongo-example/src/main/java/com/turkraft/springfilter/example/StringToEnumConverterFactory.java

@@ -0,0 +1,37 @@
+package com.turkraft.springfilter.example;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.convert.converter.ConverterFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class StringToEnumConverterFactory
+    implements ConverterFactory<String, Enum> {
+
+  private static class StringToEnumConverter<T extends Enum>
+      implements Converter<String, T> {
+
+    private final Class<T> enumType;
+
+    public StringToEnumConverter(Class<T> enumType) {
+      this.enumType = enumType;
+    }
+
+    public T convert(String source) {
+      for (T constant : enumType.getEnumConstants()) {
+        if (constant.toString().equalsIgnoreCase(source)) {
+          return constant;
+        }
+      }
+      return (T) Enum.valueOf(this.enumType, source.trim());
+    }
+
+  }
+
+  @Override
+  public <T extends Enum> Converter<String, T> getConverter(
+      Class<T> targetType) {
+    return new StringToEnumConverter(targetType);
+  }
+
+}

mongo-example/src/main/java/com/turkraft/springfilter/example/WebConfiguration.java

@@ -0,0 +1,15 @@
+package com.turkraft.springfilter.example;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.format.FormatterRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfiguration implements WebMvcConfigurer {
+
+  @Override
+  public void addFormatters(FormatterRegistry registry) {
+    registry.addConverterFactory(new StringToEnumConverterFactory());
+  }
+
+}

mongo-example/src/main/java/com/turkraft/springfilter/example/model/Employee.java

@@ -1,6 +1,5 @@
 package com.turkraft.springfilter.example.model;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Date;
 import java.util.List;
 import org.springframework.data.annotation.Id;
@@ -40,13 +39,16 @@ public void setId(String id) {
 
   public enum MaritalStatus {
 
-    UNKNOWN, MARRIED, WIDOWED, DIVORCED, SINGLE, SEPARATED;
+    UNKNOWN, MARRIED, WIDOWED, DIVORCED, SINGLE, SEPARATED
 
+    /* need to add a custom enum->string mongo converter in order to open the following code
+       otherwise mongo uses name() when serializing and this creates inconsistencies with jackson
     @JsonValue
     @Override
     public String toString() {
       return name().toLowerCase();
     }
+     */
 
   }
 

mongo/pom.xml

@@ -75,6 +75,7 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>3.1.3</version>
       </plugin>
 
     </plugins>