From c7d73b621bafb4dfc2c45e90cfece2abb8f9cdb7 Mon Sep 17 00:00:00 2001 From: stiv03 Date: Thu, 2 Apr 2026 13:30:33 +0300 Subject: [PATCH 1/2] Add phase-configs support to Hook model for target-app resolution --- .../multiapps/mta/handlers/v3/Schemas.java | 5 +++++ .../org/cloudfoundry/multiapps/mta/model/Hook.java | 12 ++++++++++++ .../multiapps/mta/parsers/v3/HookParser.java | 10 ++++++++-- .../test/resources/mta/sample/v3/merged-06.yaml.json | 3 ++- .../test/resources/mta/sample/v3/merged-07.yaml.json | 3 ++- .../v3/parsed-mtad-with-hooks-correct-data.json | 3 ++- .../v3/parsed-mtad-with-more-hook-phases.json | 3 ++- .../mta/handlers/v3/parsed-mtad-with-two-hooks.json | 6 ++++-- .../multiapps/mta/resolvers/v3/resolved-03.yaml.json | 6 ++++-- .../v3/result-from-escaped-placeholders.json | 3 ++- .../resolvers/v3/result-from-escaped-references.json | 3 ++- .../v3/result-from-placeholders-in-hooks.json | 6 ++++-- .../v3/result-from-unescaping-placeholders.json | 3 ++- .../v3/result-from-unescaping-references.json | 3 ++- 14 files changed, 53 insertions(+), 16 deletions(-) diff --git a/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/handlers/v3/Schemas.java b/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/handlers/v3/Schemas.java index 29a5f65e..bcfb59fd 100644 --- a/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/handlers/v3/Schemas.java +++ b/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/handlers/v3/Schemas.java @@ -12,6 +12,7 @@ public class Schemas extends org.cloudfoundry.multiapps.mta.handlers.v2.Schemas public static final MapElement PROVIDED_DEPENDENCY = new MapElement(); public static final MapElement RESOURCE = new MapElement(); public static final MapElement HOOK = new MapElement(); + public static final MapElement HOOK_PHASE_CONFIG = new MapElement(); public static final MapElement MTAEXT = new MapElement(); public static final MapElement EXT_MODULE = new MapElement(); @@ -47,6 +48,10 @@ public class Schemas extends org.cloudfoundry.multiapps.mta.handlers.v2.Schemas HOOK.add("phases", new ListElement(STRING_REQUIRED)); HOOK.add("parameters", PROPERTIES); HOOK.add("requires", new ListElement(REQUIRED_DEPENDENCY)); + HOOK.add("phase-configs", new ListElement(HOOK_PHASE_CONFIG)); + + HOOK_PHASE_CONFIG.add("phase", STRING_REQUIRED); + HOOK_PHASE_CONFIG.add("target-app", STRING_REQUIRED); REQUIRED_DEPENDENCY.add("name", UNIQUE_MTA_IDENTIFIER); REQUIRED_DEPENDENCY.add("list", STRING); diff --git a/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/model/Hook.java b/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/model/Hook.java index 75076d48..d26f2716 100644 --- a/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/model/Hook.java +++ b/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/model/Hook.java @@ -28,6 +28,7 @@ public static Hook copyOf(Hook original) { copy.phases = original.phases; copy.parameters = new TreeMap<>(original.parameters); copy.requiredDependencies = copyRequiredDependencies(original.requiredDependencies); + copy.phaseConfigs = original.phaseConfigs; return copy; } @@ -47,6 +48,8 @@ private static List copyRequiredDependencies(List parameters = Collections.emptyMap(); @YamlElement(HookParser.REQUIRES) private List requiredDependencies = Collections.emptyList(); + @YamlElement(HookParser.PHASE_CONFIGS) + private List> phaseConfigs = Collections.emptyList(); public static Hook createV3() { return new Hook(3); @@ -98,6 +101,15 @@ public Hook setRequiredDependencies(List requiredDependencie return this; } + public List> getPhaseConfigs() { + return phaseConfigs; + } + + public Hook setPhaseConfigs(List> phaseConfigs) { + this.phaseConfigs = ObjectUtils.defaultIfNull(phaseConfigs, this.phaseConfigs); + return this; + } + @Override public void accept(ElementContext context, Visitor visitor) { visitor.visit(context, this); diff --git a/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/parsers/v3/HookParser.java b/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/parsers/v3/HookParser.java index ce2c2870..65b10605 100644 --- a/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/parsers/v3/HookParser.java +++ b/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/parsers/v3/HookParser.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import org.cloudfoundry.multiapps.common.ParsingException; import org.cloudfoundry.multiapps.mta.model.Hook; import org.cloudfoundry.multiapps.mta.model.RequiredDependency; @@ -23,6 +22,7 @@ public class HookParser extends ModelParser { public static final String PHASES = "phases"; public static final String PARAMETERS = "parameters"; public static final String REQUIRES = "requires"; + public static final String PHASE_CONFIGS = "phase-configs"; protected final Set usedRequiredDependencyNames = new HashSet<>(); @@ -41,7 +41,8 @@ public Hook parse() throws ParsingException { .setParameters(getParameters()) .setPhases(getPhases()) .setRequiredDependencies(getRequiredDependencies()) - .setType(getType()); + .setType(getType()) + .setPhaseConfigs(getPhaseConfigs()); } private String getType() { @@ -74,4 +75,9 @@ private String getName() { return getStringElement(NAME); } + @SuppressWarnings("unchecked") + private List> getPhaseConfigs() { + return (List>) source.get(PHASE_CONFIGS); + } + } diff --git a/multiapps-mta/src/test/resources/mta/sample/v3/merged-06.yaml.json b/multiapps-mta/src/test/resources/mta/sample/v3/merged-06.yaml.json index 7d18a373..513172c7 100644 --- a/multiapps-mta/src/test/resources/mta/sample/v3/merged-06.yaml.json +++ b/multiapps-mta/src/test/resources/mta/sample/v3/merged-06.yaml.json @@ -60,7 +60,8 @@ "parametersMetadata" : { "metadata" : { } } - } ] + } ], + "phaseConfigs" : [ ] } ] } ], "resources" : [ { diff --git a/multiapps-mta/src/test/resources/mta/sample/v3/merged-07.yaml.json b/multiapps-mta/src/test/resources/mta/sample/v3/merged-07.yaml.json index eeed51be..ea263373 100644 --- a/multiapps-mta/src/test/resources/mta/sample/v3/merged-07.yaml.json +++ b/multiapps-mta/src/test/resources/mta/sample/v3/merged-07.yaml.json @@ -64,7 +64,8 @@ "parametersMetadata" : { "metadata" : { } } - } ] + } ], + "phaseConfigs" : [ ] } ] } ], "resources" : [ { diff --git a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-hooks-correct-data.json b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-hooks-correct-data.json index b3220293..0a600e8d 100644 --- a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-hooks-correct-data.json +++ b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-hooks-correct-data.json @@ -60,7 +60,8 @@ "parametersMetadata" : { "metadata" : { } } - } ] + } ], + "phaseConfigs" : [ ] } ] } ], "resources" : [ { diff --git a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-more-hook-phases.json b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-more-hook-phases.json index 0513d707..4937c590 100644 --- a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-more-hook-phases.json +++ b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-more-hook-phases.json @@ -60,7 +60,8 @@ "parametersMetadata" : { "metadata" : { } } - } ] + } ], + "phaseConfigs" : [ ] } ] } ], "resources" : [ { diff --git a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-two-hooks.json b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-two-hooks.json index 3d63f69f..99eefb2c 100644 --- a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-two-hooks.json +++ b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-two-hooks.json @@ -49,7 +49,8 @@ "parametersMetadata" : { "metadata" : { } } - } ] + } ], + "phaseConfigs" : [ ] }, { "majorSchemaVersion" : 3, "name" : "foo", @@ -58,7 +59,8 @@ "parameters" : { "qux" : "quz" }, - "requiredDependencies" : [ ] + "requiredDependencies" : [ ], + "phaseConfigs" : [ ] } ] } ], "resources" : [ { diff --git a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/resolved-03.yaml.json b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/resolved-03.yaml.json index 0dd18151..b9321b2a 100644 --- a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/resolved-03.yaml.json +++ b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/resolved-03.yaml.json @@ -79,7 +79,8 @@ "parametersMetadata" : { "metadata" : { } } - } ] + } ], + "phaseConfigs" : [ ] }, { "majorSchemaVersion" : 3, "name" : "test-hook2", @@ -106,7 +107,8 @@ "parametersMetadata" : { "metadata" : { } } - } ] + } ], + "phaseConfigs" : [ ] } ] }, { "majorSchemaVersion" : 3, diff --git a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-escaped-placeholders.json b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-escaped-placeholders.json index 3d9619e3..c349a114 100644 --- a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-escaped-placeholders.json +++ b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-escaped-placeholders.json @@ -67,7 +67,8 @@ "parametersMetadata" : { "metadata" : { } } - } ] + } ], + "phaseConfigs" : [ ] } ] } ], "resources" : [ { diff --git a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-escaped-references.json b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-escaped-references.json index 24b502b6..a591b805 100644 --- a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-escaped-references.json +++ b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-escaped-references.json @@ -81,7 +81,8 @@ "parametersMetadata" : { "metadata" : { } } - } ] + } ], + "phaseConfigs" : [ ] } ] } ], "resources" : [ { diff --git a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-placeholders-in-hooks.json b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-placeholders-in-hooks.json index 28028811..78557aff 100644 --- a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-placeholders-in-hooks.json +++ b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-placeholders-in-hooks.json @@ -40,7 +40,8 @@ "command" : "sleep(1000)", "name" : "before-stop-task" }, - "requiredDependencies" : [ ] + "requiredDependencies" : [ ], + "phaseConfigs" : [ ] }, { "majorSchemaVersion" : 3, "name" : "test-hook2", @@ -66,7 +67,8 @@ "parametersMetadata" : { "metadata" : { } } - } ] + } ], + "phaseConfigs" : [ ] } ] } ], "resources" : [ ], diff --git a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-unescaping-placeholders.json b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-unescaping-placeholders.json index d6b2e649..13f6ed9e 100644 --- a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-unescaping-placeholders.json +++ b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-unescaping-placeholders.json @@ -67,7 +67,8 @@ "parametersMetadata" : { "metadata" : { } } - } ] + } ], + "phaseConfigs" : [ ] } ] } ], "resources" : [ { diff --git a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-unescaping-references.json b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-unescaping-references.json index cd0a923b..9c313db9 100644 --- a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-unescaping-references.json +++ b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-unescaping-references.json @@ -81,7 +81,8 @@ "parametersMetadata" : { "metadata" : { } } - } ] + } ], + "phaseConfigs" : [ ] } ] } ], "resources" : [ { From df82bae37b1581619cf4ffb2f5e5654a0fc5209c Mon Sep 17 00:00:00 2001 From: stiv03 Date: Mon, 6 Apr 2026 08:03:02 +0300 Subject: [PATCH 2/2] Fix JSON serialization for tests --- .../java/org/cloudfoundry/multiapps/mta/model/Hook.java | 2 ++ .../src/test/resources/mta/sample/v3/merged-06.yaml.json | 3 +-- .../src/test/resources/mta/sample/v3/merged-07.yaml.json | 3 +-- .../handlers/v3/parsed-mtad-with-hooks-correct-data.json | 3 +-- .../mta/handlers/v3/parsed-mtad-with-more-hook-phases.json | 3 +-- .../mta/handlers/v3/parsed-mtad-with-two-hooks.json | 6 ++---- .../multiapps/mta/resolvers/v3/resolved-03.yaml.json | 6 ++---- .../mta/resolvers/v3/result-from-escaped-placeholders.json | 3 +-- .../mta/resolvers/v3/result-from-escaped-references.json | 3 +-- .../mta/resolvers/v3/result-from-placeholders-in-hooks.json | 6 ++---- .../resolvers/v3/result-from-unescaping-placeholders.json | 3 +-- .../mta/resolvers/v3/result-from-unescaping-references.json | 3 +-- 12 files changed, 16 insertions(+), 28 deletions(-) diff --git a/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/model/Hook.java b/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/model/Hook.java index d26f2716..cb413201 100644 --- a/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/model/Hook.java +++ b/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/model/Hook.java @@ -6,6 +6,7 @@ import java.util.TreeMap; import java.util.stream.Collectors; +import com.fasterxml.jackson.annotation.JsonInclude; import org.apache.commons.lang3.ObjectUtils; import org.cloudfoundry.multiapps.common.util.yaml.YamlElement; import org.cloudfoundry.multiapps.mta.parsers.v3.HookParser; @@ -48,6 +49,7 @@ private static List copyRequiredDependencies(List parameters = Collections.emptyMap(); @YamlElement(HookParser.REQUIRES) private List requiredDependencies = Collections.emptyList(); + @JsonInclude(JsonInclude.Include.NON_EMPTY) @YamlElement(HookParser.PHASE_CONFIGS) private List> phaseConfigs = Collections.emptyList(); diff --git a/multiapps-mta/src/test/resources/mta/sample/v3/merged-06.yaml.json b/multiapps-mta/src/test/resources/mta/sample/v3/merged-06.yaml.json index 513172c7..7d18a373 100644 --- a/multiapps-mta/src/test/resources/mta/sample/v3/merged-06.yaml.json +++ b/multiapps-mta/src/test/resources/mta/sample/v3/merged-06.yaml.json @@ -60,8 +60,7 @@ "parametersMetadata" : { "metadata" : { } } - } ], - "phaseConfigs" : [ ] + } ] } ] } ], "resources" : [ { diff --git a/multiapps-mta/src/test/resources/mta/sample/v3/merged-07.yaml.json b/multiapps-mta/src/test/resources/mta/sample/v3/merged-07.yaml.json index ea263373..eeed51be 100644 --- a/multiapps-mta/src/test/resources/mta/sample/v3/merged-07.yaml.json +++ b/multiapps-mta/src/test/resources/mta/sample/v3/merged-07.yaml.json @@ -64,8 +64,7 @@ "parametersMetadata" : { "metadata" : { } } - } ], - "phaseConfigs" : [ ] + } ] } ] } ], "resources" : [ { diff --git a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-hooks-correct-data.json b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-hooks-correct-data.json index 0a600e8d..b3220293 100644 --- a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-hooks-correct-data.json +++ b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-hooks-correct-data.json @@ -60,8 +60,7 @@ "parametersMetadata" : { "metadata" : { } } - } ], - "phaseConfigs" : [ ] + } ] } ] } ], "resources" : [ { diff --git a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-more-hook-phases.json b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-more-hook-phases.json index 4937c590..0513d707 100644 --- a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-more-hook-phases.json +++ b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-more-hook-phases.json @@ -60,8 +60,7 @@ "parametersMetadata" : { "metadata" : { } } - } ], - "phaseConfigs" : [ ] + } ] } ] } ], "resources" : [ { diff --git a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-two-hooks.json b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-two-hooks.json index 99eefb2c..3d63f69f 100644 --- a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-two-hooks.json +++ b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/handlers/v3/parsed-mtad-with-two-hooks.json @@ -49,8 +49,7 @@ "parametersMetadata" : { "metadata" : { } } - } ], - "phaseConfigs" : [ ] + } ] }, { "majorSchemaVersion" : 3, "name" : "foo", @@ -59,8 +58,7 @@ "parameters" : { "qux" : "quz" }, - "requiredDependencies" : [ ], - "phaseConfigs" : [ ] + "requiredDependencies" : [ ] } ] } ], "resources" : [ { diff --git a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/resolved-03.yaml.json b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/resolved-03.yaml.json index b9321b2a..0dd18151 100644 --- a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/resolved-03.yaml.json +++ b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/resolved-03.yaml.json @@ -79,8 +79,7 @@ "parametersMetadata" : { "metadata" : { } } - } ], - "phaseConfigs" : [ ] + } ] }, { "majorSchemaVersion" : 3, "name" : "test-hook2", @@ -107,8 +106,7 @@ "parametersMetadata" : { "metadata" : { } } - } ], - "phaseConfigs" : [ ] + } ] } ] }, { "majorSchemaVersion" : 3, diff --git a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-escaped-placeholders.json b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-escaped-placeholders.json index c349a114..3d9619e3 100644 --- a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-escaped-placeholders.json +++ b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-escaped-placeholders.json @@ -67,8 +67,7 @@ "parametersMetadata" : { "metadata" : { } } - } ], - "phaseConfigs" : [ ] + } ] } ] } ], "resources" : [ { diff --git a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-escaped-references.json b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-escaped-references.json index a591b805..24b502b6 100644 --- a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-escaped-references.json +++ b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-escaped-references.json @@ -81,8 +81,7 @@ "parametersMetadata" : { "metadata" : { } } - } ], - "phaseConfigs" : [ ] + } ] } ] } ], "resources" : [ { diff --git a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-placeholders-in-hooks.json b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-placeholders-in-hooks.json index 78557aff..28028811 100644 --- a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-placeholders-in-hooks.json +++ b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-placeholders-in-hooks.json @@ -40,8 +40,7 @@ "command" : "sleep(1000)", "name" : "before-stop-task" }, - "requiredDependencies" : [ ], - "phaseConfigs" : [ ] + "requiredDependencies" : [ ] }, { "majorSchemaVersion" : 3, "name" : "test-hook2", @@ -67,8 +66,7 @@ "parametersMetadata" : { "metadata" : { } } - } ], - "phaseConfigs" : [ ] + } ] } ] } ], "resources" : [ ], diff --git a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-unescaping-placeholders.json b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-unescaping-placeholders.json index 13f6ed9e..d6b2e649 100644 --- a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-unescaping-placeholders.json +++ b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-unescaping-placeholders.json @@ -67,8 +67,7 @@ "parametersMetadata" : { "metadata" : { } } - } ], - "phaseConfigs" : [ ] + } ] } ] } ], "resources" : [ { diff --git a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-unescaping-references.json b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-unescaping-references.json index 9c313db9..cd0a923b 100644 --- a/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-unescaping-references.json +++ b/multiapps-mta/src/test/resources/org/cloudfoundry/multiapps/mta/resolvers/v3/result-from-unescaping-references.json @@ -81,8 +81,7 @@ "parametersMetadata" : { "metadata" : { } } - } ], - "phaseConfigs" : [ ] + } ] } ] } ], "resources" : [ {