diff --git a/judo-runtime-core-jsl-itest/common/src/main/java/hu/blackbelt/judo/runtime/core/jsl/fixture/JudoRuntimeFixture.java b/judo-runtime-core-jsl-itest/common/src/main/java/hu/blackbelt/judo/runtime/core/jsl/fixture/JudoRuntimeFixture.java index 52e05699..651293b0 100644 --- a/judo-runtime-core-jsl-itest/common/src/main/java/hu/blackbelt/judo/runtime/core/jsl/fixture/JudoRuntimeFixture.java +++ b/judo-runtime-core-jsl-itest/common/src/main/java/hu/blackbelt/judo/runtime/core/jsl/fixture/JudoRuntimeFixture.java @@ -40,9 +40,6 @@ @Slf4j public class JudoRuntimeFixture { - - public static final String MARK_SELECTED_RANGE_ITEMS = "markSelectedRangeItems"; - static { SLF4JBridgeHandler.install(); SysOutOverSLF4J.sendSystemOutAndErrToSLF4J(); @@ -52,10 +49,6 @@ public JudoRuntimeFixture(Map context) { if (context == null) { return; } - - if (context.containsKey(MARK_SELECTED_RANGE_ITEMS)) { - this.markSelectedRangeItems = (Boolean) context.get(MARK_SELECTED_RANGE_ITEMS); - } } public JudoRuntimeFixture() {} @@ -83,8 +76,6 @@ public JudoRuntimeFixture() {} QueryFactory queryFactory; - Boolean markSelectedRangeItems = false; - private void initQueryFactory() { coercer = new DefaultCoercer(); @@ -151,8 +142,7 @@ public void init(Module module, Object injectModulesTo) { .injectModulesTo(injectModulesTo) .judoModelLoader(modelHolder) .extendableCoercer(coercer) - .queryFactory(queryFactory) - .rdbmsDaoMarkSelectedRangeItems(markSelectedRangeItems); + .queryFactory(queryFactory); Module modules = Modules.combine( module, diff --git a/judo-runtime-core-jsl-itest/models/TransferAssociationModel/src/test/java/hu/blackbelt/judo/runtime/core/jsl/transfer/MappedTransferCompositonAssociationTest.java b/judo-runtime-core-jsl-itest/models/TransferAssociationModel/src/test/java/hu/blackbelt/judo/runtime/core/jsl/transfer/MappedTransferCompositonAssociationTest.java index 6653366d..e0c0592a 100644 --- a/judo-runtime-core-jsl-itest/models/TransferAssociationModel/src/test/java/hu/blackbelt/judo/runtime/core/jsl/transfer/MappedTransferCompositonAssociationTest.java +++ b/judo-runtime-core-jsl-itest/models/TransferAssociationModel/src/test/java/hu/blackbelt/judo/runtime/core/jsl/transfer/MappedTransferCompositonAssociationTest.java @@ -362,7 +362,7 @@ void testTwoWayAssociationAlongWithCompositionTest() { assertEquals(bankAccount2.identifier().getIdentifier(), mappedCompanyDao.queryMainBankAccounts(company).orElseThrow().identifier().getIdentifier()); //Give back the range elements - List rangeOfMainBankAccounts = mappedCompanyDao.getRangeOfMainBankAccounts(company, MappedBankAccountMask.mappedBankAccountMask()); + List rangeOfMainBankAccounts = mappedCompanyDao.getRangeOfMainBankAccounts(company, MappedBankAccountMask.mappedBankAccountMask(), false); assertEquals(2, rangeOfMainBankAccounts.size()); // Check range validation diff --git a/judo-runtime-core-jsl-itest/models/TransferRangeModel/src/test/java/hu/blackbelt/judo/runtime/core/jsl/entity/TransferRangeTest.java b/judo-runtime-core-jsl-itest/models/TransferRangeModel/src/test/java/hu/blackbelt/judo/runtime/core/jsl/entity/TransferRangeTest.java index 0998a7ce..94cde3dd 100644 --- a/judo-runtime-core-jsl-itest/models/TransferRangeModel/src/test/java/hu/blackbelt/judo/runtime/core/jsl/entity/TransferRangeTest.java +++ b/judo-runtime-core-jsl-itest/models/TransferRangeModel/src/test/java/hu/blackbelt/judo/runtime/core/jsl/entity/TransferRangeTest.java @@ -109,7 +109,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import static hu.blackbelt.judo.runtime.core.jsl.fixture.JudoRuntimeFixture.MARK_SELECTED_RANGE_ITEMS; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; @@ -119,10 +118,8 @@ @Slf4j public class TransferRangeTest { - final static Map context = new HashMap<>(Map.of(MARK_SELECTED_RANGE_ITEMS, true)); - @RegisterExtension - static JudoRuntimeExtension runtimeExtension = new JudoRuntimeExtension("TransferRange", new TransferRangeDaoModules(), context); + static JudoRuntimeExtension runtimeExtension = new JudoRuntimeExtension("TransferRange", new TransferRangeDaoModules(), null); @Inject AppleDao appleDao; diff --git a/pom.xml b/pom.xml index 55bd1784..eb6dcfb7 100644 --- a/pom.xml +++ b/pom.xml @@ -43,9 +43,9 @@ javax.resource;version="[1.6,2)" - 1.1.4.20250221_104148_e8c34e89_develop - 1.0.6.20250221_043813_7b9a05c1_develop - 1.0.0.20250221_042951_90f5ce14_develop + 1.1.4.20250220_065353_f0a9d70a_feature_JNG_6022_markSelectedRangeItemsInHttpHeader + 1.0.6.20250219_213542_c004c8d9_feature_JNG_6022_markSelectedRangeItemsInHttpHeader + 1.0.0.20250219_212818_b1445f9d_feature_JNG_6022_markSelectedRangeItemsInHttpHeader 1.3.0.20250221_042033_8f97f546_develop