Add MockServer container implementation under org.testcontainers.mockserver

docs/modules/mockserver.md

@@ -7,13 +7,13 @@ Mock Server can be used to mock HTTP services by matching requests against user-
 The following example shows how to start Mockserver.
 
 <!--codeinclude-->
-[Creating a MockServer container](../../modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java) inside_block:creatingProxy
+[Creating a MockServer container](../../modules/mockserver/src/test/java/org/testcontainers/mockserver/MockServerContainerTest.java) inside_block:creatingProxy
 <!--/codeinclude-->
 
 And how to set a simple expectation using the Java MockServerClient.
 
 <!--codeinclude-->
-[Setting a simple expectation](../../modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java) inside_block:testSimpleExpectation
+[Setting a simple expectation](../../modules/mockserver/src/test/java/org/testcontainers/mockserver/MockServerContainerTest.java) inside_block:testSimpleExpectation
 <!--/codeinclude-->
 
 ## Adding this module to your project dependencies

modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java

@@ -4,7 +4,11 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
+/**
+ * @deprecated use {@link org.testcontainers.mockserver.MockServerContainer} instead.
+ */
 @Slf4j
+@Deprecated
 public class MockServerContainer extends GenericContainer<MockServerContainer> {
 
     private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("jamesdbloom/mockserver");

modules/mockserver/src/main/java/org/testcontainers/mockserver/MockServerContainer.java

@@ -0,0 +1,49 @@
+package org.testcontainers.mockserver;
+
+import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.DockerImageName;
+
+@Slf4j
+public class MockServerContainer extends GenericContainer<MockServerContainer> {
+
+    private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("jamesdbloom/mockserver");
+
+    private static final String DEFAULT_TAG = "mockserver-5.5.4";
+
+    @Deprecated
+    public static final String VERSION = DEFAULT_TAG;
+
+    public static final int PORT = 1080;
+
+    /**
+     * @deprecated use {@link #MockServerContainer(DockerImageName)} instead
+     */
+    @Deprecated
+    public MockServerContainer(String version) {
+        this(DEFAULT_IMAGE_NAME.withTag("mockserver-" + version));
+    }
+
+    public MockServerContainer(DockerImageName dockerImageName) {
+        super(dockerImageName);
+        dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, DockerImageName.parse("mockserver/mockserver"));
+
+        waitingFor(Wait.forLogMessage(".*started on port: " + PORT + ".*", 1));
+
+        withCommand("-serverPort " + PORT);
+        addExposedPorts(PORT);
+    }
+
+    public String getEndpoint() {
+        return String.format("http://%s:%d", getHost(), getMappedPort(PORT));
+    }
+
+    public String getSecureEndpoint() {
+        return String.format("https://%s:%d", getHost(), getMappedPort(PORT));
+    }
+
+    public Integer getServerPort() {
+        return getMappedPort(PORT);
+    }
+}

modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java → modules/mockserver/src/test/java/org/testcontainers/mockserver/MockServerContainerTest.java

@@ -1,4 +1,4 @@
-package org.testcontainers.containers;
+package org.testcontainers.mockserver;
 
 import io.restassured.config.RestAssuredConfig;
 import io.restassured.config.SSLConfig;
@@ -22,8 +22,11 @@ class MockServerContainerTest {
         .withTag("mockserver-" + MockServerClient.class.getPackage().getImplementationVersion());
 
     @Test
-    void shouldCallActualMockserverVersion() throws Exception {
-        try (MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)) {
+    void shouldCallActualMockserverVersion() {
+        try ( // creatingProxy {
+            MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)
+            // }
+        ) {
             mockServer.start();
 
             String expectedBody = "Hello World!";
@@ -41,7 +44,7 @@ void shouldCallActualMockserverVersion() throws Exception {
     }
 
     @Test
-    void shouldCallMockserverUsingTlsProtocol() throws Exception {
+    void shouldCallMockserverUsingTlsProtocol() {
         try (MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)) {
             mockServer.start();
 
@@ -63,7 +66,7 @@ void shouldCallMockserverUsingTlsProtocol() throws Exception {
     }
 
     @Test
-    void shouldCallMockserverUsingMutualTlsProtocol() throws Exception {
+    void shouldCallMockserverUsingMutualTlsProtocol() {
         try (
             MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)
                 .withEnv("MOCKSERVER_TLS_MUTUAL_AUTHENTICATION_REQUIRED", "true")