changes from code review

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/expectation/ExpectationManager.java

@@ -140,8 +140,4 @@ public Optional<String> getExpectationName(P primary) {
   public void removeExpectation(P primary) {
     registeredExpectations.remove(ResourceID.fromResource(primary));
   }
-
-  public void cleanup(P primary) {
-    registeredExpectations.remove(ResourceID.fromResource(primary));
-  }
 }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/expectation/ExpectationManagerTest.java

@@ -125,13 +125,13 @@ void getExpectationNameShouldReturnEmptyWhenNoExpectation() {
   }
 
   @Test
-  void cleanupShouldRemoveExpectation() {
+  void removeExpectationShouldRemoveExpectation() {
     Expectation<ConfigMap> expectation = mock(Expectation.class);
 
     expectationManager.setExpectation(configMap, Duration.ofMinutes(5), expectation);
     assertThat(expectationManager.isExpectationPresent(configMap)).isTrue();
 
-    expectationManager.cleanup(configMap);
+    expectationManager.removeExpectation(configMap);
     assertThat(expectationManager.isExpectationPresent(configMap)).isFalse();
   }
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/ExpectationReconciler.java

@@ -57,7 +57,7 @@ public UpdateControl<ExpectationCustomResource> reconcile(
     // cleans up expectation manager for the resource on delete event
     // in case of cleaner interface used, this can done also there.
     if (context.isPrimaryResourceDeleted()) {
-      expectationManager.cleanup(primary);
+      expectationManager.removeExpectation(primary);
     }
 
     // exiting asap if there is an expectation that is not timed out neither fulfilled