From a1c6fa6c3093c78d5227e5a6c90994068fc224c0 Mon Sep 17 00:00:00 2001
From: jainshrk <shreyans.jain@db.com>
Date: Mon, 21 Oct 2024 14:32:32 +0530
Subject: [PATCH 1/2] remove unused imports, and change test assertion bug

---
 .../inmem/service/BulkUploadRelationshipServiceTest.java    | 6 ++----
 .../BulkUploadRelationshipItemParserTest.java               | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/waltz-integration-test/src/test/java/org/finos/waltz/integration_test/inmem/service/BulkUploadRelationshipServiceTest.java b/waltz-integration-test/src/test/java/org/finos/waltz/integration_test/inmem/service/BulkUploadRelationshipServiceTest.java
index 4b34e90868..dcd840464c 100644
--- a/waltz-integration-test/src/test/java/org/finos/waltz/integration_test/inmem/service/BulkUploadRelationshipServiceTest.java
+++ b/waltz-integration-test/src/test/java/org/finos/waltz/integration_test/inmem/service/BulkUploadRelationshipServiceTest.java
@@ -1,7 +1,7 @@
 package org.finos.waltz.integration_test.inmem.service;
 
-import com.sun.org.slf4j.internal.Logger;
-import com.sun.org.slf4j.internal.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.finos.waltz.common.SetUtilities;
 import org.finos.waltz.common.StringUtilities;
 import org.finos.waltz.integration_test.inmem.BaseInMemoryIntegrationTest;
@@ -15,7 +15,6 @@
 import org.finos.waltz.model.rel.ImmutableRelationshipKind;
 import org.finos.waltz.model.rel.RelationshipKind;
 import org.finos.waltz.model.user.SystemRole;
-import org.finos.waltz.service.app_group.AppGroupService;
 import org.finos.waltz.service.application.ApplicationService;
 import org.finos.waltz.service.entity_relationship.BulkUploadRelationshipService;
 import org.finos.waltz.service.entity_relationship.EntityRelationshipService;
@@ -29,7 +28,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import static java.lang.String.format;
diff --git a/waltz-service/src/test/java/org/finos/waltz/service/entity_relationship/BulkUploadRelationshipItemParserTest.java b/waltz-service/src/test/java/org/finos/waltz/service/entity_relationship/BulkUploadRelationshipItemParserTest.java
index 7faaae2552..e7a6a184d1 100644
--- a/waltz-service/src/test/java/org/finos/waltz/service/entity_relationship/BulkUploadRelationshipItemParserTest.java
+++ b/waltz-service/src/test/java/org/finos/waltz/service/entity_relationship/BulkUploadRelationshipItemParserTest.java
@@ -54,7 +54,7 @@ void simpleTSV() {
          */
         BulkUploadRelationshipParsedResult result = parser.parse(readTestFile("test-relationship-item.tsv"), BulkUploadRelationshipItemParser.InputFormat.TSV);
         assertEquals(null, result.error());
-        assertEquals(2, result.parsedItems().size());
+        assertEquals(3, result.parsedItems().size());
 
         Set<String> sourceExternalIds = SetUtilities.map(result.parsedItems(), BulkUploadRelationshipItem::sourceExternalId);
         assertEquals(sourceExternalIds, SetUtilities.asSet("sourceExtA", "sourceExtB", "sourceExtC"));

From ebbea8c9b2f39119f3f1234e2d3b055a8d2c835d Mon Sep 17 00:00:00 2001
From: Abhijit Jejurkar <abhijit.jejurkar@db.com>
Date: Mon, 21 Oct 2024 14:56:00 +0530
Subject: [PATCH 2/2] db liquibase changes for h2

---
 .../resources/liquibase/db.changelog-1.65.xml | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/waltz-schema/src/main/resources/liquibase/db.changelog-1.65.xml b/waltz-schema/src/main/resources/liquibase/db.changelog-1.65.xml
index 9d206add3a..b3c501ba69 100644
--- a/waltz-schema/src/main/resources/liquibase/db.changelog-1.65.xml
+++ b/waltz-schema/src/main/resources/liquibase/db.changelog-1.65.xml
@@ -56,67 +56,78 @@
                           tableName="user_agent_info"/>
     </changeSet>
     <changeSet id="20241009-7162-6"
-               author="jejuabh">
+               author="jejuabh"
+               dbms="!h2">
         <comment>7162: Add description to table qrtz_triggers</comment>
         <setTableRemarks  remarks="is where general information of a trigger is saved"
                           tableName="qrtz_triggers"/>
     </changeSet>
     <changeSet id="20241009-7162-7"
-               author="jejuabh">
+               author="jejuabh"
+               dbms="!h2">
         <comment>7162: Add description to table qrtz_simprop_triggers</comment>
         <setTableRemarks  remarks="have a foreign key relation to qrtz_triggers which save those specific details. Ex. Cron has cron expression which is unique to it."
                           tableName="qrtz_simprop_triggers"/>
     </changeSet>
     <changeSet id="20241009-7162-8"
-               author="jejuabh">
+               author="jejuabh"
+               dbms="!h2">
         <comment>7162: Add description to table qrtz_simple_triggers</comment>
         <setTableRemarks  remarks="have a foreign key relation to qrtz_triggers which save those specific details. Ex. Cron has cron expression which is unique to it."
                           tableName="qrtz_simple_triggers"/>
     </changeSet>
     <changeSet id="20241009-7162-9"
-               author="jejuabh">
+               author="jejuabh"
+               dbms="!h2">
         <comment>7162: Add description to table qrtz_scheduler_state</comment>
         <setTableRemarks  remarks="is for capturing the node state so that if in any case one node gets down or failed to execute one of the job then the other instance running in clustering mode can pick the misfired job"
                           tableName="qrtz_scheduler_state"/>
     </changeSet>
     <changeSet id="20241009-7162-10"
-               author="jejuabh">
+               author="jejuabh"
+               dbms="!h2">
         <comment>7162: Add description to table qrtz_paused_trigger_grps</comment>
         <setTableRemarks  remarks="is to save the information about triggers which are not active"
                           tableName="qrtz_paused_trigger_grps"/>
     </changeSet>
     <changeSet id="20241009-7162-11"
-               author="jejuabh">
+               author="jejuabh"
+               dbms="!h2">
         <comment>7162: Add description to table qrtz_locks</comment>
         <setTableRemarks  remarks="stores the value of the instance name executing the job, to avoid the sceanario of multiple nodes executing the same job"
                           tableName="qrtz_locks"/>
     </changeSet>
     <changeSet id="20241009-7162-12"
-               author="jejuabh">
+               author="jejuabh"
+               dbms="!h2">
         <comment>7162: Add description to table qrtz_job_details</comment>
         <setTableRemarks  remarks="the task to be executed."
                           tableName="qrtz_job_details"/>
     </changeSet>
     <changeSet id="20241009-7162-13"
-               author="jejuabh">
+               author="jejuabh"
+               dbms="!h2">
         <comment>7162: Add description to table qrtz_fired_triggers</comment>
         <setTableRemarks  remarks="is a log of all the triggers that were fired."
                           tableName="qrtz_fired_triggers"/>
     </changeSet>
     <changeSet id="20241009-7162-14"
-               author="jejuabh">
+               author="jejuabh"
+               dbms="!h2">
         <comment>7162: Add description to table qrtz_cron_triggers</comment>
         <setTableRemarks  remarks="have a foreign key relation to qrtz_triggers which save those specific details. Ex. Cron has cron expression which is unique to it."
                           tableName="qrtz_cron_triggers"/>
     </changeSet>
     <changeSet id="20241009-7162-15"
-               author="jejuabh">
+               author="jejuabh"
+               dbms="!h2">
         <comment>7162: Add description to table qrtz_calendars</comment>
         <setTableRemarks  remarks="for excluding blocks of time from the the trigger’s firing schedule. For instance, you could create a trigger that fires a job every weekday at 9:30 am, but then add a Calendar that excludes all of the business’s holidays"
                           tableName="qrtz_calendars"/>
     </changeSet>
     <changeSet id="20241009-7162-16"
-               author="jejuabh">
+               author="jejuabh"
+               dbms="!h2">
         <comment>7162: Add description to table qrtz_blob_triggers</comment>
         <setTableRemarks  remarks="for excluding blocks of time from the the trigger’s firing schedule. For instance, you could create a trigger that fires a job every weekday at 9:30 am, but then add a Calendar that excludes all of the business’s holidays"
                           tableName="qrtz_blob_triggers"/>