Skip to content

Commit 1e9d192

Browse files
committed
Use consistent priority in runtime modules
1 parent e122fde commit 1e9d192

4 files changed

Lines changed: 23 additions & 10 deletions

File tree

modules/liberty/src/main/java/org/testcontainers/containers/liberty/LibertyAdapter.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.util.ArrayList;
2727
import java.util.List;
2828
import java.util.Map;
29-
import java.util.Optional;
3029

3130
import org.microshed.testing.testcontainers.spi.ServerAdapter;
3231
import org.testcontainers.images.builder.ImageFromDockerfile;
@@ -46,7 +45,7 @@ public static void setBaseDockerImage(String imageName) {
4645

4746
@Override
4847
public int getPriority() {
49-
return -50;
48+
return PRIORITY_RUNTIME_MODULE;
5049
}
5150

5251
@Override
@@ -113,8 +112,4 @@ public ImageFromDockerfile getDefaultImage(File appFile) {
113112
return image;
114113
}
115114

116-
@Override
117-
public Optional<String> getReadinessPath() {
118-
return Optional.empty();
119-
}
120115
}

modules/payara-micro/src/main/java/org/testcontainers/containers/payara/PayaraMicroAdapter.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@
2525
import java.util.Optional;
2626

2727
public class PayaraMicroAdapter implements ServerAdapter {
28+
29+
@Override
30+
public int getPriority() {
31+
return PRIORITY_RUNTIME_MODULE;
32+
}
33+
2834
@Override
2935
public int getDefaultHttpPort() {
3036
return 8080;

modules/payara-server/src/main/java/org/testcontainers/containers/payara/PayaraServerAdapter.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@
2525
import java.util.Optional;
2626

2727
public class PayaraServerAdapter implements ServerAdapter {
28+
29+
@Override
30+
public int getPriority() {
31+
return PRIORITY_RUNTIME_MODULE;
32+
}
33+
2834
@Override
2935
public int getDefaultHttpPort() {
3036
return 8080;

modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/spi/ServerAdapter.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,12 @@
3838
*/
3939
public interface ServerAdapter {
4040

41+
static final int PRIORITY_USER_DEFAULT = 50;
42+
static final int PRIORITY_DEFAULT = 0;
43+
static final int PRIORITY_RUNTIME_MODULE = -50;
44+
4145
default int getPriority() {
42-
return 0;
46+
return PRIORITY_DEFAULT;
4347
}
4448

4549
/**
@@ -91,8 +95,10 @@ default ImageFromDockerfile getDefaultImage(File appFile) {
9195

9296
/**
9397
* Defines the readiness path for the Server which will be used by default when the developer did not specify such value.
94-
* The implementation can choose to return null and then no value is defined by default.
95-
* @return the readiness path to be used by default.
98+
*
99+
* @return the readiness path to be used by default, or an empty Optional if no default value is provided.
96100
*/
97-
Optional<String> getReadinessPath();
101+
default Optional<String> getReadinessPath() {
102+
return Optional.empty();
103+
}
98104
}

0 commit comments

Comments
 (0)