feat: remove Raw Junction

Closes #48
krud-dev · Sep 5, 2022 · 7d39e5e · 7d39e5e
1 parent 350723d
commit 7d39e5e
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 107 deletions.
diff --git a/crud-framework-core/src/main/java/studio/crud/crudframework/crud/handler/CrudHelperImpl.java b/crud-framework-core/src/main/java/studio/crud/crudframework/crud/handler/CrudHelperImpl.java
@@ -39,14 +39,7 @@
 import javax.validation.Validator;
 import java.io.Serializable;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
@@ -161,7 +154,7 @@ public <ID extends Serializable, Entity extends BaseCrudEntity<ID>> void validat
                 throw new IllegalStateException("A FilterField must have an operation");
             }
 
-            boolean isJunction = filterField.getOperation() == FilterFieldOperation.And || filterField.getOperation() == FilterFieldOperation.Or || filterField.getOperation() == FilterFieldOperation.Not || filterField.getOperation() == FilterFieldOperation.RawJunction;
+            boolean isJunction = filterField.getOperation() == FilterFieldOperation.And || filterField.getOperation() == FilterFieldOperation.Or || filterField.getOperation() == FilterFieldOperation.Not;
             if (isJunction) {
                 if (filterField.getChildren() != null && !filterField.getChildren().isEmpty()) {
                     validateAndFillFilterFieldMetadata(filterField.getChildren(), entityClazz);

diff --git a/crud-framework-core/src/main/java/studio/crud/crudframework/modelfilter/BaseRawJunction.kt b/crud-framework-core/src/main/java/studio/crud/crudframework/modelfilter/BaseRawJunction.kt
diff --git a/crud-framework-core/src/main/java/studio/crud/crudframework/modelfilter/FilterFields.java b/crud-framework-core/src/main/java/studio/crud/crudframework/modelfilter/FilterFields.java
@@ -387,14 +387,6 @@ public static FilterField containsIn(String fieldName, String... values) {
 		return null;
 	}
 
-	public static FilterField rawJunction(BaseRawJunction rawJunctionDTO) {
-		if(rawJunctionDTO == null || rawJunctionDTO.getJunction() == null) {
-			return null;
-		}
-
-		return createFilterField("", FilterFieldOperation.RawJunction, FilterFieldDataType.None, null, rawJunctionDTO);
-	}
-
 	public static FilterField notContainsIn(String fieldName, String... values) {
 		if(values != null && values.length > 0) {
 			return createFilterField(fieldName, FilterFieldOperation.NotContainsIn, FilterFieldDataType.String, null, values);

diff --git a/...ework-core/src/main/java/studio/crud/crudframework/modelfilter/dsl/FilterFieldsBuilder.kt b/...ework-core/src/main/java/studio/crud/crudframework/modelfilter/dsl/FilterFieldsBuilder.kt
@@ -1,12 +1,11 @@
 package studio.crud.crudframework.modelfilter.dsl
 
 import studio.crud.crudframework.model.PersistentEntity
-import studio.crud.crudframework.modelfilter.BaseRawJunction
 import studio.crud.crudframework.modelfilter.FilterField
 import studio.crud.crudframework.modelfilter.dsl.annotation.FilterFieldDsl
 import studio.crud.crudframework.modelfilter.enums.FilterFieldDataType
 import studio.crud.crudframework.modelfilter.enums.FilterFieldOperation
-import java.util.Date
+import java.util.*
 import kotlin.reflect.KProperty
 import kotlin.reflect.KProperty1
 
@@ -354,14 +353,6 @@ class FilterFieldsBuilder<RootType : PersistentEntity>(private val filterFields:
         filterFields += FilterField(effectiveName, FilterFieldOperation.IsNotNull, FilterFieldDataType.Object, null, null)
     }
 
-    fun rawJunction(junctionSupplier: () -> BaseRawJunction<*>) {
-        filterFields += FilterField().apply {
-            this.operation = FilterFieldOperation.RawJunction
-            this.dataType = FilterFieldDataType.None
-            this.values = arrayOf(junctionSupplier())
-        }
-    }
-
     infix fun <ChildType : PersistentEntity> KProperty1<RootType, ChildType?>.Sub(setup: FilterFieldsBuilder<ChildType>.() -> Unit) {
         val prefix = if (fieldPrefix.isEmpty()) name else "$fieldPrefix/$name"
         val filterFieldsBuilder = FilterFieldsBuilder<ChildType>(fieldPrefix = prefix)

diff --git a/...rk-core/src/main/java/studio/crud/crudframework/modelfilter/enums/FilterFieldOperation.kt b/...rk-core/src/main/java/studio/crud/crudframework/modelfilter/enums/FilterFieldOperation.kt
@@ -18,7 +18,6 @@ enum class FilterFieldOperation(val junction: Boolean = false) {
     Not(true),
     ContainsIn,
     NotContainsIn,
-    RawJunction(true),
     StartsWith,
     EndsWith,
     Noop;

diff --git a/crud-framework-core/src/main/java/studio/crud/crudframework/util/DynamicModelFilterUtils.kt b/crud-framework-core/src/main/java/studio/crud/crudframework/util/DynamicModelFilterUtils.kt
@@ -103,7 +103,6 @@ fun FilterField.matches(target: Any): Boolean {
         FilterFieldOperation.NotContainsIn -> {
             throw UnsupportedOperationException("Cannot use NotContainsIn in FilterField.matches")
         }
-        FilterFieldOperation.RawJunction -> throw UnsupportedOperationException("Cannot use RawJunction in FilterField.matches")
         FilterFieldOperation.StartsWith -> {
             actualValue as String
             val value = this.value1 as String

diff --git a/...ramework-core/src/test/java/studio/crud/crudframework/util/DynamicModelFilterUtilsTest.kt b/...ramework-core/src/test/java/studio/crud/crudframework/util/DynamicModelFilterUtilsTest.kt
@@ -7,9 +7,8 @@ import strikt.assertions.isFalse
 import strikt.assertions.isTrue
 import studio.crud.crudframework.model.BaseCrudEntity
 import studio.crud.crudframework.model.PersistentEntity
-import studio.crud.crudframework.modelfilter.BaseRawJunction
 import studio.crud.crudframework.modelfilter.dsl.where
-import java.util.Date
+import java.util.*
 
 private class Customer(
     val name: String = "Test",
@@ -381,20 +380,6 @@ class DynamicModelFilterUtilsTest {
         }
     }
 
-    @Test
-    fun `test RawJunction operation happy flow`() {
-        val customer = Customer()
-        val filter = where<Customer> {
-            rawJunction {
-                object : BaseRawJunction<Any>(1) {}
-            }
-        }
-
-        expectThrows<UnsupportedOperationException> {
-            filter.matches(customer)
-        }
-    }
-
     @Test
     fun `test nested field matches`() {
         val customer = Customer()

diff --git a/...hibernate5-connector/src/main/java/studio/crud/crudframework/jpa/dao/AbstractBaseDao.java b/...hibernate5-connector/src/main/java/studio/crud/crudframework/jpa/dao/AbstractBaseDao.java
@@ -2,21 +2,12 @@
 
 import org.hibernate.Criteria;
 import org.hibernate.Session;
-import org.hibernate.criterion.Conjunction;
-import org.hibernate.criterion.CriteriaSpecification;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.Disjunction;
-import org.hibernate.criterion.Junction;
-import org.hibernate.criterion.MatchMode;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Projections;
-import org.hibernate.criterion.Restrictions;
+import org.hibernate.criterion.*;
 import studio.crud.crudframework.jpa.annotation.CrudJoinType;
 import studio.crud.crudframework.model.BaseCrudEntity;
 import studio.crud.crudframework.model.PersistentEntity;
 import studio.crud.crudframework.modelfilter.DynamicModelFilter;
 import studio.crud.crudframework.modelfilter.FilterField;
-import studio.crud.crudframework.modelfilter.JpaRawJunctionDTO;
 import studio.crud.crudframework.modelfilter.OrderDTO;
 import studio.crud.crudframework.modelfilter.enums.FilterFieldOperation;
 
@@ -25,12 +16,7 @@
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 public abstract class AbstractBaseDao implements BaseDao {
 
@@ -180,11 +166,6 @@ private void flattenFilterFieldNames(Set<String> flatFilterFieldNames, List<Filt
 			if(filterField.getFieldName() != null) {
 				flatFilterFieldNames.add(filterField.getFieldName());
 			}
-
-			if(filterField.getOperation() == FilterFieldOperation.RawJunction && filterField.getValue1() instanceof JpaRawJunctionDTO) {
-				flatFilterFieldNames.addAll(((JpaRawJunctionDTO) filterField.getValue1()).getRequestedAliases());
-			}
-
 			if(filterField.getChildren() != null && !filterField.getChildren().isEmpty()) {
 				flattenFilterFieldNames(flatFilterFieldNames, filterField.getChildren());
 			}
@@ -195,7 +176,7 @@ private Criterion buildCriterion(FilterField filterField) {
 
 		Junction junction = Restrictions.and();
 
-		if((filterField.getOperation() == FilterFieldOperation.RawJunction || filterField.getOperation() == FilterFieldOperation.Noop) || filterField.getChildren() != null || isValidSimpleFilterField(filterField)) {
+		if(filterField.getOperation() == FilterFieldOperation.Noop || filterField.getChildren() != null || isValidSimpleFilterField(filterField)) {
 
 			switch(filterField.getOperation()) {
 				case Equal:
@@ -297,13 +278,6 @@ private Criterion buildCriterion(FilterField filterField) {
 					}
 					junction.add(Restrictions.not(notContainsInJunction));
 					break;
-
-				case RawJunction:
-					JpaRawJunctionDTO dto = (JpaRawJunctionDTO) filterField.getValue1();
-					if(dto != null && dto.getJunction() != null) {
-						junction.add(dto.getJunction());
-					}
-					break;
 				case Noop:
 					junction.add(Restrictions.sqlRestriction("1=0"));
 					break;

diff --git a/...e5-connector/src/main/java/studio/crud/crudframework/jpa/modelfilter/JpaRawJunctionDTO.kt b/...e5-connector/src/main/java/studio/crud/crudframework/jpa/modelfilter/JpaRawJunctionDTO.kt
diff --git a/...ngo-connector/src/main/java/studio/crud/crudframework/mongo/dao/AbstractMongoBaseDao.java b/...ngo-connector/src/main/java/studio/crud/crudframework/mongo/dao/AbstractMongoBaseDao.java
@@ -10,14 +10,9 @@
 import studio.crud.crudframework.modelfilter.FilterField;
 import studio.crud.crudframework.modelfilter.OrderDTO;
 import studio.crud.crudframework.modelfilter.enums.FilterFieldOperation;
-import studio.crud.crudframework.mongo.modelfilter.MongoRawJunctionDTO;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.regex.Pattern;
 
 public abstract class AbstractMongoBaseDao {
@@ -110,7 +105,7 @@ protected Query buildQuery(DynamicModelFilter filter) {
 
 
 	private Criteria buildCriterion(Criteria criteria, FilterField filterField) {
-		if(filterField.getOperation() == FilterFieldOperation.RawJunction || filterField.getChildren() != null || isValidSimpleFilterField(filterField)) {
+		if(filterField.getChildren() != null || isValidSimpleFilterField(filterField)) {
 
 			switch(filterField.getOperation()) {
 				case Equal:
@@ -225,13 +220,6 @@ private Criteria buildCriterion(Criteria criteria, FilterField filterField) {
 						criteria.not().andOperator(criterias.toArray(new Criteria[]{}));
 					}
 					break;
-
-				case RawJunction:
-					MongoRawJunctionDTO dto = (MongoRawJunctionDTO) filterField.getValue1();
-					if(dto != null && dto.getJunction() != null) {
-						criteria.andOperator(dto.getJunction());
-					}
-					break;
 				case Noop:
 					criteria.and("id").in();
 			}

diff --git a/...onnector/src/main/java/studio/crud/crudframework/mongo/modelfilter/MongoRawJunctionDTO.kt b/...onnector/src/main/java/studio/crud/crudframework/mongo/modelfilter/MongoRawJunctionDTO.kt