#68 - Code refactoring

starnowski · Dec 17, 2023 · 573dbf9 · 573dbf9
1 parent 9e99063
commit 573dbf9
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 159 deletions.
diff --git a/...te6/PosjsonhelperFunctionContributor.java → ...te6/PosjsonhelperFunctionContributor.java b/...te6/PosjsonhelperFunctionContributor.java → ...te6/PosjsonhelperFunctionContributor.java
diff --git a/...ernate6/SqmFunctionRegistryEnricherX.java → ...bernate6/SqmFunctionRegistryEnricher.java b/...ernate6/SqmFunctionRegistryEnricherX.java → ...bernate6/SqmFunctionRegistryEnricher.java
@@ -25,7 +25,6 @@
 import com.github.starnowski.posjsonhelper.core.CoreContextPropertiesSupplier;
 import com.github.starnowski.posjsonhelper.core.HibernateContext;
 import com.github.starnowski.posjsonhelper.core.HibernateContextPropertiesSupplier;
-import com.github.starnowski.posjsonhelper.hibernate6.descriptor.AbstractConditionalFunctionDescriptorRegister;
 import com.github.starnowski.posjsonhelper.hibernate6.descriptor.FunctionDescriptorRegisterFactoriesSupplier;
 import com.github.starnowski.posjsonhelper.hibernate6.descriptor.FunctionDescriptorRegisterFactory;
 import org.hibernate.query.sqm.function.SqmFunctionRegistry;
@@ -35,7 +34,7 @@
 /**
  * The component that enriches the {@link SqmFunctionRegistry} object with Hibernate and SQL definitions used by the library.
  */
-public class SqmFunctionRegistryEnricherX {
+public class SqmFunctionRegistryEnricher {
 
     /**
      * Supplier for {@link Context} object based on system properties
@@ -47,11 +46,11 @@ public class SqmFunctionRegistryEnricherX {
     private final HibernateContextPropertiesSupplier hibernateContextPropertiesSupplier;
     private final List<FunctionDescriptorRegisterFactory> functionDescriptorRegisterFactories;
 
-    public SqmFunctionRegistryEnricherX() {
+    public SqmFunctionRegistryEnricher() {
         this(new CoreContextPropertiesSupplier(), new HibernateContextPropertiesSupplier(), new FunctionDescriptorRegisterFactoriesSupplier());
     }
 
-    SqmFunctionRegistryEnricherX(CoreContextPropertiesSupplier coreContextPropertiesSupplier, HibernateContextPropertiesSupplier hibernateContextPropertiesSupplier, FunctionDescriptorRegisterFactoriesSupplier functionDescriptorRegisterFactoriesSupplier) {
+    SqmFunctionRegistryEnricher(CoreContextPropertiesSupplier coreContextPropertiesSupplier, HibernateContextPropertiesSupplier hibernateContextPropertiesSupplier, FunctionDescriptorRegisterFactoriesSupplier functionDescriptorRegisterFactoriesSupplier) {
         this.coreContextPropertiesSupplier = coreContextPropertiesSupplier;
         this.hibernateContextPropertiesSupplier = hibernateContextPropertiesSupplier;
         this.functionDescriptorRegisterFactories = functionDescriptorRegisterFactoriesSupplier.get();

diff --git a/...sjsonhelperFunctionContributorTest.groovy → ...sjsonhelperFunctionContributorTest.groovy b/...sjsonhelperFunctionContributorTest.groovy → ...sjsonhelperFunctionContributorTest.groovy
diff --git a/...6/SqmFunctionRegistryEnricherXTest.groovy → ...e6/SqmFunctionRegistryEnricherTest.groovy b/...6/SqmFunctionRegistryEnricherXTest.groovy → ...e6/SqmFunctionRegistryEnricherTest.groovy
@@ -4,20 +4,17 @@ import com.github.starnowski.posjsonhelper.core.Context
 import com.github.starnowski.posjsonhelper.core.CoreContextPropertiesSupplier
 import com.github.starnowski.posjsonhelper.core.HibernateContext
 import com.github.starnowski.posjsonhelper.core.HibernateContextPropertiesSupplier
-import com.github.starnowski.posjsonhelper.hibernate6.descriptor.AbstractConditionalFunctionDescriptorRegister
 import com.github.starnowski.posjsonhelper.hibernate6.descriptor.FunctionDescriptorRegister
 import com.github.starnowski.posjsonhelper.hibernate6.descriptor.FunctionDescriptorRegisterFactoriesSupplier
 import com.github.starnowski.posjsonhelper.hibernate6.descriptor.FunctionDescriptorRegisterFactory
 import org.hibernate.query.sqm.function.AbstractSqmFunctionDescriptor
 import org.hibernate.query.sqm.function.SqmFunctionDescriptor
 import org.hibernate.query.sqm.function.SqmFunctionRegistry
 import spock.lang.Specification
-import spock.lang.Unroll
 
 import java.util.function.Function
-import java.util.stream.Collectors
 
-class SqmFunctionRegistryEnricherXTest extends Specification {
+class SqmFunctionRegistryEnricherTest extends Specification {
 
 //    @Unroll
     def "should enrich sqmFunctionRegistry with expected functions types #expectedFunctionTypes"() {
@@ -34,7 +31,7 @@ class SqmFunctionRegistryEnricherXTest extends Specification {
             hibernateContextPropertiesSupplier.get() >> hibernateContext
             functionDescriptorRegisterFactoriesSupplier.get() >> [functionDescriptorRegisterFactory]
             functionDescriptorRegisterFactory.get(context, hibernateContext) >> functionDescriptorRegister
-            def tested = new SqmFunctionRegistryEnricherX(coreContextPropertiesSupplier, hibernateContextPropertiesSupplier, functionDescriptorRegisterFactoriesSupplier)
+            def tested = new SqmFunctionRegistryEnricher(coreContextPropertiesSupplier, hibernateContextPropertiesSupplier, functionDescriptorRegisterFactoriesSupplier)
 
         when:
             tested.enrich(sqmFunctionRegistry)

diff --git a/...main/java/com/github/starnowski/posjsonhelper/hibernate6/SqmFunctionRegistryEnricher.java b/...main/java/com/github/starnowski/posjsonhelper/hibernate6/SqmFunctionRegistryEnricher.java
diff --git a/...ovy/com/github/starnowski/posjsonhelper/hibernate6/SqmFunctionRegistryEnricherTest.groovy b/...ovy/com/github/starnowski/posjsonhelper/hibernate6/SqmFunctionRegistryEnricherTest.groovy