Merge pull request finos#7177 from deutschebank/db-contrib/entity-rel…

…ationship-variable-ref-fix-7175 Db contrib/entity relationship variable ref fix 7175
deutschebank · Oct 21, 2024 · 7c175a9 · 7c175a9
2 parents ba5b149 + 42afe49
commit 7c175a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/...ava/org/finos/waltz/integration_test/inmem/service/BulkUploadRelationshipServiceTest.java b/...ava/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/...ava/org/finos/waltz/service/entity_relationship/BulkUploadRelationshipItemParserTest.java b/...ava/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"));