[closes #437] Add defaultConfiguration method to customizable service

tnb-software · Apr 20, 2023 · 8cf375b · 8cf375b
1 parent 3f6da83
commit 8cf375b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 3 deletions.
diff --git a/system-x/common/src/main/java/software/tnb/common/service/ConfigurableService.java b/system-x/common/src/main/java/software/tnb/common/service/ConfigurableService.java
@@ -35,4 +35,9 @@ public ConfigurableService() {
     public C getConfiguration() {
         return configuration;
     }
+
+    /**
+     * The default configuration in case no customizations are made.
+     */
+    protected abstract void defaultConfiguration();
 }
diff --git a/system-x/common/src/main/java/software/tnb/common/service/ServiceFactory.java b/system-x/common/src/main/java/software/tnb/common/service/ServiceFactory.java
@@ -68,6 +68,7 @@ public static <S extends Service> S create(Class<S> clazz) {
 
     public static <C extends ServiceConfiguration, S extends ConfigurableService<C>> S create(Class<S> clazz, Consumer<C> config) {
         S service = create(clazz);
+        service.defaultConfiguration();
         config.accept(service.getConfiguration());
         return service;
     }

diff --git a/system-x/services/aws/common/src/main/java/software/tnb/aws/common/service/AWSService.java b/system-x/services/aws/common/src/main/java/software/tnb/aws/common/service/AWSService.java
@@ -24,7 +24,8 @@ public abstract class AWSService<A extends AWSAccount, C extends SdkClient, V ex
     protected C client;
     protected V validation;
 
-    public AWSService() {
+    @Override
+    protected void defaultConfiguration() {
         getConfiguration().useLocalstack(false);
     }
 

diff --git a/system-x/services/jaeger/src/main/java/software/tnb/jaeger/service/Jaeger.java b/system-x/services/jaeger/src/main/java/software/tnb/jaeger/service/Jaeger.java
@@ -25,6 +25,10 @@ public abstract class Jaeger extends ConfigurableService<JaegerConfiguration> im
 
     protected JaegerValidation validation;
 
+    @Override
+    protected void defaultConfiguration() {
+    }
+
     protected Map<String, String> env() {
         Map<String, String> env = new HashMap<>();
         env.put("COLLECTOR_OTLP_ENABLED", "true");

diff --git a/system-x/services/splunk/src/main/java/software/tnb/splunk/resource/local/LocalSplunk.java b/system-x/services/splunk/src/main/java/software/tnb/splunk/resource/local/LocalSplunk.java
@@ -23,7 +23,8 @@ public class LocalSplunk extends Splunk implements Deployable {
     private final int containerApiPort = 8089;
     private static final String PASSWORD = "password";
 
-    public LocalSplunk() {
+    @Override
+    public void defaultConfiguration() {
         getConfiguration().protocol(SplunkProtocol.HTTP);
     }
 

diff --git a/...services/splunk/src/main/java/software/tnb/splunk/resource/openshift/OpenshiftSplunk.java b/...services/splunk/src/main/java/software/tnb/splunk/resource/openshift/OpenshiftSplunk.java
@@ -52,7 +52,8 @@ public class OpenshiftSplunk extends Splunk implements OpenshiftDeployable {
     private Route apiRoute;
     private String sccName;
 
-    public OpenshiftSplunk() {
+    @Override
+    public void defaultConfiguration() {
         getConfiguration().protocol(SplunkProtocol.HTTPS);
     }