Cleanup and API fixes

robertcsakany · robertcsakany · commit d06bb05729b6 · 2025-08-15T17:27:20.000+02:00
diff --git a/judo-tatami-asm2keycloak/pom.xml b/judo-tatami-asm2keycloak/pom.xml
@@ -109,6 +109,10 @@
 			<groupId>hu.blackbelt.judo.tatami</groupId>
 			<artifactId>judo-tatami-core</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>hu.blackbelt.judo.tatami</groupId>
+			<artifactId>judo-tatami-util</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>hu.blackbelt.judo.tatami</groupId>
diff --git a/judo-tatami-asm2keycloak/src/main/java/hu/blackbelt/judo/tatami/asm2keycloak/Asm2Keycloak.java b/judo-tatami-asm2keycloak/src/main/java/hu/blackbelt/judo/tatami/asm2keycloak/Asm2Keycloak.java
@@ -50,7 +50,7 @@
 import static hu.blackbelt.epsilon.runtime.execution.contexts.ProgramParameter.programParameterBuilder;
 import static hu.blackbelt.epsilon.runtime.execution.model.emf.WrappedEmfModelContext.wrappedEmfModelContextBuilder;
 import static hu.blackbelt.judo.tatami.asm2keycloak.Asm2KeycloakTransformationTrace.resolveAsm2KeycloakTrace;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.getTransformationTraceFromEtlExecutionContext;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.getTransformationTraceFromEtlExecutionContext;
 
 @Slf4j
 public class Asm2Keycloak {
diff --git a/judo-tatami-asm2keycloak/src/main/java/hu/blackbelt/judo/tatami/asm2keycloak/Asm2KeycloakTransformationTrace.java b/judo-tatami-asm2keycloak/src/main/java/hu/blackbelt/judo/tatami/asm2keycloak/Asm2KeycloakTransformationTrace.java
@@ -44,10 +44,10 @@
 import java.util.Map;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.createTraceModelResource;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.createTraceModelResourceFromEObjectMap;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.getTransformationTraceFromEtlExecutionContext;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.resolveTransformationTraceAsEObjectMap;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.createTraceModelResource;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.createTraceModelResourceFromEObjectMap;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.getTransformationTraceFromEtlExecutionContext;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.resolveTransformationTraceAsEObjectMap;
 
 @Builder(builderMethodName = "asm2KeycloakTransformationTraceBuilder")
 public class Asm2KeycloakTransformationTrace implements TransformationTrace {
diff --git a/judo-tatami-asm2rdbms/pom.xml b/judo-tatami-asm2rdbms/pom.xml
@@ -184,7 +184,10 @@
 			<groupId>hu.blackbelt.judo.tatami</groupId>
 			<artifactId>judo-tatami-core</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>hu.blackbelt.judo.tatami</groupId>
+			<artifactId>judo-tatami-util</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>hu.blackbelt.judo.tatami</groupId>
 			<artifactId>judo-tatami-psm2asm</artifactId>
diff --git a/judo-tatami-asm2rdbms/src/main/java/hu/blackbelt/judo/tatami/asm2rdbms/Asm2Rdbms.java b/judo-tatami-asm2rdbms/src/main/java/hu/blackbelt/judo/tatami/asm2rdbms/Asm2Rdbms.java
@@ -52,7 +52,7 @@
 import static hu.blackbelt.epsilon.runtime.execution.model.emf.WrappedEmfModelContext.wrappedEmfModelContextBuilder;
 import static hu.blackbelt.judo.meta.rdbms.runtime.RdbmsModel.LoadArguments.rdbmsLoadArgumentsBuilder;
 import static hu.blackbelt.judo.tatami.asm2rdbms.Asm2RdbmsTransformationTrace.resolveAsm2RdbmsTrace;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.getTransformationTraceFromEtlExecutionContext;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.getTransformationTraceFromEtlExecutionContext;
 
 @Slf4j
 public class Asm2Rdbms {
diff --git a/judo-tatami-asm2rdbms/src/main/java/hu/blackbelt/judo/tatami/asm2rdbms/Asm2RdbmsTransformationTrace.java b/judo-tatami-asm2rdbms/src/main/java/hu/blackbelt/judo/tatami/asm2rdbms/Asm2RdbmsTransformationTrace.java
@@ -44,10 +44,10 @@
 import java.util.Map;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.createTraceModelResource;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.createTraceModelResourceFromEObjectMap;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.getTransformationTraceFromEtlExecutionContext;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.resolveTransformationTraceAsEObjectMap;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.createTraceModelResource;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.createTraceModelResourceFromEObjectMap;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.getTransformationTraceFromEtlExecutionContext;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.resolveTransformationTraceAsEObjectMap;
 
 
 @Builder(builderMethodName = "asm2RdbmsTransformationTraceBuilder")
diff --git a/judo-tatami-psm-validation/pom.xml b/judo-tatami-psm-validation/pom.xml
@@ -50,5 +50,9 @@
             <groupId>hu.blackbelt.judo.tatami</groupId>
             <artifactId>judo-tatami-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>hu.blackbelt.epsilon</groupId>
+            <artifactId>epsilon-runtime-execution</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/judo-tatami-psm2asm/pom.xml b/judo-tatami-psm2asm/pom.xml
@@ -125,6 +125,10 @@
             <groupId>hu.blackbelt.judo.tatami</groupId>
             <artifactId>judo-tatami-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>hu.blackbelt.judo.tatami</groupId>
+            <artifactId>judo-tatami-util</artifactId>
+        </dependency>
         <dependency>
             <groupId>hu.blackbelt.judo.meta</groupId>
             <artifactId>hu.blackbelt.judo.meta.psm.model.northwind</artifactId>
diff --git a/judo-tatami-psm2asm/src/main/java/hu/blackbelt/judo/tatami/psm2asm/Psm2Asm.java b/judo-tatami-psm2asm/src/main/java/hu/blackbelt/judo/tatami/psm2asm/Psm2Asm.java
@@ -50,7 +50,7 @@
 import static hu.blackbelt.epsilon.runtime.execution.contexts.EtlExecutionContext.etlExecutionContextBuilder;
 import static hu.blackbelt.epsilon.runtime.execution.contexts.ProgramParameter.programParameterBuilder;
 import static hu.blackbelt.epsilon.runtime.execution.model.emf.WrappedEmfModelContext.wrappedEmfModelContextBuilder;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.getTransformationTraceFromEtlExecutionContext;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.getTransformationTraceFromEtlExecutionContext;
 import static hu.blackbelt.judo.tatami.psm2asm.Psm2AsmTransformationTrace.resolvePsm2AsmTrace;
 
 @Slf4j
diff --git a/judo-tatami-psm2asm/src/main/java/hu/blackbelt/judo/tatami/psm2asm/Psm2AsmTransformationTrace.java b/judo-tatami-psm2asm/src/main/java/hu/blackbelt/judo/tatami/psm2asm/Psm2AsmTransformationTrace.java
@@ -44,10 +44,10 @@
 import java.util.Map;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.createTraceModelResource;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.createTraceModelResourceFromEObjectMap;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.getTransformationTraceFromEtlExecutionContext;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.resolveTransformationTraceAsEObjectMap;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.createTraceModelResource;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.createTraceModelResourceFromEObjectMap;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.getTransformationTraceFromEtlExecutionContext;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.resolveTransformationTraceAsEObjectMap;
 
 
 @Builder(builderMethodName = "psm2AsmTransformationTraceBuilder")
diff --git a/judo-tatami-psm2measure/pom.xml b/judo-tatami-psm2measure/pom.xml
@@ -131,6 +131,10 @@
             <groupId>hu.blackbelt.judo.tatami</groupId>
             <artifactId>judo-tatami-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>hu.blackbelt.judo.tatami</groupId>
+            <artifactId>judo-tatami-util</artifactId>
+        </dependency>
         <dependency>
 			<groupId>hu.blackbelt.judo.meta</groupId>
 			<artifactId>hu.blackbelt.judo.meta.psm.model.northwind</artifactId>
diff --git a/judo-tatami-psm2measure/src/main/java/hu/blackbelt/judo/tatami/psm2measure/Psm2Measure.java b/judo-tatami-psm2measure/src/main/java/hu/blackbelt/judo/tatami/psm2measure/Psm2Measure.java
@@ -47,7 +47,7 @@
 import static hu.blackbelt.epsilon.runtime.execution.ExecutionContext.executionContextBuilder;
 import static hu.blackbelt.epsilon.runtime.execution.contexts.EtlExecutionContext.etlExecutionContextBuilder;
 import static hu.blackbelt.epsilon.runtime.execution.model.emf.WrappedEmfModelContext.wrappedEmfModelContextBuilder;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.getTransformationTraceFromEtlExecutionContext;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.getTransformationTraceFromEtlExecutionContext;
 import static hu.blackbelt.judo.tatami.psm2measure.Psm2MeasureTransformationTrace.PSM_2_MEASURE_URI_POSTFIX;
 import static hu.blackbelt.judo.tatami.psm2measure.Psm2MeasureTransformationTrace.resolvePsm2MeasureTrace;
 
diff --git a/judo-tatami-psm2measure/src/main/java/hu/blackbelt/judo/tatami/psm2measure/Psm2MeasureTransformationTrace.java b/judo-tatami-psm2measure/src/main/java/hu/blackbelt/judo/tatami/psm2measure/Psm2MeasureTransformationTrace.java
@@ -44,10 +44,10 @@
 import java.util.Map;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.createTraceModelResource;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.createTraceModelResourceFromEObjectMap;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.getTransformationTraceFromEtlExecutionContext;
-import static hu.blackbelt.judo.tatami.core.TransformationTraceUtil.resolveTransformationTraceAsEObjectMap;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.createTraceModelResource;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.createTraceModelResourceFromEObjectMap;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.getTransformationTraceFromEtlExecutionContext;
+import static hu.blackbelt.judo.tatami.util.TransformationTraceExtractor.resolveTransformationTraceAsEObjectMap;
 
 
 @Builder(builderMethodName = "psm2MeasureTransformationTraceBuilder")
diff --git a/pom.xml b/pom.xml
@@ -83,7 +83,8 @@
 
         <java-embedded-compiler-version>1.1.0.20250806_043200_64da1cea_develop</java-embedded-compiler-version>
 
-        <judo-tatami-core-version>1.1.4.20250806_043844_584368a7_develop</judo-tatami-core-version>
+        <judo-tatami-core-version>1.1.4-SNAPSHOT</judo-tatami-core-version>
+        <judo-tatami-util-version>1.0.0-SNAPSHOT</judo-tatami-util-version>
 
         <!-- Model versions -->
         <judo-dao-api-version>1.0.4.20250605_192947_c2e81b28_develop</judo-dao-api-version>
@@ -427,6 +428,12 @@
                 <version>${judo-tatami-core-version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>hu.blackbelt.judo.tatami</groupId>
+                <artifactId>judo-tatami-util</artifactId>
+                <version>${judo-tatami-util-version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>hu.blackbelt.judo.tatami</groupId>
                 <artifactId>judo-tatami-workflow</artifactId>
