Add "lifecycle" property to v2 and v3 buildpacks

Author: Kehrlann

cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/buildpacks/ReactorBuildpacksTest.java

@@ -30,6 +30,7 @@
 import java.nio.charset.Charset;
 import java.time.Duration;
 import java.util.Collections;
+import org.cloudfoundry.client.v3.LifecycleType;
 import org.cloudfoundry.client.v3.Link;
 import org.cloudfoundry.client.v3.Metadata;
 import org.cloudfoundry.client.v3.Pagination;
@@ -99,6 +100,7 @@ void create() {
                                 .position(42)
                                 .enabled(true)
                                 .locked(false)
+                                .lifecycle(LifecycleType.BUILDPACK)
                                 .metadata(
                                         Metadata.builder()
                                                 .annotations(Collections.emptyMap())
@@ -179,6 +181,7 @@ void get() {
                                 .position(42)
                                 .enabled(true)
                                 .locked(false)
+                                .lifecycle(LifecycleType.BUILDPACK)
                                 .metadata(
                                         Metadata.builder()
                                                 .annotations(Collections.emptyMap())
@@ -250,6 +253,7 @@ void list() {
                                                 .position(1)
                                                 .enabled(true)
                                                 .locked(false)
+                                                .lifecycle(LifecycleType.BUILDPACK)
                                                 .metadata(
                                                         Metadata.builder()
                                                                 .annotations(Collections.emptyMap())
@@ -315,6 +319,7 @@ void update() {
                                 .position(42)
                                 .enabled(true)
                                 .locked(false)
+                                .lifecycle(LifecycleType.BUILDPACK)
                                 .metadata(
                                         Metadata.builder()
                                                 .annotations(Collections.emptyMap())
@@ -407,6 +412,7 @@ void upload() throws IOException {
                                 .position(42)
                                 .enabled(true)
                                 .locked(false)
+                                .lifecycle(LifecycleType.BUILDPACK)
                                 .metadata(
                                         Metadata.builder()
                                                 .annotations(Collections.emptyMap())

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/buildpacks/GET_response.json

@@ -25,6 +25,7 @@
       "position": 1,
       "enabled": true,
       "locked": false,
+      "lifecycle": "buildpack",
       "metadata": {
         "labels": {},
         "annotations": {}

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/buildpacks/GET_{id}_response.json

@@ -9,6 +9,7 @@
   "position": 42,
   "enabled": true,
   "locked": false,
+  "lifecycle": "buildpack",
   "metadata": {
     "labels": {},
     "annotations": {}

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/buildpacks/PATCH_{id}_response.json

@@ -9,6 +9,7 @@
   "position": 42,
   "enabled": true,
   "locked": false,
+  "lifecycle": "buildpack",
   "metadata": {
     "labels": {},
     "annotations": {}

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/buildpacks/POST_response.json

@@ -9,6 +9,7 @@
   "position": 42,
   "enabled": true,
   "locked": false,
+  "lifecycle": "buildpack",
   "metadata": {
     "labels": {},
     "annotations": {}

cloudfoundry-client-reactor/src/test/resources/fixtures/client/v3/buildpacks/POST_{id}_upload_response.json

@@ -9,6 +9,7 @@
   "position": 42,
   "enabled": true,
   "locked": false,
+  "lifecycle": "buildpack",
   "metadata": {
     "labels": {},
     "annotations": {}

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/buildpacks/LifecycleType.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2013-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.cloudfoundry.client.v2.buildpacks;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * The lifecycle type
+ */
+public enum LifecycleType {
+    BUILDPACK("buildpack"),
+
+    DOCKER("docker"),
+
+    CNB("cnb");
+
+    private final String value;
+
+    private LifecycleType(String value) {
+        this.value = value;
+    }
+
+    @JsonCreator
+    public static LifecycleType from(String s) {
+        switch (s.toLowerCase()) {
+            case "buildpack":
+                return BUILDPACK;
+            case "docker":
+                return DOCKER;
+            case "cnb":
+                return CNB;
+            default:
+                throw new IllegalArgumentException(String.format("Unknown lifecycle type: %s", s));
+        }
+    }
+
+    @JsonValue
+    public String getValue() {
+        return this.value;
+    }
+
+    @Override
+    public String toString() {
+        return getValue();
+    }
+}

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v2/buildpacks/_BuildpackEntity.java

@@ -70,4 +70,11 @@ abstract class _BuildpackEntity {
     @Nullable
     abstract String getStack();
 
+    /**
+     * The lifecycle
+     */
+    @JsonProperty("lifecycle")
+    @Nullable
+    abstract LifecycleType getLifecycle();
+
 }

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/buildpacks/Buildpack.java

@@ -18,6 +18,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.cloudfoundry.Nullable;
+import org.cloudfoundry.client.v3.LifecycleType;
 import org.cloudfoundry.client.v3.Metadata;
 import org.cloudfoundry.client.v3.Resource;
 
@@ -76,4 +77,11 @@ public abstract class Buildpack extends Resource {
      */
     @JsonProperty("state")
     public abstract BuildpackState getState();
+
+    /**
+     * The lifecycle
+     */
+    @JsonProperty("lifecycle")
+    @Nullable
+    public abstract LifecycleType getLifecycle();
 }

cloudfoundry-client/src/test/java/org/cloudfoundry/client/v2/buildpacks/BuildpackEntityTest.java

@@ -0,0 +1,27 @@
+package org.cloudfoundry.client.v2.buildpacks;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.Test;
+
+class BuildpackEntityTest {
+    @Test
+    void jsonSerialization() throws JsonProcessingException {
+        ObjectMapper mapper = new ObjectMapper();
+        BuildpackEntity originalBuildpack =
+                BuildpackEntity.builder()
+                        .enabled(false)
+                        .locked(true)
+                        .name("test-buildpack")
+                        .position(42)
+                        .lifecycle(LifecycleType.BUILDPACK)
+                        .build();
+
+        String serialized = mapper.writeValueAsString(originalBuildpack);
+        BuildpackEntity deserialized = mapper.readValue(serialized, BuildpackEntity.class);
+
+        assertThat(deserialized).isEqualTo(originalBuildpack);
+    }
+}