Skip to content

Commit 0d61e55

Browse files
committed
fix: id mapper
1 parent 44987c9 commit 0d61e55

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public long getPollingPeriod() {
2828

2929
// for now dependent resources support event sources only with one owned resource.
3030
@Override
31-
public String apply(R r) {
32-
return IDMapper.singleResourceIDMapper().apply(r);
31+
public String getID(R r) {
32+
return IDMapper.singleResourceIDMapper().getID(r);
3333
}
3434
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ protected synchronized void handleDelete(ResourceID primaryID) {
5252
}
5353

5454
protected synchronized void handleDeletes(ResourceID primaryID, Set<R> resource) {
55-
handleDelete(primaryID, resource.stream().map(idMapper).collect(Collectors.toSet()));
55+
handleDelete(primaryID, resource.stream().map(idMapper::getID).collect(Collectors.toSet()));
5656
}
5757

5858
protected synchronized void handleDelete(ResourceID primaryID, R resource) {
59-
handleDelete(primaryID, Set.of(idMapper.apply(resource)));
59+
handleDelete(primaryID, Set.of(idMapper.getID(resource)));
6060
}
6161

6262
protected synchronized void handleDelete(ResourceID primaryID, Set<String> resourceID) {
@@ -98,7 +98,7 @@ protected synchronized void handleResources(ResourceID primaryID, Set<R> newReso
9898
return;
9999
}
100100
var cachedResources = cache.get(primaryID);
101-
var newResourcesMap = newResources.stream().collect(Collectors.toMap(idMapper, r -> r));
101+
var newResourcesMap = newResources.stream().collect(Collectors.toMap(idMapper::getID, r -> r));
102102
cache.put(primaryID, newResourcesMap);
103103
if (propagateEvent && !newResourcesMap.equals(cachedResources)) {
104104
getEventHandler().handleEvent(new Event(primaryID));
@@ -108,7 +108,7 @@ protected synchronized void handleResources(ResourceID primaryID, Set<R> newReso
108108
@Override
109109
public synchronized void handleRecentResourceCreate(ResourceID primaryID, R resource) {
110110
var actualValues = cache.get(primaryID);
111-
var resourceId = idMapper.apply(resource);
111+
var resourceId = idMapper.getID(resource);
112112
if (actualValues == null) {
113113
actualValues = new HashMap<>();
114114
cache.put(primaryID, actualValues);
@@ -123,7 +123,7 @@ public synchronized void handleRecentResourceUpdate(
123123
ResourceID primaryID, R resource, R previousVersionOfResource) {
124124
var actualValues = cache.get(primaryID);
125125
if (actualValues != null) {
126-
var resourceId = idMapper.apply(resource);
126+
var resourceId = idMapper.getID(resource);
127127
R actualResource = actualValues.get(resourceId);
128128
if (actualResource.equals(previousVersionOfResource)) {
129129
actualValues.put(resourceId, resource);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.javaoperatorsdk.operator.processing.event.source;
22

3-
import java.util.function.Function;
3+
public interface IDMapper<R> {
44

5-
public interface IDMapper<R> extends Function<R, String> {
5+
String getID(R var1);
66

77
/**
88
* Used If a polling event source handles only single secondary resource. See also docs for:

0 commit comments

Comments
 (0)