Skip to content

ApplicationManifest YAML serialization fixes #882

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

Closed
wants to merge 4 commits into from
Closed

ApplicationManifest YAML serialization fixes #882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29997c5
failing test demonstrating YAML path serialization issue
cah-andrew-fitzgerald Apr 26, 2018
ebfd477
fix ApplicationManifest YAML path serialization issue
cah-andrew-fitzgerald Apr 26, 2018
18bc7ef
modify application manifest yaml test to demonstrate issue with null …
cah-andrew-fitzgerald Apr 26, 2018
fca9a6d
fix applicationManifest YAML NPE
cah-andrew-fitzgerald Apr 26, 2018
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
4 changes: 2 additions & 2 deletions ...ions/src/main/java/org/cloudfoundry/operations/applications/ApplicationManifestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,14 +343,14 @@ private static Map<String, Object> toYaml(ApplicationManifest applicationManifes
putIfPresent(yaml, "domains", applicationManifest.getDomains());
putIfPresent(yaml, "env", applicationManifest.getEnvironmentVariables());
putIfPresent(yaml, "health-check-http-endpoint", applicationManifest.getHealthCheckHttpEndpoint());
putIfPresent(yaml, "health-check-type", applicationManifest.getHealthCheckType().getValue());
putIfPresent(yaml, "health-check-type", applicationManifest.getHealthCheckType() != null ? applicationManifest.getHealthCheckType().getValue() : null);
putIfPresent(yaml, "hosts", applicationManifest.getHosts());
putIfPresent(yaml, "instances", applicationManifest.getInstances());
putIfPresent(yaml, "memory", applicationManifest.getMemory());
putIfPresent(yaml, "name", applicationManifest.getName());
putIfPresent(yaml, "no-hostname", applicationManifest.getNoHostname());
putIfPresent(yaml, "no-route", applicationManifest.getNoRoute());
putIfPresent(yaml, "path", applicationManifest.getPath());
putIfPresent(yaml, "path", applicationManifest.getPath() != null ? applicationManifest.getPath().toString() : null);
putIfPresent(yaml, "random-route", applicationManifest.getRandomRoute());
putIfPresent(yaml, "route-path", applicationManifest.getRoutePath());
putIfPresent(yaml, "routes", applicationManifest.getRoutes(), ApplicationManifestUtils::toRoutesYaml);
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,10 +502,10 @@ public void write() throws IOException {
.command("alpha-command")
.disk(-1)
.healthCheckHttpEndpoint("alpha-health-check-http-endpoint")
.healthCheckType(NONE)
.instances(-1)
.memory(-1)
.noRoute(true)
.path(Paths.get("/alpha-path"))
.randomRoute(true)
.route(Route.builder()
.route("alpha-route-1")
Expand Down
2 changes: 1 addition & 1 deletion cloudfoundry-operations/src/test/resources/fixtures/manifest-echo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ applications:
ALPHA_KEY_1: alpha-value-1
ALPHA_KEY_2: alpha-value-2
health-check-http-endpoint: alpha-health-check-http-endpoint
health-check-type: none
instances: -1
memory: -1
name: alpha-application-1
no-route: true
path: /alpha-path
random-route: true
routes:
- route: alpha-route-1
Expand Down