diff --git a/judo-tatami-asm2keycloak/pom.xml b/judo-tatami-asm2keycloak/pom.xml index 14c5cfb..f69e815 100644 --- a/judo-tatami-asm2keycloak/pom.xml +++ b/judo-tatami-asm2keycloak/pom.xml @@ -109,6 +109,10 @@ hu.blackbelt.judo.tatami judo-tatami-core + + hu.blackbelt.judo.tatami + judo-tatami-util + hu.blackbelt.judo.tatami 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 index 261a46f..9af4fa3 100644 --- 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 index a650c4e..66cd84e 100644 --- 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 index 0137df7..2517c2f 100644 --- a/judo-tatami-asm2rdbms/pom.xml +++ b/judo-tatami-asm2rdbms/pom.xml @@ -184,7 +184,10 @@ hu.blackbelt.judo.tatami judo-tatami-core - + + hu.blackbelt.judo.tatami + judo-tatami-util + hu.blackbelt.judo.tatami judo-tatami-psm2asm 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 index 447f5f0..985ef2d 100644 --- 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 index aad3454..566b686 100644 --- 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-expression-asm-validation/src/main/java/hu/blackbelt/judo/tatami/expression/asm/validation/ExpressionValidationOnAsmWork.java b/judo-tatami-expression-asm-validation/src/main/java/hu/blackbelt/judo/tatami/expression/asm/validation/ExpressionValidationOnAsmWork.java index 7221f95..2de3a6b 100644 --- a/judo-tatami-expression-asm-validation/src/main/java/hu/blackbelt/judo/tatami/expression/asm/validation/ExpressionValidationOnAsmWork.java +++ b/judo-tatami-expression-asm-validation/src/main/java/hu/blackbelt/judo/tatami/expression/asm/validation/ExpressionValidationOnAsmWork.java @@ -20,11 +20,9 @@ * #L% */ -import org.slf4j.Logger; -import hu.blackbelt.epsilon.runtime.execution.impl.BufferedSlf4jLogger; +import hu.blackbelt.judo.meta.expression.adapters.asm.ExpressionValidatorOnAsm; import hu.blackbelt.epsilon.runtime.execution.impl.StringBuilderLogger; import hu.blackbelt.judo.meta.asm.runtime.AsmModel; -import hu.blackbelt.judo.meta.expression.adapters.asm.ExpressionEpsilonValidatorOnAsm; import hu.blackbelt.judo.meta.expression.runtime.ExpressionModel; import hu.blackbelt.judo.meta.measure.runtime.MeasureModel; import hu.blackbelt.judo.tatami.core.workflow.work.AbstractTransformationWork; @@ -53,11 +51,10 @@ public void execute() throws Exception { asmModel.orElseThrow(() -> new IllegalArgumentException("ASM Model does not found in transformation context")); try (final StringBuilderLogger logger = new StringBuilderLogger(log)) { - ExpressionEpsilonValidatorOnAsm.validateExpressionOnAsm(logger, + ExpressionValidatorOnAsm.validateExpressionOnAsm(logger, asmModel.get(), measureModel.get(), - expressionModel.get(), - ExpressionEpsilonValidatorOnAsm.calculateExpressionValidationScriptURI()); + expressionModel.get()); } } } diff --git a/judo-tatami-expression-psm-validation/src/main/java/hu/blackbelt/judo/tatami/expression/psm/validation/ExpressionValidationOnPsmWork.java b/judo-tatami-expression-psm-validation/src/main/java/hu/blackbelt/judo/tatami/expression/psm/validation/ExpressionValidationOnPsmWork.java index e293019..99a561c 100644 --- a/judo-tatami-expression-psm-validation/src/main/java/hu/blackbelt/judo/tatami/expression/psm/validation/ExpressionValidationOnPsmWork.java +++ b/judo-tatami-expression-psm-validation/src/main/java/hu/blackbelt/judo/tatami/expression/psm/validation/ExpressionValidationOnPsmWork.java @@ -20,11 +20,9 @@ * #L% */ -import org.slf4j.Logger; -import hu.blackbelt.epsilon.runtime.execution.impl.BufferedSlf4jLogger; import hu.blackbelt.epsilon.runtime.execution.impl.StringBuilderLogger; import hu.blackbelt.judo.meta.psm.runtime.PsmModel; -import hu.blackbelt.judo.meta.expression.adapters.psm.ExpressionEpsilonValidatorOnPsm; +import hu.blackbelt.judo.meta.expression.adapters.psm.ExpressionValidatorOnPsm; import hu.blackbelt.judo.meta.expression.runtime.ExpressionModel; import hu.blackbelt.judo.tatami.core.workflow.work.AbstractTransformationWork; import hu.blackbelt.judo.tatami.core.workflow.work.TransformationContext; @@ -49,10 +47,9 @@ public void execute() throws Exception { psmModel.orElseThrow(() -> new IllegalArgumentException("PSM Model does not found in transformation context")); try (final StringBuilderLogger logger = new StringBuilderLogger(log)) { - ExpressionEpsilonValidatorOnPsm.validateExpressionOnPsm(logger, + ExpressionValidatorOnPsm.validateExpressionOnPsm(logger, psmModel.get(), - expressionModel.get(), - ExpressionEpsilonValidatorOnPsm.calculateExpressionValidationScriptURI()); + expressionModel.get()); } } } diff --git a/judo-tatami-psm-validation/pom.xml b/judo-tatami-psm-validation/pom.xml index 3ab4140..ce8427b 100644 --- a/judo-tatami-psm-validation/pom.xml +++ b/judo-tatami-psm-validation/pom.xml @@ -50,5 +50,9 @@ hu.blackbelt.judo.tatami judo-tatami-core + + hu.blackbelt.epsilon + epsilon-runtime-execution + diff --git a/judo-tatami-psm2asm/pom.xml b/judo-tatami-psm2asm/pom.xml index 3b9a163..c134d28 100644 --- a/judo-tatami-psm2asm/pom.xml +++ b/judo-tatami-psm2asm/pom.xml @@ -125,6 +125,10 @@ hu.blackbelt.judo.tatami judo-tatami-core + + hu.blackbelt.judo.tatami + judo-tatami-util + hu.blackbelt.judo.meta hu.blackbelt.judo.meta.psm.model.northwind 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 index 1614400..52754b3 100644 --- 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 index c2ccc54..1fe3704 100644 --- 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 index 7bf1ba3..7989b60 100644 --- a/judo-tatami-psm2measure/pom.xml +++ b/judo-tatami-psm2measure/pom.xml @@ -131,6 +131,10 @@ hu.blackbelt.judo.tatami judo-tatami-core + + hu.blackbelt.judo.tatami + judo-tatami-util + hu.blackbelt.judo.meta hu.blackbelt.judo.meta.psm.model.northwind 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 index 20407af..0d4dc23 100644 --- 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 index e4800d6..d89cf66 100644 --- 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 index 4508dad..4d42c5e 100644 --- a/pom.xml +++ b/pom.xml @@ -79,26 +79,27 @@ 3.5.1 4.4.3 - 2.8.0.20250806_043203_dd165e06_develop + 2.8.0.20250818_020714_e9350189_feature_JNG_6322_Minimiize_Karaf_Size - 1.1.0.20250806_043200_64da1cea_develop + 1.1.0.20250818_013736_a1c33bac_feature_JNG_6322_Minimiize_Karaf_Size - 1.1.4.20250806_043844_584368a7_develop + 1.1.4.20250818_010038_2c4e76da_feature_JNG_6322_Minimiize_Karaf_Size + 1.0.0.20250818_020952_1d35adee_feature_JNG_6322_Minimiize_Karaf_Size 1.0.4.20250605_192947_c2e81b28_develop - 1.0.4.20250806_045652_1365024a_develop - 1.1.3.20250806_045752_96b85d61_develop - 1.0.2.20250806_044211_95f35559_develop - 1.3.0.20250806_044805_33ba0f00_develop - 1.0.4.20250806_043432_1336d9be_develop - 1.1.4.20250806_044949_bd906b82_develop - 1.0.5.20250806_045448_5bfd94d3_develop - 1.0.5.20250806_050607_4186432a_develop - 1.0.5.20250806_050224_cbba7790_develop - 1.0.1.20250806_044625_0ea79dcf_develop - 1.0.2.20250806_044838_67c9254b_develop - 1.0.2.20250806_045056_538d0ee4_develop + 1.0.4.20250818_022210_a7e5c4ef_feature_JNG_6322_Minimiize_Karaf_Size + 1.1.3.20250818_022054_7afb111c_feature_JNG_6322_Minimiize_Karaf_Size + 1.0.2.20250818_021532_c84bd6b6_feature_JNG_6322_Minimiize_Karaf_Size + 1.3.0.20250818_022014_86b433d3_feature_JNG_6322_Minimiize_Karaf_Size + 1.0.4.20250818_013958_8d9d8c51_feature_JNG_6322_Minimiize_Karaf_Size + 1.1.4.20250818_021505_e5c6a473_feature_JNG_6322_Minimiize_Karaf_Size + 1.0.5.20250818_022353_405ea881_feature_JNG_6322_Minimiize_Karaf_Size + 1.0.5.20250818_023716_e127c4d8_feature_JNG_6322_Minimiize_Karaf_Size + 1.0.5.20250818_023709_f00f1694_feature_JNG_6322_Minimiize_Karaf_Size + 1.0.1.20250818_021512_5d57740f_feature_JNG_6322_Minimiize_Karaf_Size + 1.0.2.20250818_021501_323ca3da_feature_JNG_6322_Minimiize_Karaf_Size + 1.0.2.20250818_022014_9f60637a_feature_JNG_6322_Minimiize_Karaf_Size 1.0.3.20250605_191812_7164733f_develop 2.39.0 @@ -427,6 +428,12 @@ ${judo-tatami-core-version} + + hu.blackbelt.judo.tatami + judo-tatami-util + ${judo-tatami-util-version} + + hu.blackbelt.judo.tatami judo-tatami-workflow