Merge pull request #107 from aguibert/serverAdapter-priority

Use consistent priority in runtime modules
MicroShed · Nov 11, 2019 · 86c8696 · 86c8696
2 parents 1554e13 + 0737428
commit 86c8696
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 16 deletions.
diff --git a/modules/liberty/src/main/java/org/testcontainers/containers/liberty/LibertyAdapter.java b/modules/liberty/src/main/java/org/testcontainers/containers/liberty/LibertyAdapter.java
@@ -26,7 +26,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import org.microshed.testing.testcontainers.spi.ServerAdapter;
 import org.testcontainers.images.builder.ImageFromDockerfile;
@@ -46,7 +45,7 @@ public static void setBaseDockerImage(String imageName) {
 
     @Override
     public int getPriority() {
-        return -50;
+        return PRIORITY_RUNTIME_MODULE;
     }
 
     @Override
@@ -113,8 +112,4 @@ public ImageFromDockerfile getDefaultImage(File appFile) {
         return image;
     }
 
-    @Override
-    public Optional<String> getReadinessPath() {
-        return Optional.empty();
-    }
 }
diff --git a/...s/payara-micro/src/main/java/org/testcontainers/containers/payara/PayaraMicroAdapter.java b/...s/payara-micro/src/main/java/org/testcontainers/containers/payara/PayaraMicroAdapter.java
@@ -25,6 +25,12 @@
 import java.util.Optional;
 
 public class PayaraMicroAdapter implements ServerAdapter {
+
+    @Override
+    public int getPriority() {
+        return PRIORITY_RUNTIME_MODULE;
+    }
+
     @Override
     public int getDefaultHttpPort() {
         return 8080;

diff --git a/...payara-server/src/main/java/org/testcontainers/containers/payara/PayaraServerAdapter.java b/...payara-server/src/main/java/org/testcontainers/containers/payara/PayaraServerAdapter.java
@@ -25,6 +25,12 @@
 import java.util.Optional;
 
 public class PayaraServerAdapter implements ServerAdapter {
+
+    @Override
+    public int getPriority() {
+        return PRIORITY_RUNTIME_MODULE;
+    }
+
     @Override
     public int getDefaultHttpPort() {
         return 8080;

diff --git a/.../testcontainers/src/main/java/org/microshed/testing/testcontainers/spi/ServerAdapter.java b/.../testcontainers/src/main/java/org/microshed/testing/testcontainers/spi/ServerAdapter.java
@@ -38,8 +38,12 @@
  */
 public interface ServerAdapter {
 
+    static final int PRIORITY_USER_DEFAULT = 50;
+    static final int PRIORITY_DEFAULT = 0;
+    static final int PRIORITY_RUNTIME_MODULE = -50;
+
     default int getPriority() {
-        return 0;
+        return PRIORITY_DEFAULT;
     }
 
     /**
@@ -91,8 +95,10 @@ default ImageFromDockerfile getDefaultImage(File appFile) {
 
     /**
      * Defines the readiness path for the Server which will be used by default when the developer did not specify such value.
-     * The implementation can choose to return null and then no value is defined by default.
-     * @return the readiness path to be used by default.
+     *
+     * @return the readiness path to be used by default, or an empty Optional if no default value is provided.
      */
-    Optional<String> getReadinessPath();
+    default Optional<String> getReadinessPath() {
+        return Optional.empty();
+    }
 }
diff --git a/sample-apps/liberty-app/build.gradle b/sample-apps/liberty-app/build.gradle
@@ -5,7 +5,6 @@ plugins {
 dependencies {
   providedCompile 'javax:javaee-api:8.0.1'
   providedCompile 'org.eclipse.microprofile:microprofile:3.0'
-  testCompile project(':microshed-testing-testcontainers')
   testCompile project(':microshed-testing-liberty')
   testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.29'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.5.2'

diff --git a/sample-apps/payara-app/Dockerfile b/sample-apps/payara-app/Dockerfile
diff --git a/sample-apps/payara-app/build.gradle b/sample-apps/payara-app/build.gradle
@@ -5,7 +5,7 @@ plugins {
 dependencies {
   providedCompile 'javax:javaee-api:8.0.1'
   providedCompile 'org.eclipse.microprofile:microprofile:2.1'
-  testCompile project(':microshed-testing-testcontainers')
+  testCompile project(':microshed-testing-payara-server')
   testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.29'
   testImplementation 'org.junit.jupiter:junit-jupiter:5.5.2'
 }