Support Manifest YAML Anchors and References

Previously the YAML deserialization utilized Jackson YAML support.
Unfortunately, this support does not properly handle scalar-value level
anchors and references.  This change updates the code to make use of SnakeYAML
directly, which while resulting in worse code, does have the advantage of
supporting scalar-value level anchors and references.

[resolves #834]

Author: nebhale

cloudfoundry-operations/cloudfoundry-operations.iml

@@ -16,8 +16,6 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.10" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.10" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.10" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.addons:reactor-test:3.0.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.1" level="project" />
@@ -41,5 +39,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:log4j-over-slf4j:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
   </component>
 </module>

cloudfoundry-operations/pom.xml

@@ -43,10 +43,6 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.projectreactor.addons</groupId>
             <artifactId>reactor-test</artifactId>
@@ -91,6 +87,10 @@
             <artifactId>spring-boot-starter-logging</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/ApplicationManifestUtils.java

@@ -17,7 +17,6 @@
 package org.cloudfoundry.operations.applications;
 
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import org.cloudfoundry.AllowNulls;
 import org.cloudfoundry.Nullable;
 import org.immutables.value.Value;
@@ -67,147 +66,126 @@ void check() {
     /**
      * The buildpack used by the application
      */
-    @JsonProperty("buildpack")
     @Nullable
     abstract String getBuildpack();
 
     /**
      * The command used to execute the application
      */
-    @JsonProperty("command")
     @Nullable
     abstract String getCommand();
 
     /**
      * The disk quota in megabytes
      */
-    @JsonProperty("disk_quota")
     @Nullable
     abstract Integer getDisk();
 
     /**
      * The docker information
      */
-    @JsonProperty("docker")
     @Nullable
     abstract Docker getDocker();
 
     /**
      * The collection of domains bound to the application
      */
-    @JsonProperty("domains")
     @Nullable
     abstract List<String> getDomains();
 
     /**
      * The environment variables to set on the application
      */
     @AllowNulls
-    @JsonProperty("env")
     @Nullable
     abstract Map<String, Object> getEnvironmentVariables();
 
     /**
      * The HTTP health check endpoint
      */
-    @JsonProperty("health-check-http-endpoint")
     @Nullable
     abstract String getHealthCheckHttpEndpoint();
 
     /**
      * The health check type
      */
-    @JsonProperty("health-check-type")
     @Nullable
     abstract ApplicationHealthCheck getHealthCheckType();
 
     /**
      * The collection of hosts bound to the application
      */
-    @JsonProperty("hosts")
     @Nullable
     abstract List<String> getHosts();
 
     /**
      * The number of instances of the application
      */
-    @JsonProperty("instances")
     @Nullable
     abstract Integer getInstances();
 
     /**
      * The memory quota in megabytes
      */
-    @JsonProperty("memory")
     @Nullable
     abstract Integer getMemory();
 
     /**
      * The name of the application
      */
-    @JsonProperty("name")
     abstract String getName();
 
     /**
      * Map the the root domain to the app
      */
-    @JsonProperty("no-hostname")
     @Nullable
     abstract Boolean getNoHostname();
 
     /**
      * Prevent a route being created for the app
      */
-    @JsonProperty("no-route")
     @Nullable
     abstract Boolean getNoRoute();
 
     /**
      * The location of the application
      */
-    @JsonProperty("path")
     @Nullable
     abstract Path getPath();
 
     /**
      * Generate a random route
      */
-    @JsonProperty("random-route")
     @Nullable
     abstract Boolean getRandomRoute();
 
     /**
      * The route path for all applications
      */
-    @JsonProperty("route-path")
     @Nullable
     abstract String getRoutePath();
 
     /**
      * The collection of routes bound to the application
      */
-    @JsonProperty("routes")
     @Nullable
     abstract List<Route> getRoutes();
 
     /**
      * The collection of service names bound to the application
      */
-    @JsonProperty("services")
     @Nullable
     abstract List<String> getServices();
 
     /**
      * The stack used to run the application
      */
-    @JsonProperty("stack")
     @Nullable
     abstract String getStack();
 
     /**
      * The number of seconds allowed for application start
      */
-    @JsonProperty("timeout")
     @Nullable
     abstract Integer getTimeout();
 

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/_ApplicationManifest.java

@@ -33,6 +33,19 @@
 
 public final class ApplicationManifestUtilsTest {
 
+    @Test
+    public void anchorsAndReferences() throws IOException {
+        List<ApplicationManifest> expected = Collections.singletonList(
+            ApplicationManifest.builder()
+                .name("test-application")
+                .service("test-service-name")
+                .build());
+
+        List<ApplicationManifest> actual = ApplicationManifestUtils.read(new ClassPathResource("fixtures/manifest-kilo.yml").getFile().toPath());
+
+        assertThat(actual).isEqualTo(expected);
+    }
+
     @Test
     public void read() throws IOException {
         List<ApplicationManifest> expected = Arrays.asList(

cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsTest.java

@@ -0,0 +1,8 @@
+---
+holder:
+- &foo test-service-name
+
+applications:
+- name: test-application
+  services:
+  - *foo

cloudfoundry-operations/src/test/resources/fixtures/manifest-kilo.yml

@@ -51,7 +51,7 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-core:4.3.11.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-web:4.3.11.RELEASE" level="project" />
     <orderEntry type="module" module-name="cloudfoundry-operations" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.8.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
     <orderEntry type="module" module-name="cloudfoundry-util" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="Maven: org.atteo:evo-inflector:1.2.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter:1.5.7.RELEASE" level="project" />
@@ -66,7 +66,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:log4j-over-slf4j:1.7.25" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.5.7.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.5.7.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.5.7.RELEASE" level="project" />