@@ -162,8 +162,13 @@ Optional<ExtendedResourceEvent> eventForRangeAndClear(
162162 }
163163
164164 // if any of the events is part of re-list (including first delete) we detect it
165- var isAnyEventFromReList =
166- events .values ().stream ().anyMatch (ExtendedResourceEvent ::isPartOfReList );
165+ var isAnyEventFromReList = false ;
166+ for (var e : events .values ()) {
167+ if (e .isPartOfReList ()) {
168+ isAnyEventFromReList = true ;
169+ break ;
170+ }
171+ }
167172
168173 var first = getFirstRelatedEvent (events );
169174 // if delete event is first in the row and more events we can discard that
@@ -211,7 +216,7 @@ private ExtendedResourceEvent getFirstRelatedEvent() {
211216
212217 private ExtendedResourceEvent getFirstRelatedEvent (
213218 SortedMap <Long , ExtendedResourceEvent > subMap ) {
214- return subMap .values (). iterator (). next ( );
219+ return subMap .get ( subMap . firstKey () );
215220 }
216221
217222 private ExtendedResourceEvent getLastRelatedEvent (SortedMap <Long , ExtendedResourceEvent > subMap ) {
@@ -226,7 +231,7 @@ public synchronized boolean canBeRemoved() {
226231 }
227232
228233 public synchronized void addToOwnUpdateVersions (String resourceVersion ) {
229- ownUpdateVersions .add (Long .parseLong (resourceVersion ));
234+ ownUpdateVersions .add (Long .valueOf (resourceVersion ));
230235 }
231236
232237 public synchronized void addRelatedEvent (ExtendedResourceEvent event ) {
@@ -235,8 +240,7 @@ public synchronized void addRelatedEvent(ExtendedResourceEvent event) {
235240 }
236241
237242 relatedEvents .put (
238- Long .parseLong (event .getResource ().orElseThrow ().getMetadata ().getResourceVersion ()),
239- event );
243+ Long .valueOf (event .getResource ().orElseThrow ().getMetadata ().getResourceVersion ()), event );
240244 }
241245
242246 public synchronized void setReListStarted () {
0 commit comments