Revert "test: fix race condition in SpringAnnotationCompatibilityTest"

This reverts commit 6261c1e.

Author: Shawyeok

apollo-compat-tests/apollo-spring-compat-it/src/test/java/com/ctrip/framework/apollo/compat/spring/SpringAnnotationCompatibilityTest.java

@@ -18,7 +18,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 import com.ctrip.framework.apollo.Config;
 import com.ctrip.framework.apollo.ConfigService;
@@ -123,7 +122,8 @@ public void shouldSupportAnnotationAndMultipleConfig() throws Exception {
     assertNotNull(anotherAppChange);
     assertNotNull(anotherAppChange.getChange("compat.origin"));
 
-    assertTrue(apolloEventListenerProbe.waitForNamespace("application", 10, TimeUnit.SECONDS));
+    String namespace = apolloEventListenerProbe.pollNamespace(10, TimeUnit.SECONDS);
+    assertEquals("application", namespace);
 
     SpringCompatibilityTestSupport.waitForCondition("public value should be updated",
         () -> "from-public-updated".equals(

apollo-compat-tests/apollo-spring-compat-it/src/test/java/com/ctrip/framework/apollo/compat/spring/SpringApolloEventListenerProbe.java

@@ -37,20 +37,4 @@ public void onApplicationEvent(ApplicationEvent event) {
   public String pollNamespace(long timeout, TimeUnit unit) throws InterruptedException {
     return namespaces.poll(timeout, unit);
   }
-
-  public boolean waitForNamespace(String expectedNamespace, long timeout, TimeUnit unit)
-      throws InterruptedException {
-    long deadline = System.currentTimeMillis() + unit.toMillis(timeout);
-    while (System.currentTimeMillis() < deadline) {
-      long remaining = deadline - System.currentTimeMillis();
-      if (remaining <= 0) {
-        break;
-      }
-      String namespace = namespaces.poll(remaining, TimeUnit.MILLISECONDS);
-      if (expectedNamespace.equals(namespace)) {
-        return true;
-      }
-    }
-    return false;
-  }
 }