Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from finos:master #107

Merged
merged 6 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
33 changes: 22 additions & 11 deletions waltz-schema/src/main/resources/liquibase/db.changelog-1.65.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down
Loading