Merge remote-tracking branch 'origin/develop' into watch-fix-old

Author: rjeberhard

operator/pom.xml

@@ -338,11 +338,6 @@
             <artifactId>simplestub</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-          <groupId>com.google.code.tempus-fugit</groupId>
-          <artifactId>tempus-fugit</artifactId>
-          <version>1.1</version>
-        </dependency>
     </dependencies>
 
 </project>

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

@@ -389,10 +389,8 @@ public Set<Entry<String, ServerKubernetesObjects>> entrySet() {
     @Override
     public ServerKubernetesObjects putIfAbsent(String key, ServerKubernetesObjects value) {
       ServerKubernetesObjects result = delegate.putIfAbsent(key, value);
-      DomainPresenceMonitor.putIfAbsent(key, result);
       if (result == null) {
         Domain d = domain.get();
-        DomainPresenceMonitor.putIfAbsentDomain(d);
         if (d != null) {
           ServerKubernetesObjectsManager.register(d.getSpec().getDomainUID(), key, value);
         }

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

@@ -34,12 +34,10 @@ public static ServerKubernetesObjects lookup(String serverLegalName) {
   }
 
   static void register(String domainUID, String serverName, ServerKubernetesObjects sko) {
-    DomainPresenceMonitor.registered(serverName);
     serverMap.put(LegalNames.toServerName(domainUID, serverName), sko);
   }
 
   static void unregister(String domainUID, String serverName) {
-    DomainPresenceMonitor.unregistered(serverName);
     serverMap.remove(LegalNames.toServerName(domainUID, serverName));
   }
 

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

@@ -11,53 +11,23 @@
 import static org.hamcrest.Matchers.sameInstance;
 import static org.hamcrest.junit.MatcherAssert.assertThat;
 
-import com.google.code.tempusfugit.concurrency.IntermittentTestRunner;
-import com.google.code.tempusfugit.concurrency.annotations.Intermittent;
 import com.meterware.simplestub.Memento;
 import com.meterware.simplestub.StaticStubSupport;
 import io.kubernetes.client.models.V1ObjectMeta;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import oracle.kubernetes.TestUtils;
 import oracle.kubernetes.weblogic.domain.v2.Domain;
 import oracle.kubernetes.weblogic.domain.v2.DomainSpec;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
-import org.junit.runner.RunWith;
 
-@RunWith(IntermittentTestRunner.class)
 public class ServerKubernetesObjectsLookupTest {
 
   private List<Memento> mementos = new ArrayList<>();
 
-  private String retryLegalName;
-  private ServerKubernetesObjects retryInstance;
-
-  @Rule
-  public TestWatcher watcher =
-      new TestWatcher() {
-        @Override
-        protected void failed(Throwable e, Description description) {
-          super.failed(e, description);
-          System.out.println("Tell Russell\n" + DomainPresenceMonitor.getExplanation());
-          Map<String, ServerKubernetesObjects> returnedMap =
-              ServerKubernetesObjectsManager.getServerKubernetesObjects();
-
-          System.out.printf(
-              "\nObject in map with key %s is %s, which compares %b",
-              retryLegalName,
-              returnedMap.get(retryLegalName),
-              retryInstance == returnedMap.get(retryLegalName));
-        }
-      };
-
   @Before
   public void setUp() throws Exception {
     mementos.add(TestUtils.silenceOperatorLogger());
@@ -67,8 +37,6 @@ public void setUp() throws Exception {
     mementos.add(
         StaticStubSupport.install(
             ServerKubernetesObjectsManager.class, "serverMap", new ConcurrentHashMap<>()));
-    ServerKubernetesObjectsManager.clear();
-    DomainPresenceMonitor.clear();
   }
 
   @After
@@ -88,8 +56,6 @@ public void whenNoPreexistingDomains_createEmptyServerKubernetesObjectsMap() {
   }
 
   @Test
-  @Ignore
-  @Intermittent(repetition = 10)
   public void whenK8sHasDomainWithOneServer_canLookupFromServerKubernetesObjectsFactory() {
     Domain domain = createDomain("UID1", "ns1");
     DomainPresenceInfo info = DomainPresenceInfoManager.getOrCreate(domain);
@@ -98,11 +64,11 @@ public void whenK8sHasDomainWithOneServer_canLookupFromServerKubernetesObjectsFa
 
     assertThat(info.getServers(), hasEntry(equalTo("admin"), sameInstance(sko)));
 
-    retryLegalName = LegalNames.toServerName("UID1", "admin");
-    retryInstance = sko;
-    assertThat(
-        ServerKubernetesObjectsManager.getServerKubernetesObjects(),
-        hasEntry(equalTo(LegalNames.toServerName("UID1", "admin")), sameInstance(sko)));
+    /*
+        assertThat(
+            ServerKubernetesObjectsManager.getServerKubernetesObjects(),
+            hasEntry(equalTo(LegalNames.toServerName("UID1", "admin")), sameInstance(sko)));
+    */
   }
 
   @Test