Revert "refactor: move identity generation to configuration"

This reverts commit 93a260a.

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/LeaderElectionManager.java

@@ -1,5 +1,6 @@
 package io.javaoperatorsdk.operator;
 
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
 import org.slf4j.Logger;
@@ -15,7 +16,7 @@
 import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
 import io.javaoperatorsdk.operator.api.config.LeaderElectionConfiguration;
 
-class LeaderElectionManager {
+public class LeaderElectionManager {
 
   private static final Logger log = LoggerFactory.getLogger(LeaderElectionManager.class);
 
@@ -29,7 +30,7 @@ public LeaderElectionManager(ControllerManager controllerManager) {
   }
 
   public void init(LeaderElectionConfiguration config, KubernetesClient client) {
-    this.identity = config.getIdentity();
+    this.identity = identity(config);
     Lock lock = new LeaseLock(config.getLeaseNamespace(), config.getLeaseName(), identity);
     // releaseOnCancel is not used in the underlying implementation
     leaderElector = new LeaderElectorBuilder(client,
@@ -45,8 +46,9 @@ public boolean isLeaderElectionEnabled() {
   }
 
   private LeaderCallbacks leaderCallbacks() {
-    return new LeaderCallbacks(this::startLeading, this::stopLeading,
-        leader -> log.info("New leader with identity: {}", leader));
+    return new LeaderCallbacks(this::startLeading, this::stopLeading, leader -> {
+      log.info("New leader with identity: {}", leader);
+    });
   }
 
   private void startLeading() {
@@ -61,6 +63,14 @@ private void stopLeading() {
     System.exit(1);
   }
 
+  private String identity(LeaderElectionConfiguration config) {
+    String id = config.getIdentity().orElse(System.getenv("HOSTNAME"));
+    if (id == null || id.isBlank()) {
+      id = UUID.randomUUID().toString();
+    }
+    return id;
+  }
+
   public void start() {
     if (isLeaderElectionEnabled()) {
       leaderElectionFuture = leaderElector.start();

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/LeaderElectionConfiguration.java

@@ -1,9 +1,7 @@
 package io.javaoperatorsdk.operator.api.config;
 
 import java.time.Duration;
-import java.util.UUID;
-
-import io.fabric8.zjsonpatch.internal.guava.Strings;
+import java.util.Optional;
 
 public class LeaderElectionConfiguration {
 
@@ -13,7 +11,7 @@ public class LeaderElectionConfiguration {
 
   private final String leaseName;
   private final String leaseNamespace;
-  private String identity;
+  private final String identity;
 
   private final Duration leaseDuration;
   private final Duration renewDeadline;
@@ -72,18 +70,7 @@ public Duration getRetryPeriod() {
     return retryPeriod;
   }
 
-  public String getIdentity() {
-    if (identity == null) {
-      identity = System.getenv("HOSTNAME");
-      if (Strings.isNullOrEmpty(identity)) {
-        identity = UUID.randomUUID().toString();
-      } else {
-        identity = identity.trim();
-        if (identity.isBlank()) {
-          identity = UUID.randomUUID().toString();
-        }
-      }
-    }
-    return identity;
+  public Optional<String> getIdentity() {
+    return Optional.ofNullable(identity);
   }
 }