Review fixes

Author: tolkonepiu

modules/ceph/pom.xml

@@ -24,6 +24,7 @@
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-s3</artifactId>
             <version>1.11.231</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

modules/ceph/src/main/java/org/testcontainers/containers/CephContainer.java

@@ -4,10 +4,13 @@
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.client.builder.AwsClientBuilder;
-import org.testcontainers.containers.wait.LogMessageWaitStrategy;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.testcontainers.containers.wait.HttpWaitStrategy;
 
 import java.time.Duration;
 
+@Getter
 public class CephContainer<SELF extends CephContainer<SELF>> extends GenericContainer<SELF> {
 
     private static final String IMAGE = "ceph/demo";
@@ -24,10 +27,8 @@ public class CephContainer<SELF extends CephContainer<SELF>> extends GenericCont
 
     private NetworkAutoDetectMode networkAutoDetectMode = NetworkAutoDetectMode.IPV4_ONLY;
 
-    private Duration startupTimeout = Duration.ofSeconds(20);
-
     public CephContainer() {
-        super(IMAGE + ":latest");
+        super(IMAGE + ":tag-stable-3.0-jewel-ubuntu-16.04");
     }
 
     public CephContainer(String dockerImageName) {
@@ -42,12 +43,13 @@ protected void configure() {
         withEnv("CEPH_DEMO_ACCESS_KEY", awsAccessKey);
         withEnv("CEPH_DEMO_SECRET_KEY", awsSecretKey);
         withEnv("CEPH_DEMO_BUCKET", bucketName);
-        withExposedPorts(6789, 6800, 6801, 6802, 6803, 6804, 6805, 80, 5000);
+        withExposedPorts(5000, 6789, 6800, 6801, 6802, 6803, 6804, 6805, 80);
         waitingFor(
-                new LogMessageWaitStrategy()
-                        .withRegEx(".*\\/entrypoint.sh: SUCCESS\n")
-                        .withStartupTimeout(startupTimeout)
+                new HttpWaitStrategy()
+                        .forPath("/api/v0.1/health")
+                        .forStatusCode(200)
         );
+        withStartupTimeout(Duration.ofMinutes(5));
     }
 
     public AWSCredentialsProvider getAWSCredentialsProvider() {
@@ -73,61 +75,34 @@ public SELF withAwsSecretKey(String awsSecretKey) {
         return self();
     }
 
-    public String getBucketName() {
-        return bucketName;
-    }
-
     public SELF withBucketName(String bucketName) {
         //because s3cmd transforming bucket name to uppercase
         this.bucketName = bucketName.toUpperCase();
         return self();
     }
 
-    public String getRgwName() {
-        return rgwName;
-    }
-
     public SELF withRgwName(String rgwName) {
         this.rgwName = rgwName;
         return self();
     }
 
-    public String getDemoUid() {
-        return demoUid;
-    }
-
     public SELF withDemoUid(String demoUid) {
         this.demoUid = demoUid;
         return self();
     }
 
-    public NetworkAutoDetectMode getNetworkAutoDetectMode() {
-        return networkAutoDetectMode;
-    }
-
     public SELF withNetworkAutoDetectMode(NetworkAutoDetectMode networkAutoDetectMode) {
         this.networkAutoDetectMode = networkAutoDetectMode;
         return self();
     }
 
-    public Duration getStartupTimeout() {
-        return startupTimeout;
-    }
-
-    public SELF withStartupTimeout(Duration startupTimeout) {
-        this.startupTimeout = startupTimeout;
-        return self();
-    }
-
+    @AllArgsConstructor
     public enum NetworkAutoDetectMode {
         IPV6_OR_IPV4("1"),
         IPV4_ONLY("4"),
         IPV6_ONLY("6");
 
-        private String value;
+        private final String value;
 
-        NetworkAutoDetectMode(String value) {
-            this.value = value;
-        }
     }
 }

modules/ceph/src/test/java/org/testcontainers/containers/CephContainerTest.java

@@ -28,8 +28,7 @@ public class CephContainerTest {
     public CephContainer cephContainer = new CephContainer()
             .withAwsAccessKey("test")
             .withAwsSecretKey("test")
-            .withBucketName("test")
-            .withStartupTimeout(Duration.ofMinutes(5));
+            .withBucketName("test");
 
     private AmazonS3 amazonS3;