remove direct access to the clusters array

Author: russgold

operator/src/main/java/oracle/kubernetes/operator/helpers/DomainPresenceInfo.java

@@ -21,7 +21,6 @@
 import oracle.kubernetes.operator.wlsconfig.WlsServerConfig;
 import oracle.kubernetes.weblogic.domain.model.Domain;
 import oracle.kubernetes.weblogic.domain.model.ServerSpec;
-import org.joda.time.DateTime;
 
 /**
  * Operator's mapping between custom resource Domain and runtime details about that domain,
@@ -39,8 +38,6 @@ public class DomainPresenceInfo {
   private final ConcurrentMap<String, ServerKubernetesObjects> servers = new ConcurrentHashMap<>();
   private final ConcurrentMap<String, V1Service> clusters = new ConcurrentHashMap<>();
 
-  private DateTime lastCompletionTime;
-
   /**
    * Create presence for a domain.
    *
@@ -102,26 +99,26 @@ private V1Service getNewerCurrentOrNull(V1Service service, V1Service event) {
   }
 
   void removeClusterService(String clusterName) {
-    getClusters().remove(clusterName);
+    clusters.remove(clusterName);
   }
 
   V1Service getClusterService(String clusterName) {
-    return getClusters().get(clusterName);
+    return clusters.get(clusterName);
   }
 
   void setClusterService(String clusterName, V1Service service) {
-    getClusters().put(clusterName, service);
+    clusters.put(clusterName, service);
   }
 
   void setClusterServiceFromEvent(String clusterName, V1Service event) {
     if (clusterName == null) return;
 
-    getClusters().compute(clusterName, (k, s) -> getNewerService(s, event));
+    clusters.compute(clusterName, (k, s) -> getNewerService(s, event));
   }
 
   boolean deleteClusterServiceFromEvent(String clusterName, V1Service event) {
     return removeIfPresentAnd(
-        getClusters(),
+        clusters,
         clusterName,
         s -> !KubernetesUtils.isFirstNewer(getMetadata(s), getMetadata(event)));
   }
@@ -181,30 +178,20 @@ public void setPopulated(boolean populated) {
     isPopulated.set(populated);
   }
 
-  public void resetFailureCount() {
+  private void resetFailureCount() {
     retryCount.set(0);
   }
 
   public int incrementAndGetFailureCount() {
     return retryCount.incrementAndGet();
   }
 
-  public int getRetryCount() {
+  int getRetryCount() {
     return retryCount.get();
   }
 
-  /**
-   * Last completion time.
-   *
-   * @return Last completion time
-   */
-  public DateTime getLastCompletionTime() {
-    return lastCompletionTime;
-  }
-
   /** Sets the last completion time to now. */
   public void complete() {
-    this.lastCompletionTime = new DateTime();
     resetFailureCount();
   }
 
@@ -253,15 +240,6 @@ public ConcurrentMap<String, ServerKubernetesObjects> getServers() {
     return servers;
   }
 
-  /**
-   * Map from cluster name to Service objects.
-   *
-   * @return Cluster object map
-   */
-  public ConcurrentMap<String, V1Service> getClusters() {
-    return clusters;
-  }
-
   /**
    * Server startup info.
    *

operator/src/test/java/oracle/kubernetes/operator/helpers/ServicePresenceTest.java

@@ -130,31 +130,31 @@ public void onAddEventWithNoRecordedClusterService_addIt() {
 
     processor.dispatchServiceWatch(event);
 
-    assertThat(info.getClusters().get(CLUSTER), sameInstance(newService));
+    assertThat(info.getClusterService(CLUSTER), sameInstance(newService));
   }
 
   @Test
   public void onAddEventWithNewerClusterService_replaceCurrentValue() {
     V1Service currentService = createClusterService();
     V1Service newerService = createClusterService();
-    info.getClusters().put(CLUSTER, currentService);
+    info.setClusterService(CLUSTER, currentService);
     Watch.Response<V1Service> event = WatchEvent.createAddedEvent(newerService).toWatchResponse();
 
     processor.dispatchServiceWatch(event);
 
-    assertThat(info.getClusters().get(CLUSTER), sameInstance(newerService));
+    assertThat(info.getClusterService(CLUSTER), sameInstance(newerService));
   }
 
   @Test
   public void onAddEventWithOlderClusterService_keepCurrentValue() {
     V1Service olderService = createClusterService();
     V1Service currentService = createClusterService();
-    info.getClusters().put(CLUSTER, currentService);
+    info.setClusterService(CLUSTER, currentService);
     Watch.Response<V1Service> event = WatchEvent.createAddedEvent(olderService).toWatchResponse();
 
     processor.dispatchServiceWatch(event);
 
-    assertThat(info.getClusters().get(CLUSTER), sameInstance(currentService));
+    assertThat(info.getClusterService(CLUSTER), sameInstance(currentService));
   }
 
   @Test
@@ -164,31 +164,31 @@ public void onModifyEventWithNoRecordedClusterService_addIt() {
 
     processor.dispatchServiceWatch(event);
 
-    assertThat(info.getClusters().get(CLUSTER), sameInstance(service1));
+    assertThat(info.getClusterService(CLUSTER), sameInstance(service1));
   }
 
   @Test
   public void onModifyEventWithNewerClusterService_replaceCurrentValue() {
     V1Service currentService = createClusterService();
     V1Service newService = createClusterService();
-    info.getClusters().put(CLUSTER, currentService);
+    info.setClusterService(CLUSTER, currentService);
     Watch.Response<V1Service> event = WatchEvent.createModifiedEvent(newService).toWatchResponse();
 
     processor.dispatchServiceWatch(event);
 
-    assertThat(info.getClusters().get(CLUSTER), sameInstance(newService));
+    assertThat(info.getClusterService(CLUSTER), sameInstance(newService));
   }
 
   @Test
   public void onModifyEventWithOlderClusterService_keepCurrentValue() {
     V1Service oldService = createClusterService();
     V1Service currentService = createClusterService();
-    info.getClusters().put(CLUSTER, currentService);
+    info.setClusterService(CLUSTER, currentService);
     Watch.Response<V1Service> event = WatchEvent.createModifiedEvent(oldService).toWatchResponse();
 
     processor.dispatchServiceWatch(event);
 
-    assertThat(info.getClusters().get(CLUSTER), sameInstance(currentService));
+    assertThat(info.getClusterService(CLUSTER), sameInstance(currentService));
   }
 
   @Test
@@ -198,43 +198,43 @@ public void onDeleteEventWithNoRecordedClusterService_ignoreIt() {
 
     processor.dispatchServiceWatch(event);
 
-    assertThat(info.getClusters().get(CLUSTER), nullValue());
+    assertThat(info.getClusterService(CLUSTER), nullValue());
   }
 
   @Test
   public void onDeleteEventWithOlderClusterService_keepCurrentValue() {
     V1Service oldService = createClusterService();
     V1Service currentService = createClusterService();
-    info.getClusters().put(CLUSTER, currentService);
+    info.setClusterService(CLUSTER, currentService);
     Watch.Response<V1Service> event = WatchEvent.createDeleteEvent(oldService).toWatchResponse();
 
     processor.dispatchServiceWatch(event);
 
-    assertThat(info.getClusters().get(CLUSTER), sameInstance(currentService));
+    assertThat(info.getClusterService(CLUSTER), sameInstance(currentService));
   }
 
   @Test
   public void onDeleteEventWithSameClusterService_removeIt() {
     V1Service currentService = createClusterService();
-    info.getClusters().put(CLUSTER, currentService);
+    info.setClusterService(CLUSTER, currentService);
     Watch.Response<V1Service> event =
         WatchEvent.createDeleteEvent(currentService).toWatchResponse();
 
     processor.dispatchServiceWatch(event);
 
-    assertThat(info.getClusters().get(CLUSTER), nullValue());
+    assertThat(info.getClusterService(CLUSTER), nullValue());
   }
 
   @Test
   public void onDeleteEventWithNewerClusterService_removeIt() {
     V1Service currentService = createClusterService();
     V1Service newerService = createClusterService();
-    info.getClusters().put(CLUSTER, currentService);
+    info.setClusterService(CLUSTER, currentService);
     Watch.Response<V1Service> event = WatchEvent.createDeleteEvent(newerService).toWatchResponse();
 
     processor.dispatchServiceWatch(event);
 
-    assertThat(info.getClusters().get(CLUSTER), nullValue());
+    assertThat(info.getClusterService(CLUSTER), nullValue());
   }
 
   @Test