From 8a744d0074a7c519ae2d43f3fc33113d19cb354d Mon Sep 17 00:00:00 2001 From: Robert Csakany Date: Sat, 15 Feb 2025 23:18:23 +0100 Subject: [PATCH 1/5] JNG-6022 Range API fix --- ...ppedTransferCompositonAssociationTest.java | 2 +- .../core/jsl/entity/TransferRangeTest.java | 42 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) 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..24ef8885 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 @@ -228,7 +228,7 @@ public void testSingleAssociationAssociationRelationTransferWithDerivedRange() { ); // check selected - rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAssItem(transferAss); + rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAssItem(transferAss, null, true); List selected = getSelectedItems(rangeOfSingleAssAssItem); @@ -237,7 +237,7 @@ public void testSingleAssociationAssociationRelationTransferWithDerivedRange() { transferAssDao.unsetSingleAssAssItem(transferAss); - rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAssItem(transferAss); + rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAssItem(transferAss, null, true); assertEquals(0, getSelectedItems(rangeOfSingleAssAssItem).size()); @@ -286,7 +286,7 @@ public void testSingleAssociationAggregationRelationTransferWithDerivedRange() { ); // check selected - rangeOfSingleAssAggItem = transferAggDao.getRangeOfSingleAssAggItem(transferAgg); + rangeOfSingleAssAggItem = transferAggDao.getRangeOfSingleAssAggItem(transferAgg, null, true); List selected = getSelectedItems(rangeOfSingleAssAggItem); @@ -295,7 +295,7 @@ public void testSingleAssociationAggregationRelationTransferWithDerivedRange() { transferAggDao.unsetSingleAssAggItem(transferAgg); - rangeOfSingleAssAggItem = transferAggDao.getRangeOfSingleAssAggItem(transferAgg); + rangeOfSingleAssAggItem = transferAggDao.getRangeOfSingleAssAggItem(transferAgg, null, true); assertEquals(0, getSelectedItems(rangeOfSingleAssAggItem).size()); @@ -353,7 +353,7 @@ public void testSingleAssociationAssociationRelationTransferWithSelfRelatedRange ); // check selected - rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAssItem(transferAss); + rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAssItem(transferAss, null, true); List selected = getSelectedItems(rangeOfSingleAssAssItem); @@ -362,7 +362,7 @@ public void testSingleAssociationAssociationRelationTransferWithSelfRelatedRange transferAssDao.unsetSingleAssAssItem(transferAss); - rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAssItem(transferAss); + rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAssItem(transferAss, null, true); assertEquals(0, getSelectedItems(rangeOfSingleAssAssItem).size()); @@ -421,7 +421,7 @@ public void testSingleAssociationAggregationRelationTransferWithSelfRelatedRange ); // check selected - rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAggItem(transferAss); + rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAggItem(transferAss, null, true); List selected = getSelectedItems(rangeOfSingleAssAssItem); @@ -430,7 +430,7 @@ public void testSingleAssociationAggregationRelationTransferWithSelfRelatedRange transferAssDao.unsetSingleAssAggItem(transferAss); - rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAggItem(transferAss); + rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAggItem(transferAss, null, true); assertEquals(0, getSelectedItems(rangeOfSingleAssAssItem).size()); @@ -481,7 +481,7 @@ public void testSingleTransientRelationTransferWithRange() { transferWithTransientRelation = transferTransientDao.update(transferWithTransientRelation); // check selected - rangeOfTransientItemWithAnyRange = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation); + rangeOfTransientItemWithAnyRange = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation, null, true); // check none of the range element is selected assertEquals(0, getSelectedItems(rangeOfTransientItemWithAnyRange).size()); // Derived Transient Range @@ -515,7 +515,7 @@ public void testSingleTransientRelationTransferWithRange() { transferWithTransientRelation = transferTransientDao.update(transferWithTransientRelation); // check selected - rangeOfTransientItemWithDerivedRangeItem = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation); + rangeOfTransientItemWithDerivedRangeItem = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation, null, true); // check none of the range element is selected assertEquals(0, getSelectedItems(rangeOfTransientItemWithDerivedRangeItem).size()); // Self Range for transient relation @@ -551,7 +551,7 @@ public void testSingleTransientRelationTransferWithRange() { transferWithTransientRelation = transferTransientDao.update(transferWithTransientRelation); // check selected - rangeOfTransientItemWithSelfRange = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation); + rangeOfTransientItemWithSelfRange = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation, null, true); // check none of the range element is selected assertEquals(0, getSelectedItems(rangeOfTransientItemWithSelfRange).size()); @@ -640,7 +640,7 @@ public void testCollectionAssociationAssociationRelationTransferWithDerivedRange ); // check selected - rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAssItem(transferAss); + rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAssItem(transferAss, null, true); List selected = getSelectedItems(rangeOfCollectionAssAssItem); @@ -700,7 +700,7 @@ public void testCollectionAssociationAggregationRelationTransferWithDerivedRange ); // check selected - rangeOfCollectionAssAggItem = transferAggDao.getRangeOfCollectionAssAggItem(transferAgg); + rangeOfCollectionAssAggItem = transferAggDao.getRangeOfCollectionAssAggItem(transferAgg, null, true); List selected = getSelectedItems(rangeOfCollectionAssAggItem); @@ -711,7 +711,7 @@ public void testCollectionAssociationAggregationRelationTransferWithDerivedRange transferAggDao.removeCollectionAssAggItem(transferAgg, selected); - rangeOfCollectionAssAggItem = transferAggDao.getRangeOfCollectionAssAggItem(transferAgg); + rangeOfCollectionAssAggItem = transferAggDao.getRangeOfCollectionAssAggItem(transferAgg, null, true); assertEquals(0, getSelectedItems(rangeOfCollectionAssAggItem).size()); @@ -769,7 +769,7 @@ public void testCollectionAssociationAssociationRelationTransferWithSelfRelatedR ); // check selected - rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAssItem(transferAss); + rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAssItem(transferAss, null, true); List selected = getSelectedItems(rangeOfCollectionAssAssItem); @@ -780,7 +780,7 @@ public void testCollectionAssociationAssociationRelationTransferWithSelfRelatedR transferAssDao.removeCollectionAssAssItem(transferAss, selected); - rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAssItem(transferAss); + rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAssItem(transferAss, null, true); assertEquals(0, getSelectedItems(rangeOfCollectionAssAssItem).size()); @@ -839,7 +839,7 @@ public void testCollectionAssociationAggregationRelationTransferWithSelfRelatedR ); // check selected - rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAggItem(transferAss); + rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAggItem(transferAss, null, true); List selected = getSelectedItems(rangeOfCollectionAssAssItem); @@ -849,7 +849,7 @@ public void testCollectionAssociationAggregationRelationTransferWithSelfRelatedR ); transferAssDao.removeCollectionAssAggItem(transferAss, selected); - rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAggItem(transferAss); + rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAggItem(transferAss, null, true); assertEquals(0, getSelectedItems(rangeOfCollectionAssAssItem).size()); @@ -902,7 +902,7 @@ public void testCollectionTransientRelationTransferWithRange() { transferWithTransientRelation = transferTransientDao.update(transferWithTransientRelation); // check selected - rangeOfTransientItemWithAnyRange = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation); + rangeOfTransientItemWithAnyRange = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation, null, true); // check none of the range element is selected assertEquals(0, getSelectedItems(rangeOfTransientItemWithAnyRange).size()); // Derived Transient Range @@ -936,7 +936,7 @@ public void testCollectionTransientRelationTransferWithRange() { transferWithTransientRelation = transferTransientDao.update(transferWithTransientRelation); // check selected - rangeOfTransientItemWithDerivedRangeItem = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation); + rangeOfTransientItemWithDerivedRangeItem = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation, null, true); // check none of the range element is selected assertEquals(0, getSelectedItems(rangeOfTransientItemWithDerivedRangeItem).size()); // Self Range for transient relation @@ -972,7 +972,7 @@ public void testCollectionTransientRelationTransferWithRange() { transferWithTransientRelation = transferTransientDao.update(transferWithTransientRelation); // check selected - rangeOfTransientItemWithSelfRange = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation); + rangeOfTransientItemWithSelfRange = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation, null, true); // check none of the range element is selected assertEquals(0, getSelectedItems(rangeOfTransientItemWithSelfRange).size()); From 40f239955538a35d429be54a199341c28aa4d090 Mon Sep 17 00:00:00 2001 From: Robert Csakany Date: Sun, 16 Feb 2025 09:36:02 +0100 Subject: [PATCH 2/5] Change default behaviour --- .../core/jsl/fixture/JudoRuntimeFixture.java | 7 ---- .../core/jsl/entity/TransferRangeTest.java | 42 +++++++++---------- 2 files changed, 21 insertions(+), 28 deletions(-) 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..d72a67d9 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() {} 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 24ef8885..0998a7ce 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 @@ -228,7 +228,7 @@ public void testSingleAssociationAssociationRelationTransferWithDerivedRange() { ); // check selected - rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAssItem(transferAss, null, true); + rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAssItem(transferAss); List selected = getSelectedItems(rangeOfSingleAssAssItem); @@ -237,7 +237,7 @@ public void testSingleAssociationAssociationRelationTransferWithDerivedRange() { transferAssDao.unsetSingleAssAssItem(transferAss); - rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAssItem(transferAss, null, true); + rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAssItem(transferAss); assertEquals(0, getSelectedItems(rangeOfSingleAssAssItem).size()); @@ -286,7 +286,7 @@ public void testSingleAssociationAggregationRelationTransferWithDerivedRange() { ); // check selected - rangeOfSingleAssAggItem = transferAggDao.getRangeOfSingleAssAggItem(transferAgg, null, true); + rangeOfSingleAssAggItem = transferAggDao.getRangeOfSingleAssAggItem(transferAgg); List selected = getSelectedItems(rangeOfSingleAssAggItem); @@ -295,7 +295,7 @@ public void testSingleAssociationAggregationRelationTransferWithDerivedRange() { transferAggDao.unsetSingleAssAggItem(transferAgg); - rangeOfSingleAssAggItem = transferAggDao.getRangeOfSingleAssAggItem(transferAgg, null, true); + rangeOfSingleAssAggItem = transferAggDao.getRangeOfSingleAssAggItem(transferAgg); assertEquals(0, getSelectedItems(rangeOfSingleAssAggItem).size()); @@ -353,7 +353,7 @@ public void testSingleAssociationAssociationRelationTransferWithSelfRelatedRange ); // check selected - rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAssItem(transferAss, null, true); + rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAssItem(transferAss); List selected = getSelectedItems(rangeOfSingleAssAssItem); @@ -362,7 +362,7 @@ public void testSingleAssociationAssociationRelationTransferWithSelfRelatedRange transferAssDao.unsetSingleAssAssItem(transferAss); - rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAssItem(transferAss, null, true); + rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAssItem(transferAss); assertEquals(0, getSelectedItems(rangeOfSingleAssAssItem).size()); @@ -421,7 +421,7 @@ public void testSingleAssociationAggregationRelationTransferWithSelfRelatedRange ); // check selected - rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAggItem(transferAss, null, true); + rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAggItem(transferAss); List selected = getSelectedItems(rangeOfSingleAssAssItem); @@ -430,7 +430,7 @@ public void testSingleAssociationAggregationRelationTransferWithSelfRelatedRange transferAssDao.unsetSingleAssAggItem(transferAss); - rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAggItem(transferAss, null, true); + rangeOfSingleAssAssItem = transferAssDao.getRangeOfSingleAssAggItem(transferAss); assertEquals(0, getSelectedItems(rangeOfSingleAssAssItem).size()); @@ -481,7 +481,7 @@ public void testSingleTransientRelationTransferWithRange() { transferWithTransientRelation = transferTransientDao.update(transferWithTransientRelation); // check selected - rangeOfTransientItemWithAnyRange = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation, null, true); + rangeOfTransientItemWithAnyRange = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation); // check none of the range element is selected assertEquals(0, getSelectedItems(rangeOfTransientItemWithAnyRange).size()); // Derived Transient Range @@ -515,7 +515,7 @@ public void testSingleTransientRelationTransferWithRange() { transferWithTransientRelation = transferTransientDao.update(transferWithTransientRelation); // check selected - rangeOfTransientItemWithDerivedRangeItem = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation, null, true); + rangeOfTransientItemWithDerivedRangeItem = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation); // check none of the range element is selected assertEquals(0, getSelectedItems(rangeOfTransientItemWithDerivedRangeItem).size()); // Self Range for transient relation @@ -551,7 +551,7 @@ public void testSingleTransientRelationTransferWithRange() { transferWithTransientRelation = transferTransientDao.update(transferWithTransientRelation); // check selected - rangeOfTransientItemWithSelfRange = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation, null, true); + rangeOfTransientItemWithSelfRange = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation); // check none of the range element is selected assertEquals(0, getSelectedItems(rangeOfTransientItemWithSelfRange).size()); @@ -640,7 +640,7 @@ public void testCollectionAssociationAssociationRelationTransferWithDerivedRange ); // check selected - rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAssItem(transferAss, null, true); + rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAssItem(transferAss); List selected = getSelectedItems(rangeOfCollectionAssAssItem); @@ -700,7 +700,7 @@ public void testCollectionAssociationAggregationRelationTransferWithDerivedRange ); // check selected - rangeOfCollectionAssAggItem = transferAggDao.getRangeOfCollectionAssAggItem(transferAgg, null, true); + rangeOfCollectionAssAggItem = transferAggDao.getRangeOfCollectionAssAggItem(transferAgg); List selected = getSelectedItems(rangeOfCollectionAssAggItem); @@ -711,7 +711,7 @@ public void testCollectionAssociationAggregationRelationTransferWithDerivedRange transferAggDao.removeCollectionAssAggItem(transferAgg, selected); - rangeOfCollectionAssAggItem = transferAggDao.getRangeOfCollectionAssAggItem(transferAgg, null, true); + rangeOfCollectionAssAggItem = transferAggDao.getRangeOfCollectionAssAggItem(transferAgg); assertEquals(0, getSelectedItems(rangeOfCollectionAssAggItem).size()); @@ -769,7 +769,7 @@ public void testCollectionAssociationAssociationRelationTransferWithSelfRelatedR ); // check selected - rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAssItem(transferAss, null, true); + rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAssItem(transferAss); List selected = getSelectedItems(rangeOfCollectionAssAssItem); @@ -780,7 +780,7 @@ public void testCollectionAssociationAssociationRelationTransferWithSelfRelatedR transferAssDao.removeCollectionAssAssItem(transferAss, selected); - rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAssItem(transferAss, null, true); + rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAssItem(transferAss); assertEquals(0, getSelectedItems(rangeOfCollectionAssAssItem).size()); @@ -839,7 +839,7 @@ public void testCollectionAssociationAggregationRelationTransferWithSelfRelatedR ); // check selected - rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAggItem(transferAss, null, true); + rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAggItem(transferAss); List selected = getSelectedItems(rangeOfCollectionAssAssItem); @@ -849,7 +849,7 @@ public void testCollectionAssociationAggregationRelationTransferWithSelfRelatedR ); transferAssDao.removeCollectionAssAggItem(transferAss, selected); - rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAggItem(transferAss, null, true); + rangeOfCollectionAssAssItem = transferAssDao.getRangeOfCollectionAssAggItem(transferAss); assertEquals(0, getSelectedItems(rangeOfCollectionAssAssItem).size()); @@ -902,7 +902,7 @@ public void testCollectionTransientRelationTransferWithRange() { transferWithTransientRelation = transferTransientDao.update(transferWithTransientRelation); // check selected - rangeOfTransientItemWithAnyRange = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation, null, true); + rangeOfTransientItemWithAnyRange = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation); // check none of the range element is selected assertEquals(0, getSelectedItems(rangeOfTransientItemWithAnyRange).size()); // Derived Transient Range @@ -936,7 +936,7 @@ public void testCollectionTransientRelationTransferWithRange() { transferWithTransientRelation = transferTransientDao.update(transferWithTransientRelation); // check selected - rangeOfTransientItemWithDerivedRangeItem = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation, null, true); + rangeOfTransientItemWithDerivedRangeItem = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation); // check none of the range element is selected assertEquals(0, getSelectedItems(rangeOfTransientItemWithDerivedRangeItem).size()); // Self Range for transient relation @@ -972,7 +972,7 @@ public void testCollectionTransientRelationTransferWithRange() { transferWithTransientRelation = transferTransientDao.update(transferWithTransientRelation); // check selected - rangeOfTransientItemWithSelfRange = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation, null, true); + rangeOfTransientItemWithSelfRange = transferTransientDao.getRangeOfTransientItemWithAnyRange(transferWithTransientRelation); // check none of the range element is selected assertEquals(0, getSelectedItems(rangeOfTransientItemWithSelfRange).size()); From 660740be85b1aba66f06072c8222516e448247d3 Mon Sep 17 00:00:00 2001 From: Robert Csakany Date: Sun, 16 Feb 2025 23:06:21 +0100 Subject: [PATCH 3/5] Remove unused parameter --- .../judo/runtime/core/jsl/entity/TransferRangeTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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; From 7666bb0545d9be25a8bc73a38449d7bb29e6d02a Mon Sep 17 00:00:00 2001 From: Robert Csakany Date: Thu, 20 Feb 2025 07:57:42 +0100 Subject: [PATCH 4/5] JNG-6022 [Release] Updating versions --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 From fc06fb6081ae637042ad13dca2f9019d47a9ff3f Mon Sep 17 00:00:00 2001 From: Robert Csakany Date: Fri, 21 Feb 2025 00:07:12 +0100 Subject: [PATCH 5/5] Removing unused parameter --- .../judo/runtime/core/jsl/fixture/JudoRuntimeFixture.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 d72a67d9..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 @@ -76,8 +76,6 @@ public JudoRuntimeFixture() {} QueryFactory queryFactory; - Boolean markSelectedRangeItems = false; - private void initQueryFactory() { coercer = new DefaultCoercer(); @@ -144,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,