Merge pull request #72 from lordofthejars/master

resolves issue #66
arquillian · Jan 24, 2015 · 662eaaf · 662eaaf
2 parents 8b0b9e5 + 3029156
commit 662eaaf
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/docker/src/main/java/org/arquillian/cube/impl/client/container/RemapContainerController.java b/docker/src/main/java/org/arquillian/cube/impl/client/container/RemapContainerController.java
@@ -42,29 +42,33 @@ public void remapContainer(@Observes BeforeSetup event, CubeRegistry cubeRegistr
 
         Binding binding = BindingUtil.binding(cube.configuration());
 
-        ContainerDef containerConfiguration = container.getContainerConfiguration();
-        List<String> portPropertiesFromArquillianConfigurationFile = filterArquillianConfigurationPropertiesByPortAttribute(containerConfiguration);
+        if (binding.arePortBindings()) {
 
-        Class<?> configurationClass = container.getDeployableContainer().getConfigurationClass();
-        List<PropertyDescriptor> configurationClassPortFields = filterConfigurationClassPropertiesByPortAttribute(configurationClass);
+            ContainerDef containerConfiguration = container.getContainerConfiguration();
+            List<String> portPropertiesFromArquillianConfigurationFile = filterArquillianConfigurationPropertiesByPortAttribute(containerConfiguration);
 
-        Object newConfigurationInstance = configurationClass.newInstance();
+            Class<?> configurationClass = container.getDeployableContainer().getConfigurationClass();
+            List<PropertyDescriptor> configurationClassPortFields = filterConfigurationClassPropertiesByPortAttribute(configurationClass);
 
-        for (PropertyDescriptor configurationClassPortField : configurationClassPortFields) {
-            if (!portPropertiesFromArquillianConfigurationFile.contains(configurationClassPortField.getName())) {
-                // This means that port has not configured in arquillian.xml and it will use default value.
-                // In this case is when remapping should be activated to adequate the situation according to Arquillian
-                // Cube exposed ports.
+            Object newConfigurationInstance = configurationClass.newInstance();
 
-                int containerPort = getDefaultPortFromConfigurationInstance(newConfigurationInstance,
-                        configurationClass, configurationClassPortField);
+            for (PropertyDescriptor configurationClassPortField : configurationClassPortFields) {
+                if (!portPropertiesFromArquillianConfigurationFile.contains(configurationClassPortField.getName())) {
+                    // This means that port has not configured in arquillian.xml and it will use default value.
+                    // In this case is when remapping should be activated to adequate the situation according to
+                    // Arquillian
+                    // Cube exposed ports.
 
-                PortBinding bindingForExposedPort = null;
-                if ((bindingForExposedPort = binding.getBindingForExposedPort(containerPort)) != null) {
-                    containerConfiguration.overrideProperty(configurationClassPortField.getName(),
-                            Integer.toString(bindingForExposedPort.getBindingPort()));
-                }
+                    int containerPort = getDefaultPortFromConfigurationInstance(newConfigurationInstance,
+                            configurationClass, configurationClassPortField);
+
+                    PortBinding bindingForExposedPort = null;
+                    if ((bindingForExposedPort = binding.getBindingForExposedPort(containerPort)) != null) {
+                        containerConfiguration.overrideProperty(configurationClassPortField.getName(),
+                                Integer.toString(bindingForExposedPort.getBindingPort()));
+                    }
 
+                }
             }
         }
     }

diff --git a/spi/src/main/java/org/arquillian/cube/spi/Binding.java b/spi/src/main/java/org/arquillian/cube/spi/Binding.java
@@ -26,6 +26,10 @@ public void addPortBinding(Integer exposedPort, Integer bindingPort) {
         this.bindings.add(new PortBinding(exposedPort, bindingPort));
     }
 
+    public boolean arePortBindings() {
+        return !this.bindings.isEmpty();
+    }
+
     public PortBinding getBindingForExposedPort(Integer exposedPort) {
         for(PortBinding binding : this.bindings) {
             if(binding.getExposedPort().equals(exposedPort)) {