fix: naming fixes (#805)

Author: csviri

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

@@ -167,7 +167,7 @@ public synchronized void shouldStart() {
         return;
       }
       if (controllers.isEmpty()) {
-        throw new OperatorException("No ResourceController exists. Exiting!");
+        throw new OperatorException("No Controller exists. Exiting!");
       }
     }
 

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSource.java

@@ -57,7 +57,7 @@ public PerResourcePollingEventSource(ResourceSupplier<T, R> resourceSupplier,
   }
 
   private void pollForResource(R resource) {
-    var value = resourceSupplier.getResources(resource);
+    var value = resourceSupplier.getResource(resource);
     var resourceID = ResourceID.fromResource(resource);
     if (value.isEmpty()) {
       super.handleDelete(resourceID);
@@ -69,7 +69,7 @@ private void pollForResource(R resource) {
   private Optional<T> getAndCacheResource(ResourceID resourceID) {
     var resource = resourceCache.get(resourceID);
     if (resource.isPresent()) {
-      var value = resourceSupplier.getResources(resource.get());
+      var value = resourceSupplier.getResource(resource.get());
       value.ifPresent(v -> cache.put(resourceID, v));
       return value;
     }
@@ -152,7 +152,7 @@ public Optional<T> getValueFromCacheOrSupplier(ResourceID resourceID) {
   }
 
   public interface ResourceSupplier<T, R> {
-    Optional<T> getResources(R resource);
+    Optional<T> getResource(R resource);
   }
 
   @Override

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSourceTest.java

@@ -35,7 +35,7 @@ class PerResourcePollingEventSourceTest extends
   @BeforeEach
   public void setup() {
     when(resourceCache.get(any())).thenReturn(Optional.of(testCustomResource));
-    when(supplier.getResources(any()))
+    when(supplier.getResource(any()))
         .thenReturn(Optional.of(SampleExternalResource.testResource1()));
 
     setUpSource(new PerResourcePollingEventSource<>(supplier, resourceCache, PERIOD,
@@ -47,7 +47,7 @@ public void pollsTheResourceAfterAwareOfIt() throws InterruptedException {
     source.onResourceCreated(testCustomResource);
 
     Thread.sleep(3 * PERIOD);
-    verify(supplier, atLeast(2)).getResources(eq(testCustomResource));
+    verify(supplier, atLeast(2)).getResource(eq(testCustomResource));
     verify(eventHandler, times(1)).handleEvent(any());
   }
 
@@ -59,31 +59,31 @@ public void registeringTaskOnAPredicate() throws InterruptedException {
     source.onResourceCreated(testCustomResource);
     Thread.sleep(2 * PERIOD);
 
-    verify(supplier, times(0)).getResources(eq(testCustomResource));
+    verify(supplier, times(0)).getResource(eq(testCustomResource));
     testCustomResource.getMetadata().setGeneration(2L);
     source.onResourceUpdated(testCustomResource, testCustomResource);
 
     Thread.sleep(2 * PERIOD);
 
-    verify(supplier, atLeast(1)).getResources(eq(testCustomResource));
+    verify(supplier, atLeast(1)).getResource(eq(testCustomResource));
   }
 
   @Test
   public void propagateEventOnDeletedResource() throws InterruptedException {
     source.onResourceCreated(testCustomResource);
-    when(supplier.getResources(any()))
+    when(supplier.getResource(any()))
         .thenReturn(Optional.of(SampleExternalResource.testResource1()))
         .thenReturn(Optional.empty());
 
     Thread.sleep(3 * PERIOD);
-    verify(supplier, atLeast(2)).getResources(eq(testCustomResource));
+    verify(supplier, atLeast(2)).getResource(eq(testCustomResource));
     verify(eventHandler, times(2)).handleEvent(any());
   }
 
   @Test
   public void getsValueFromCacheOrSupplier() throws InterruptedException {
     source.onResourceCreated(testCustomResource);
-    when(supplier.getResources(any()))
+    when(supplier.getResource(any()))
         .thenReturn(Optional.empty())
         .thenReturn(Optional.of(SampleExternalResource.testResource1()));
 

sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/SchemaPollingResourceSupplier.java

@@ -16,7 +16,7 @@ public SchemaPollingResourceSupplier(MySQLDbConfig mySQLDbConfig) {
   }
 
   @Override
-  public Optional<Schema> getResources(MySQLSchema resource) {
+  public Optional<Schema> getResource(MySQLSchema resource) {
     return schemaService.getSchema(resource.getMetadata().getName());
   }
 }