Merge pull request #226 from aguibert/hollow-customized-port

Fix issue where incorrect HTTP port gets used for rest clients in hollow mode

Author: aguibert

modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/ApplicationContainer.java

@@ -23,7 +23,9 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -233,6 +235,11 @@ private void commonInit() {
         }
         if (isHollow) {
             setContainerIpAddress(ManuallyStartedConfiguration.getHostname());
+            try {
+                setFirstMappedPort(new URL(ManuallyStartedConfiguration.getRuntimeURL()).getPort());
+            } catch (MalformedURLException e) {
+                LOG.debug("Unable to obtain port from " + ManuallyStartedConfiguration.getRuntimeURL(), e);
+            }
             withAppContextRoot(ManuallyStartedConfiguration.getBasePath());
         } else {
             withAppContextRoot("/");
@@ -273,6 +280,10 @@ public void setFirstMappedPort(int port) {
         if (!isHollow)
             throw new IllegalStateException("Can only set first mapped port in hollow mode");
         primaryPort = port;
+        List<Integer> exposedPorts = new ArrayList<>(getExposedPorts());
+        if (!exposedPorts.contains(primaryPort))
+            exposedPorts.add(0, primaryPort);
+        setExposedPorts(exposedPorts);
     }
 
     @Override