naming fix

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractPollingDependentResource.java

@@ -29,6 +29,6 @@ public long getPollingPeriod() {
   // for now dependent resources support event sources only with one owned resource.
   @Override
   public String keyFor(R r) {
-    return CacheKeyMapper.singleResourceIDMapper().keyFor(r);
+    return CacheKeyMapper.singleResourceCacheKeyMapper().keyFor(r);
   }
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/PollingDependentResource.java

@@ -10,23 +10,23 @@ public abstract class PollingDependentResource<R, P extends HasMetadata>
     extends AbstractPollingDependentResource<R, P>
     implements PollingEventSource.GenericResourceFetcher<R> {
 
-  private final CacheKeyMapper<R> idProvider;
+  private final CacheKeyMapper<R> cacheKeyMapper;
 
-  public PollingDependentResource(Class<R> resourceType, CacheKeyMapper<R> idProvider) {
+  public PollingDependentResource(Class<R> resourceType, CacheKeyMapper<R> cacheKeyMapper) {
     super(resourceType);
-    this.idProvider = idProvider;
+    this.cacheKeyMapper = cacheKeyMapper;
   }
 
   public PollingDependentResource(Class<R> resourceType, long pollingPeriod,
-      CacheKeyMapper<R> idProvider) {
+      CacheKeyMapper<R> cacheKeyMapper) {
     super(resourceType, pollingPeriod);
-    this.idProvider = idProvider;
+    this.cacheKeyMapper = cacheKeyMapper;
   }
 
   @Override
   protected ExternalResourceCachingEventSource<R, P> createEventSource(
       EventSourceContext<P> context) {
-    return new PollingEventSource<>(this, getPollingPeriod(), resourceType(), idProvider);
+    return new PollingEventSource<>(this, getPollingPeriod(), resourceType(), cacheKeyMapper);
   }
 
 }

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

@@ -11,7 +11,7 @@ public interface CacheKeyMapper<R> {
    * @return static id mapper, all resources are mapped for same id.
    * @param <T> secondary resource type
    */
-  static <T> CacheKeyMapper<T> singleResourceIDMapper() {
+  static <T> CacheKeyMapper<T> singleResourceCacheKeyMapper() {
     return r -> "id";
   }
 

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

@@ -44,7 +44,7 @@ public class PerResourcePollingEventSource<R, P extends HasMetadata>
   public PerResourcePollingEventSource(ResourceFetcher<R, P> resourceFetcher,
       Cache<P> resourceCache, long period, Class<R> resourceClass) {
     this(resourceFetcher, resourceCache, period, null, resourceClass,
-        CacheKeyMapper.singleResourceIDMapper());
+        CacheKeyMapper.singleResourceCacheKeyMapper());
   }
 
   public PerResourcePollingEventSource(ResourceFetcher<R, P> resourceFetcher,

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

@@ -53,7 +53,7 @@ public PollingEventSource(
       GenericResourceFetcher<R> supplier,
       long period,
       Class<R> resourceClass) {
-    super(resourceClass, CacheKeyMapper.singleResourceIDMapper());
+    super(resourceClass, CacheKeyMapper.singleResourceCacheKeyMapper());
     this.genericResourceFetcher = supplier;
     this.period = period;
   }

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

@@ -57,7 +57,7 @@ void pollsTheResourceAfterAwareOfIt() throws InterruptedException {
   void registeringTaskOnAPredicate() throws InterruptedException {
     setUpSource(new PerResourcePollingEventSource<>(supplier, resourceCache, PERIOD,
         testCustomResource -> testCustomResource.getMetadata().getGeneration() > 1,
-        SampleExternalResource.class, CacheKeyMapper.singleResourceIDMapper()));
+        SampleExternalResource.class, CacheKeyMapper.singleResourceCacheKeyMapper()));
     source.onResourceCreated(testCustomResource);
     Thread.sleep(2 * PERIOD);