Skip to content

Commit 3d8c5b9

Browse files
committed
wip
Signed-off-by: Attila Mészáros <[email protected]>
1 parent 2f9767d commit 3d8c5b9

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void setLastEvent(ResourceEvent event) {
4141
public Optional<ResourceEvent> getLatestEventAfterLastUpdateEvent(String updatedResourceVersion) {
4242
if (lastEvent != null
4343
&& (updatedResourceVersion == null
44-
|| ReconcileUtils.validateAndCompareResourceVersions(
44+
|| ReconcileUtils.compareResourceVersions(
4545
lastEvent.getResource().orElseThrow().getMetadata().getResourceVersion(),
4646
updatedResourceVersion)
4747
> 0)) {

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,7 @@ public Optional<R> get(ResourceID resourceID) {
174174
Optional<R> resource = temporaryResourceCache.getResourceFromCache(resourceID);
175175
if (comparableResourceVersions
176176
&& resource.isPresent()
177-
&& res.filter(
178-
r ->
179-
ReconcileUtils.validateAndCompareResourceVersions(r, resource.orElseThrow())
180-
> 0)
177+
&& res.filter(r -> ReconcileUtils.compareResourceVersions(r, resource.orElseThrow()) > 0)
181178
.isEmpty()) {
182179
log.debug("Latest resource found in temporary cache for Resource ID: {}", resourceID);
183180
return resource;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ private synchronized EventHandling onEvent(T resource, boolean unknownState, boo
123123
EventHandling result = EventHandling.NEW;
124124
int comp = 0;
125125
if (cached != null) {
126-
comp = ReconcileUtils.validateAndCompareResourceVersions(resource, cached);
126+
comp = ReconcileUtils.compareResourceVersions(resource, cached);
127127
if (comp >= 0 || unknownState) {
128128
cache.remove(resourceId);
129129
// we propagate event only for our update or newer other can be discarded since we know we
@@ -185,7 +185,7 @@ public synchronized void putResource(T newResource) {
185185
var cachedResource = getResourceFromCache(resourceId).orElse(null);
186186

187187
if (cachedResource == null
188-
|| ReconcileUtils.validateAndCompareResourceVersions(newResource, cachedResource) > 0) {
188+
|| ReconcileUtils.compareResourceVersions(newResource, cachedResource) > 0) {
189189
log.debug(
190190
"Temporarily moving ahead to target version {} for resource id: {}",
191191
newResource.getMetadata().getResourceVersion(),

0 commit comments

Comments
 (0)