Pull request #395: CTCTOWALTZ-3313 bulk taxonomy 6595

Merge in WALTZ/waltz from WALTZ/waltz-dw:CTCTOWALTZ-3313-bulk-taxonomy-6595 to db-feature/waltz-6595-bulk-taxonomy

* commit '69bc6681e4a2a7a82cf190919ec419105b8ea4cb':
  Measurable Taxonomy - bulk load
  Measurable Taxonomy - bulk load
  Measurable Taxonomy - bulk load WIP
  Measurable Taxonomy - bulk load WIP
  Measurable Taxonomy - bulk load WIP
  Measurable Taxonomy - bulk load WIP
  Measurable Taxonomy - bulk load WIP
  Measurable Taxonomy - bulk load WIP
  Measurable Taxonomy - bulk load WIP
  Measurable Taxonomy - bulk load WIP
  Bulk measurable creation
  Bulk measurable creation
  Bulk measurable creation

pom.xml

@@ -178,6 +178,11 @@
                 <artifactId>jackson-dataformat-yaml</artifactId>
                 <version>${jackson.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-csv</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.datatype</groupId>
                 <artifactId>jackson-datatype-jdk8</artifactId>

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

@@ -217,6 +217,11 @@ public static <K, R, V> Map<K, R> indexBy(Collection<V> xs,
 
     public static <K, V> Map<K, Long> countBy(Function<V, K> keyFn,
                                               Collection<V> xs) {
+        return countBy(xs, keyFn);
+    }
+
+    public static <K, V> Map<K, Long> countBy(Collection<V> xs,
+                                              Function<V, K> keyFn) {
         if (xs == null) {
             return emptyMap();
         }

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

@@ -182,4 +182,8 @@ public static <T> Set<T> add(Set<T> orig, T... ts) {
     public static <T> Set<T> remove(Set<T> orig, T... ts) {
         return minus(orig, asSet(ts));
     }
+
+    public static <T> Set<T> compact(T... ts) {
+        return remove(asSet(ts), (T) null);
+    }
 }

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

@@ -73,6 +73,12 @@ public static <T> Stream<T> concat(Stream<T>... streams) {
     }
 
 
+    public static Stream<String> lines(String multiLineStr) {
+        String[] lines = multiLineStr.split("(\n|\r|\r\n)");
+        return Stream.of(lines);
+    }
+
+
     public static class Siphon<T> implements Predicate<T> {
         private final Predicate<T> pred;
         private final List<T> results = new ArrayList<>();

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

@@ -327,5 +327,37 @@ public static Optional<String> firstNonNull(String... xs) {
                 .findFirst();
     }
 
+
+    public static boolean safeEq(String expected, String actual) {
+        if(actual == null && expected == null) {
+            return true;
+        } else if(actual == null || expected == null) {
+            return false;
+        } else {
+            return actual.equals(expected);
+        }
+    }
+
+
+    public static boolean safeEqIgnoreCase(String expected, String actual) {
+        if(actual == null && expected == null) {
+            return true;
+        } else if(actual == null || expected == null) {
+            return false;
+        } else {
+            return actual.equalsIgnoreCase(expected);
+        }
+    }
+
+
+    public static String mkExternalId(String str) {
+        return sanitizeCharacters(mkSafe(str))
+                .toUpperCase()
+                .replaceAll("&", " AND ")
+                .replaceAll("[\\s\\-(){}/\\\\,.*;]", "_")
+                .replaceAll("_+", "_");
+    }
+
+
 }
 

waltz-common/src/test/java/org/finos/waltz/common/StreamUtilities_linesTest.java

@@ -0,0 +1,49 @@
+package org.finos.waltz.common;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class StreamUtilities_linesTest {
+
+    @Test
+    public void simpleCase(){
+        Stream<String> emptyLine = StreamUtilities
+                .lines("");
+
+        assertEquals("", emptyLine.collect(Collectors.joining("")));
+
+    }
+
+
+    @Test
+    public void multiLines(){
+        Stream<String> output = StreamUtilities
+                .lines("a\nb\nc");
+
+        assertEquals("a#b#c", output.collect(Collectors.joining("#")));
+
+    }
+
+
+    @Test
+    public void onlyOneLine(){
+        Stream<String> output = StreamUtilities
+                .lines("ddd");
+
+        assertEquals("<ddd>", output.collect(Collectors.joining("#", "<", ">")));
+
+    }
+
+
+    @Test
+    public void emptyLines(){
+        Stream<String> output = StreamUtilities
+                .lines("hello\n\nworld");
+
+        assertEquals("<hello##world>", output.collect(Collectors.joining("#", "<", ">")));
+    }
+}

waltz-data/src/main/java/org/finos/waltz/data/measurable/MeasurableDao.java

@@ -298,6 +298,16 @@ public List<Measurable> findByCategoryId(Long categoryId) {
     }
 
 
+    public List<Measurable> findByCategoryId(Long categoryId, Set<EntityLifecycleStatus> statuses) {
+        return dsl
+                .select(MEASURABLE.fields())
+                .from(MEASURABLE)
+                .where(MEASURABLE.MEASURABLE_CATEGORY_ID.eq(categoryId))
+                .and(MEASURABLE.ENTITY_LIFECYCLE_STATUS.in(statuses))
+                .fetch(TO_DOMAIN_MAPPER);
+    }
+
+
     public List<Measurable> findByParentId(Long parentId) {
         return dsl
                 .select(MEASURABLE.fields())