Add GenericResources to ServiceSpec.TaskTemplate.Resources.Reservations

johnflavin-fw · johnflavin-fw · commit 10b02d03aabf · 2024-05-13T16:21:49.000-05:00
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/DiscreteResourceSpec.java
@@ -1,8 +1,37 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.annotation.CheckForNull;
 import java.io.Serializable;
 
-@Deprecated
-public class DiscreteResourceSpec extends GenericResource<String> implements Serializable {
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+public class DiscreteResourceSpec extends GenericResource<Integer> implements Serializable {
     private static final long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Value")
+    private Integer value;
+
+    /**
+     * @see #value
+     */
+    @Override
+    @CheckForNull
+    public Integer getValue() {
+        return value;
+    }
+
+    /**
+     * @see #value
+     */
+    @Override
+    public GenericResource<Integer> withValue(Integer value) {
+        this.value = value;
+        return this;
+    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/GenericResource.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/GenericResource.java
@@ -1,36 +1,56 @@
 package com.github.dockerjava.api.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import javax.annotation.CheckForNull;
 import java.io.Serializable;
 
+/**
+ * @since {@link RemoteApiVersion#VERSION_1_24}
+ */
+@JsonTypeInfo(
+    use = JsonTypeInfo.Id.NAME,
+    include = JsonTypeInfo.As.WRAPPER_OBJECT
+)
+@JsonSubTypes({@JsonSubTypes.Type(
+    value = NamedResourceSpec.class,
+    name = "NamedResourceSpec"
+), @JsonSubTypes.Type(
+    value = DiscreteResourceSpec.class,
+    name = "DiscreteResourceSpec"
+)})
 @EqualsAndHashCode
 @ToString
 public abstract class GenericResource<T> extends DockerObject implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    /**
+     * @since 1.24
+     */
     @JsonProperty("Kind")
     String kind;
-    @JsonProperty("Value")
-    T value = null;
 
+    /**
+     * @see #kind
+     */
+    @CheckForNull
     public String getKind() {
         return kind;
     }
 
-    public GenericResource withKind(String kind) {
+    /**
+     * @see #kind
+     */
+    public GenericResource<T> withKind(String kind) {
         this.kind = kind;
         return this;
     }
 
-    public T getValue() {
-        return value;
-    }
+    public abstract T getValue();
 
-    public GenericResource withValue(T value) {
-        this.value = value;
-        return this;
-    }
+    public abstract GenericResource<T> withValue(T value);
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/NamedResourceSpec.java
@@ -1,11 +1,37 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import javax.annotation.CheckForNull;
 import java.io.Serializable;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
  */
-@Deprecated
-public class NamedResourceSpec extends GenericResource<Integer> implements Serializable {
+public class NamedResourceSpec extends GenericResource<String> implements Serializable {
     private static final long serialVersionUID = 1L;
+
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("Value")
+    private String value;
+
+    /**
+     * @see #value
+     */
+    @Override
+    @CheckForNull
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * @see #value
+     */
+    @Override
+    public GenericResource<String> withValue(String value) {
+        this.value = value;
+        return this;
+    }
 }
diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/ResourceSpecs.java
@@ -6,6 +6,7 @@
 
 import javax.annotation.CheckForNull;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @since {@link RemoteApiVersion#VERSION_1_24}
@@ -27,6 +28,12 @@ public class ResourceSpecs extends DockerObject implements Serializable {
     @JsonProperty("NanoCPUs")
     private Long nanoCPUs;
 
+    /**
+     * @since 1.24
+     */
+    @JsonProperty("GenericResources")
+    private List<GenericResource<?>> genericResources;
+
     /**
      * @see #memoryBytes
      */
@@ -58,4 +65,20 @@ public ResourceSpecs withNanoCPUs(long nanoCPUs) {
         this.nanoCPUs = nanoCPUs;
         return this;
     }
+
+    /**
+     * @see #genericResources
+     */
+    @CheckForNull
+    public List<GenericResource<?>> getGenericResources() {
+        return genericResources;
+    }
+
+    /**
+     * @see #genericResources
+     */
+    public ResourceSpecs withGenericResources(List<GenericResource<?>> genericResources) {
+        this.genericResources = genericResources;
+        return this;
+    }
 }
