USe cache for transformation and validation

Author: robertcsakany

judo-tatami-asm2keycloak/src/main/java/hu/blackbelt/judo/tatami/asm2keycloak/Asm2Keycloak.java

@@ -80,7 +80,7 @@ public static final class Asm2KeycloakParameter {
         Boolean parallel = true;
 
         @Builder.Default
-        boolean useCache = false;
+        boolean useCache = true;
     }
 
     public static Asm2KeycloakTransformationTrace executeAsm2KeycloakTransformation(Asm2KeycloakParameter.Asm2KeycloakParameterBuilder builder) throws Exception {
@@ -102,6 +102,7 @@ public static Asm2KeycloakTransformationTrace executeAsm2KeycloakTransformation(
                     .name("ASM")
                     .resource(parameter.asmModel.getResource())
                     .useCache(parameter.useCache)
+                    .validateModel(false)
                     .build();
 
             // Execution context
@@ -113,7 +114,6 @@ public static Asm2KeycloakTransformationTrace executeAsm2KeycloakTransformation(
                                             .log(log)
                                             .name("KEYCLOAK")
                                             .useCache(parameter.useCache)
-                                            .newModel(true)
                                             .resource(parameter.keycloakModel.getResource())
                                             .build()
                             )

judo-tatami-asm2keycloak/src/main/java/hu/blackbelt/judo/tatami/asm2keycloak/Asm2KeycloakWork.java

@@ -46,7 +46,7 @@ public static final class Asm2KeycloakWorkParameter {
         @Builder.Default
         Boolean parallel = true;
         @Builder.Default
-        Boolean useCache = false;
+        Boolean useCache = true;
     }
 
     final URI transformationScriptRoot;

judo-tatami-asm2rdbms/src/main/java/hu/blackbelt/judo/tatami/asm2rdbms/Asm2Rdbms.java

@@ -89,7 +89,7 @@ public static final class Asm2RdbmsParameter {
         Boolean parallel = true;
 
         @Builder.Default
-        boolean useCache = false;
+        boolean useCache = true;
 
         @Builder.Default
         boolean createSimpleName = false;
@@ -191,7 +191,6 @@ public static Asm2RdbmsTransformationTrace executeAsm2RdbmsTransformation(Asm2Rd
                                     .log(log)
                                     .name("RDBMS")
                                     .useCache(parameter.useCache)
-                                    .newModel(true)
                                     .resource(parameter.rdbmsModel.getResource())
                                     .build()))
                     .injectContexts(

judo-tatami-psm2asm/src/main/java/hu/blackbelt/judo/tatami/psm2asm/Psm2Asm.java

@@ -81,7 +81,7 @@ public static final class Psm2AsmParameter {
         Boolean parallel = true;
 
         @Builder.Default
-        boolean useCache = false;
+        boolean useCache = true;
     }
 
     public static Psm2AsmTransformationTrace executePsm2AsmTransformation(Psm2AsmParameter.Psm2AsmParameterBuilder builder) throws Exception {
@@ -99,34 +99,32 @@ public static Psm2AsmTransformationTrace executePsm2AsmTransformation(Psm2AsmPar
 
         try {
 
-            ResourceSet executionResourceSet = parameter.useCache ? EmfUtils.initDefaultCachedResourceSet() : EmfUtils.initDefaultResourceSet();
-
             WrappedEmfModelContext psmModelContext = wrappedEmfModelContextBuilder()
                     .log(log)
                     .name("JUDOPSM")
                     .resource(parameter.psmModel.getResource())
                     .useCache(parameter.useCache)
+                    .validateModel(false)
                     .build();
 
             WrappedEmfModelContext asmModelContext = wrappedEmfModelContextBuilder()
                     .log(log)
                     .name("ASM")
                     .resource(parameter.asmModel.getResource())
                     .parallel(parameter.parallel)
-                    .useCache(false)
-                    .newModel(true)
+                    .useCache(parameter.useCache)
                     .build();
 
             // Executrion context
             ExecutionContext executionContext = executionContextBuilder()
                     .log(log)
-                    .resourceSet(executionResourceSet)
+                    //.resourceSet(executionResourceSet)
                     .modelContexts(ImmutableList.of(
                             psmModelContext,
                             asmModelContext))
                     .injectContexts(ImmutableMap.of(
-                            "asmUtils", new AsmUtils(executionResourceSet),
-                            "psmUtils", new PsmUtils(psmModelContext.getResourceSet())
+                            "asmUtils", new AsmUtils(parameter.asmModel.getResourceSet()),
+                            "psmUtils", new PsmUtils(parameter.psmModel.getResourceSet())
                     )).build();
 
             // run the model / metadata loading

judo-tatami-psm2asm/src/main/java/hu/blackbelt/judo/tatami/psm2asm/Psm2AsmWork.java

@@ -50,7 +50,7 @@ public static final class Psm2AsmWorkParameter {
         Boolean parallel = true;
 
         @Builder.Default
-        Boolean useCache = false;
+        Boolean useCache = true;
     }
 
     public Psm2AsmWork(TransformationContext transformationContext, URI transformationScriptRoot) {

judo-tatami-psm2measure/src/main/java/hu/blackbelt/judo/tatami/psm2measure/Psm2Measure.java

@@ -77,7 +77,7 @@ public static final class Psm2MeasureParameter {
         Boolean parallel = true;
 
         @Builder.Default
-        boolean useCache = false;
+        boolean useCache = true;
     }
 
     public static Psm2MeasureTransformationTrace executePsm2MeasureTransformation(Psm2MeasureParameter.Psm2MeasureParameterBuilder builder) throws Exception {
@@ -98,20 +98,19 @@ public static Psm2MeasureTransformationTrace executePsm2MeasureTransformation(Ps
                     .name("JUDOPSM")
                     .resource(parameter.psmModel.getResource())
                     .useCache(parameter.useCache)
+                    .validateModel(false)
                     .build();
 
             // Execution context
             ExecutionContext executionContext = executionContextBuilder()
                     .log(log)
-//                    .resourceSet(parameter.measureModel.getResourceSet())
                     .modelContexts(ImmutableList.of(
                             psmModelContext,
                             wrappedEmfModelContextBuilder()
                                     .log(log)
                                     .name("MEASURES")
                                     .resource(parameter.measureModel.getResource())
                                     .useCache(parameter.useCache)
-                                    .newModel(true)
                                     .build()))
                     .injectContexts(ImmutableMap.of("psmUtils", new PsmUtils(),
                             "measureUtils", new MeasureUtils(parameter.measureModel.getResourceSet())))

judo-tatami-psm2measure/src/main/java/hu/blackbelt/judo/tatami/psm2measure/Psm2MeasureWork.java

@@ -46,7 +46,7 @@ public static final class Psm2MeasureWorkParameter {
         @Builder.Default
         Boolean parallel = true;
         @Builder.Default
-        Boolean useCache = false;
+        Boolean useCache = true;
     }
 
     final URI transformationScriptRoot;

judo-tatami-rdbms2liquibase/src/main/java/hu/blackbelt/judo/tatami/rdbms2liquibase/Rdbms2Liquibase.java

@@ -73,7 +73,7 @@ public static final class Rdbms2LiquibaseParameter {
         Boolean parallel = true;
 
         @Builder.Default
-        boolean useCache = false;
+        boolean useCache = true;
     }
 
     public static void executeRdbms2LiquibaseTransformation(Rdbms2Liquibase.Rdbms2LiquibaseParameter.Rdbms2LiquibaseParameterBuilder builder) throws Exception {
@@ -93,21 +93,20 @@ public static void executeRdbms2LiquibaseTransformation(Rdbms2Liquibase.Rdbms2Li
                     .log(log)
                     .name("RDBMS")
                     .useCache(parameter.useCache)
+                    .validateModel(false)
                     .resource(parameter.rdbmsModel.getResourceSet().getResource(parameter.rdbmsModel.getUri(), false))
                     .build();
 
             // Execution context
             ExecutionContext executionContext = executionContextBuilder()
                     .log(log)
-                    //.resourceSet(parameter.liquibaseModel.getResourceSet())
                     .modelContexts(ImmutableList.of(
                             rdbmsModelContext,
                             wrappedEmfModelContextBuilder()
                                     .log(log)
                                     .name("LIQUIBASE")
                                     .resource(parameter.liquibaseModel.getResource())
                                     .useCache(parameter.useCache)
-                                    .newModel(true)
                                     .build()))
                     .build();
 

judo-tatami-rdbms2liquibase/src/main/java/hu/blackbelt/judo/tatami/rdbms2liquibase/Rdbms2LiquibaseWork.java

@@ -48,7 +48,7 @@ public static final class Rdbms2LiquibaseWorkParameter {
         @Builder.Default
         Boolean parallel = true;
         @Builder.Default
-        Boolean useCache = false;
+        Boolean useCache = true;
     }
 
     final URI transformationScriptRoot;

judo-tatami-rdbms2liquibase/src/test/java/hu/blackbelt/judo/tatami/rdbms2liquibase/Excel2RdbmsTest.java

@@ -109,14 +109,14 @@ public void executeExcel2RdbmsModel(RdbmsDatasourceFixture datasource) throws Ex
                                     .name("ORIGINAL_MODEL")
                                     .aliases(singletonList("ORIGINAL"))
                                     .useCache(true)
-                                    .newModel(true)
+                                    .validateModel(false)
                                     .resource(originalModel.getResource())
                                     .build(),
                             wrappedEmfModelContextBuilder()
                                     .name("NEW_MODEL")
                                     .aliases(singletonList("NEW"))
                                     .useCache(true)
-                                    .newModel(true)
+                                    .validateModel(false)
                                     .resource(newModel.getResource())
                                     .build()))
                     .build();