Extract method for locking the buffer

src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java

@@ -18,7 +18,7 @@ public class AbstractTimetableSnapshotSource implements TimetableSnapshotProvide
   /**
    * Lock to indicate that buffer is in use
    */
-  protected final ReentrantLock bufferLock = new ReentrantLock(true);
+  private final ReentrantLock bufferLock = new ReentrantLock(true);
 
   /**
    * The working copy of the timetable snapshot. Should not be visible to routing threads. Should
@@ -137,4 +137,15 @@ protected final boolean purgeExpiredData() {
   protected final LocalDate localDateNow() {
     return localDateNow.get();
   }
+
+  protected final void withLock(Runnable action) {
+    bufferLock.lock();
+
+    try {
+      action.run();
+    } finally {
+      // Always release lock
+      bufferLock.unlock();
+    }
+  }
 }

src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java

@@ -56,17 +56,13 @@ public class SiriTimetableSnapshotSource extends AbstractTimetableSnapshotSource
 
   private final TransitService transitService;
 
-  /** Should expired real-time data be purged from the graph. */
-  private final boolean purgeExpiredData;
-
   public SiriTimetableSnapshotSource(
     TimetableSnapshotSourceParameters parameters,
     TransitModel transitModel
   ) {
     super(transitModel.getTransitLayerUpdater(), parameters, LocalDate::now);
     this.transitModel = transitModel;
     this.transitService = new DefaultTransitService(transitModel);
-    this.purgeExpiredData = parameters.purgeExpiredData();
     this.tripPatternCache =
       new SiriTripPatternCache(tripPatternIdGenerator, transitService::getPatternForTrip);
 
@@ -92,12 +88,9 @@ public UpdateResult applyEstimatedTimetable(
       return UpdateResult.empty();
     }
 
-    // Acquire lock on buffer
-    bufferLock.lock();
-
     List<Result<UpdateSuccess, UpdateError>> results = new ArrayList<>();
 
-    try {
+    withLock(() -> {
       if (fullDataset) {
         // Remove all updates from the buffer
         buffer.clear(feedId);
@@ -116,10 +109,8 @@ public UpdateResult applyEstimatedTimetable(
       LOG.debug("message contains {} trip updates", updates.size());
 
       purgeAndCommit();
-    } finally {
-      // Always release lock
-      bufferLock.unlock();
-    }
+    });
+
     return UpdateResult.ofResults(results);
   }
 

src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java

@@ -147,13 +147,10 @@ public UpdateResult applyTripUpdates(
       return UpdateResult.empty();
     }
 
-    // Acquire lock on buffer
-    bufferLock.lock();
-
     Map<TripDescriptor.ScheduleRelationship, Integer> failuresByRelationship = new HashMap<>();
     List<Result<UpdateSuccess, UpdateError>> results = new ArrayList<>();
 
-    try {
+    withLock(() -> {
       if (fullDataset) {
         // Remove all updates from the buffer
         buffer.clear(feedId);
@@ -253,10 +250,7 @@ public UpdateResult applyTripUpdates(
       }
 
       purgeAndCommit();
-    } finally {
-      // Always release lock
-      bufferLock.unlock();
-    }
+    });
 
     var updateResult = UpdateResult.ofResults(results);