Skip to content

Add phase-configs support to Hook model for target-app resolution #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
stiv03 wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Add phase-configs support to Hook model for target-app resolution #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7d73b6
Add phase-configs support to Hook model for target-app resolution
stiv03 Apr 2, 2026
df82bae
Fix JSON serialization for tests
stiv03 Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/handlers/v3/Schemas.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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);
Expand Down
14 changes: 14 additions & 0 deletions multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/model/Hook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -28,6 +29,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;
}

Expand All @@ -47,6 +49,9 @@ private static List<RequiredDependency> copyRequiredDependencies(List<RequiredDe
private Map<String, Object> parameters = Collections.emptyMap();
@YamlElement(HookParser.REQUIRES)
private List<RequiredDependency> requiredDependencies = Collections.emptyList();
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@YamlElement(HookParser.PHASE_CONFIGS)
private List<Map<String, String>> phaseConfigs = Collections.emptyList();

public static Hook createV3() {
return new Hook(3);
Expand Down Expand Up @@ -98,6 +103,15 @@ public Hook setRequiredDependencies(List<RequiredDependency> requiredDependencie
return this;
}

public List<Map<String, String>> getPhaseConfigs() {
return phaseConfigs;
}

public Hook setPhaseConfigs(List<Map<String, String>> phaseConfigs) {
this.phaseConfigs = ObjectUtils.defaultIfNull(phaseConfigs, this.phaseConfigs);
return this;
}

@Override
public void accept(ElementContext context, Visitor visitor) {
visitor.visit(context, this);
Expand Down
10 changes: 8 additions & 2 deletions multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/parsers/v3/HookParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -23,6 +22,7 @@ public class HookParser extends ModelParser<Hook> {
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<String> usedRequiredDependencyNames = new HashSet<>();

Expand All @@ -41,7 +41,8 @@ public Hook parse() throws ParsingException {
.setParameters(getParameters())
.setPhases(getPhases())
.setRequiredDependencies(getRequiredDependencies())
.setType(getType());
.setType(getType())
.setPhaseConfigs(getPhaseConfigs());
}

private String getType() {
Expand Down Expand Up @@ -74,4 +75,9 @@ private String getName() {
return getStringElement(NAME);
}

@SuppressWarnings("unchecked")
private List<Map<String, String>> getPhaseConfigs() {
return (List<Map<String, String>>) source.get(PHASE_CONFIGS);
}

}
Loading