Minor cleanup

jenkinsci · Sep 21, 2022 · e903c33 · e903c33
1 parent 89fcecd
commit e903c33
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/cloud/dnation/jenkins/plugins/hetzner/HetznerConstants.java b/src/main/java/cloud/dnation/jenkins/plugins/hetzner/HetznerConstants.java
@@ -19,6 +19,8 @@
 import cloud.dnation.jenkins.plugins.hetzner.connect.Both;
 import cloud.dnation.jenkins.plugins.hetzner.launcher.AbstractConnectionMethod;
 import cloud.dnation.jenkins.plugins.hetzner.launcher.DefaultConnectionMethod;
+import cloud.dnation.jenkins.plugins.hetzner.primaryip.AbstractPrimaryIpStrategy;
+import cloud.dnation.jenkins.plugins.hetzner.primaryip.DefaultStrategy;
 import cloud.dnation.jenkins.plugins.hetzner.shutdown.IdlePeriodPolicy;
 import com.google.common.collect.ImmutableSet;
 import lombok.experimental.UtilityClass;
@@ -95,6 +97,11 @@ public class HetznerConstants {
      */
     public static final int SHUTDOWN_TIME_BUFFER = 5;
 
+    /**
+     * Default strategy to get primary IP.
+     */
+    public static final AbstractPrimaryIpStrategy DEFAULT_PRIMARY_IP_STRATEGY = DefaultStrategy.SINGLETON;
+
     public static final AbstractConnectionMethod DEFAULT_CONNECTION_METHOD = DefaultConnectionMethod.SINGLETON;
 
     /**

diff --git a/src/main/java/cloud/dnation/jenkins/plugins/hetzner/HetznerServerTemplate.java b/src/main/java/cloud/dnation/jenkins/plugins/hetzner/HetznerServerTemplate.java
@@ -18,7 +18,6 @@
 import cloud.dnation.jenkins.plugins.hetzner.connect.AbstractConnectivity;
 import cloud.dnation.jenkins.plugins.hetzner.launcher.AbstractHetznerSshConnector;
 import cloud.dnation.jenkins.plugins.hetzner.primaryip.AbstractPrimaryIpStrategy;
-import cloud.dnation.jenkins.plugins.hetzner.primaryip.DefaultStrategy;
 import cloud.dnation.jenkins.plugins.hetzner.shutdown.AbstractShutdownPolicy;
 import cloud.dnation.jenkins.plugins.hetzner.shutdown.IdlePeriodPolicy;
 import com.google.common.base.Strings;
@@ -154,7 +153,7 @@ protected Object readResolve() {
             shutdownPolicy = HetznerConstants.DEFAULT_SHUTDOWN_POLICY;
         }
         if (primaryIp == null) {
-            primaryIp = DefaultStrategy.SINGLETON;
+            primaryIp = HetznerConstants.DEFAULT_PRIMARY_IP_STRATEGY;
         }
         if (connectivity == null ) {
             connectivity = HetznerConstants.DEFAULT_CONNECTIVITY;