Skip to content

Commit dea987d

Browse files
Add errors checking on server side
#CTCTOWALTZ-2708 #6612
1 parent e432ee7 commit dea987d

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

waltz-service/src/main/java/org/finos/waltz/service/taxonomy_management/processors/MergeMeasurableCommandProcessor.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package org.finos.waltz.service.taxonomy_management.processors;
2020

21+
import org.finos.waltz.common.Checks;
2122
import org.finos.waltz.common.DateTimeUtilities;
2223
import org.finos.waltz.common.SetUtilities;
2324
import org.finos.waltz.model.EntityKind;
@@ -97,12 +98,10 @@ public TaxonomyChangePreview preview(TaxonomyChangeCommand cmd) {
9798

9899

99100
public TaxonomyChangeCommand apply(TaxonomyChangeCommand cmd, String userId) {
101+
100102
Measurable measurableToMerge = validate(cmd);
101103
Long target = getTarget(cmd);
102-
103-
if (target == null) {
104-
throw new IllegalArgumentException("Cannot perform a merge where the target has not been identified");
105-
}
104+
checkNotNull(target, "Target cannot be null when migrating a measurable");
106105

107106
String targetName = getTargetName(cmd);
108107
IdSelectionOptions selectionOptions = mkOpts(measurableToMerge.entityReference(), HierarchyQueryScope.EXACT); // children are migrated, do not want to delete their data

0 commit comments

Comments
 (0)