From 6f00250b3e49db5ff1b90ee1002096fdedaeb522 Mon Sep 17 00:00:00 2001
From: Pedro Cardoso <pedro.cardoso@feedzai.com>
Date: Sun, 14 Jul 2019 21:17:57 +0100
Subject: [PATCH] Reverts create container cmd regression.

Summary:
- Adds Memory and MemorySwap related methods to CreateContainerCmd interface and related interface.

This was done so that the test-containers project can bump it's
docker-java dependency for support to the latest docker version.
See https://github.com/testcontainers/testcontainers-java/pull/1340 for more.

Note that this commit is a continuation of
https://github.com/docker-java/docker-java/pull/1203, wherein I failed
to see that these two methods were not reverted back.
---
 .../api/command/CreateContainerCmd.java       | 14 +++++++++
 .../core/command/CreateContainerCmdImpl.java  | 31 +++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 4fa5dd2e2..cb9821361 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -126,6 +126,20 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withMacAddress(String macAddress);
 
+    @Deprecated
+    @CheckForNull
+    Long getMemory();
+
+    @Deprecated
+    CreateContainerCmd withMemory(Long memory);
+
+    @Deprecated
+    @CheckForNull
+    Long getMemorySwap();
+
+    @Deprecated
+    CreateContainerCmd withMemorySwap(Long memorySwap);
+
     @CheckForNull
     String getName();
 
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 1819be0c3..740e0e5e2 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -351,6 +351,37 @@ public CreateContainerCmd withMacAddress(String macAddress) {
         return this;
     }
 
+    @Deprecated
+    @Override
+    @JsonIgnore
+    public Long getMemory() {
+        return hostConfig.getMemory();
+    }
+
+    @Deprecated
+    @Override
+    public CreateContainerCmd withMemory(Long memory) {
+        checkNotNull(memory, "memory was not specified");
+        hostConfig.withMemory(memory);
+        return this;
+    }
+
+    @Deprecated
+    @Override
+    @JsonIgnore
+    public Long getMemorySwap() {
+        return hostConfig.getMemorySwap();
+    }
+
+    @Deprecated
+    @Override
+    public CreateContainerCmd withMemorySwap(Long memorySwap) {
+        checkNotNull(memorySwap, "memorySwap was not specified");
+        hostConfig.withMemorySwap(memorySwap);
+        return this;
+    }
+
+
     @Override
     public String getName() {
         return name;