From 634a12803ee3c4011c6490371580e389e98a14ff Mon Sep 17 00:00:00 2001
From: Biju Kunjummen <biju.kunjummen@gmail.com>
Date: Wed, 2 Jan 2019 08:33:54 -0800
Subject: [PATCH] Extends dynalite container from GenericContainer - for JUnit5
 support

---
 .../dynamodb/DynaliteContainer.java           | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java b/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
index 31a3a7914e8..66397452921 100644
--- a/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
+++ b/modules/dynalite/src/main/java/org/testcontainers/dynamodb/DynaliteContainer.java
@@ -6,28 +6,23 @@
 import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
 import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
-import org.junit.rules.ExternalResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.output.Slf4jLogConsumer;
 
 /**
  * Container for Dynalite, a DynamoDB clone.
  */
-public class DynaliteContainer extends ExternalResource {
+public class DynaliteContainer extends GenericContainer<DynaliteContainer> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DynaliteContainer.class);
-    private final GenericContainer delegate;
+    private static final String IMAGE_NAME = "quay.io/testcontainers/dynalite:v1.2.1-1";
+    private static final int MAPPED_PORT = 4567;
 
     public DynaliteContainer() {
-        this("quay.io/testcontainers/dynalite:v1.2.1-1");
+        this(IMAGE_NAME);
+        withExposedPorts(MAPPED_PORT);
     }
 
     public DynaliteContainer(String imageName) {
-        this.delegate = new GenericContainer(imageName)
-                .withExposedPorts(4567)
-                .withLogConsumer(new Slf4jLogConsumer(LOGGER));
+        super(imageName);
     }
 
     /**
@@ -51,8 +46,8 @@ public AmazonDynamoDB getClient() {
      */
     public AwsClientBuilder.EndpointConfiguration getEndpointConfiguration() {
         return new AwsClientBuilder.EndpointConfiguration("http://" +
-                this.delegate.getContainerIpAddress() + ":" +
-                this.delegate.getMappedPort(4567), null);
+                this.getContainerIpAddress() + ":" +
+                this.getMappedPort(MAPPED_PORT), null);
     }
 
     /**
@@ -64,13 +59,5 @@ public AWSCredentialsProvider getCredentials() {
         return new AWSStaticCredentialsProvider(new BasicAWSCredentials("dummy", "dummy"));
     }
 
-    @Override
-    protected void before() throws Throwable {
-        delegate.start();
-    }
 
-    @Override
-    protected void after() {
-        delegate.stop();
-    }
 }