Merge pull request #7286 from deutschebank/db-contrib/waltz-7281_actors_with_characters_&_display_issue_in_multiple_pages

Db contrib/waltz 7281 actors with characters & display issue in multiple pages

Author: jain-shreyans-db

waltz-common/src/main/java/org/finos/waltz/common/StringUtilities.java

@@ -256,7 +256,8 @@ public static String sanitizeCharacters(String str) {
                     .replaceAll("“", "\"")
                     .replaceAll("”", "\"")
                     .replaceAll("’", "'")
-                    .replaceAll(" ", " ");
+                    .replaceAll(" ", " ")
+                    .replaceAll("&", "&");
         }
     }
 

waltz-data/src/main/java/org/finos/waltz/data/actor/ActorDao.java

@@ -45,6 +45,7 @@
 import static org.finos.waltz.common.Checks.checkNotNull;
 import static org.finos.waltz.common.Checks.checkOptionalIsPresent;
 import static org.finos.waltz.common.DateTimeUtilities.toLocalDateTime;
+import static org.finos.waltz.common.StringUtilities.sanitizeCharacters;
 
 @Repository
 public class ActorDao {
@@ -56,8 +57,8 @@ public class ActorDao {
 
         return ImmutableActor.builder()
                 .id(record.getId())
-                .name(record.getName())
-                .description(record.getDescription())
+                .name(sanitizeCharacters(record.getName()))
+                .description(sanitizeCharacters(record.getDescription()))
                 .lastUpdatedAt(toLocalDateTime(record.getLastUpdatedAt()))
                 .lastUpdatedBy(record.getLastUpdatedBy())
                 .isExternal(record.getIsExternal())

waltz-data/src/main/java/org/finos/waltz/data/logical_flow/LogicalFlowDao.java

@@ -75,7 +75,7 @@
 import static org.finos.waltz.schema.tables.Application.APPLICATION;
 import static org.finos.waltz.schema.tables.LogicalFlow.LOGICAL_FLOW;
 import static org.jooq.lambda.tuple.Tuple.tuple;
-
+import static org.finos.waltz.common.StringUtilities.sanitizeCharacters;
 
 @Repository
 public class LogicalFlowDao {
@@ -113,13 +113,13 @@ public class LogicalFlowDao {
                 .source(ImmutableEntityReference.builder()
                         .kind(EntityKind.valueOf(record.getSourceEntityKind()))
                         .id(record.getSourceEntityId())
-                        .name(ofNullable(r.getValue(SOURCE_NAME_FIELD)))
+                        .name(ofNullable(sanitizeCharacters(r.getValue(SOURCE_NAME_FIELD))))
                         .externalId(ofNullable(r.getValue(SOURCE_EXTERNAL_ID_FIELD)))
                         .build())
                 .target(ImmutableEntityReference.builder()
                         .kind(EntityKind.valueOf(record.getTargetEntityKind()))
                         .id(record.getTargetEntityId())
-                        .name(ofNullable(r.getValue(TARGET_NAME_FIELD)))
+                        .name(ofNullable(sanitizeCharacters(r.getValue(TARGET_NAME_FIELD))))
                         .externalId(ofNullable(r.getValue(TARGET_EXTERNAL_ID_FIELD)))
                         .build())
                 .entityLifecycleStatus(readEnum(record.getEntityLifecycleStatus(), EntityLifecycleStatus.class, s -> EntityLifecycleStatus.ACTIVE))