rename prefetching LazyReads to "...PrefetchLazyRead"

instead of "...SliceTracking..." which is not their main feature

Author: tpietzsch

src/main/java/org/janelia/saalfeldlab/n5/readdata/VolatileReadData.java

@@ -1,7 +1,7 @@
 package org.janelia.saalfeldlab.n5.readdata;
 
 import org.janelia.saalfeldlab.n5.N5Exception.N5IOException;
-import org.janelia.saalfeldlab.n5.readdata.prefetch.AggregatingSliceTrackingLazyRead;
+import org.janelia.saalfeldlab.n5.readdata.prefetch.AggregatingPrefetchLazyRead;
 
 /**
  * During its life-time, the content of a {@code VolatileReadData} should not be
@@ -29,7 +29,7 @@ public interface VolatileReadData extends ReadData, AutoCloseable {
 	 * @return a new VolatileReadData
 	 */
 	static VolatileReadData from(final LazyRead lazyRead) {
-		final LazyRead aggregatingLazyRead = new AggregatingSliceTrackingLazyRead(lazyRead);
+		final LazyRead aggregatingLazyRead = new AggregatingPrefetchLazyRead(lazyRead);
 		return new LazyReadData(aggregatingLazyRead);
 	}
 

…ch/AggregatingSliceTrackingLazyRead.java …refetch/AggregatingPrefetchLazyRead.javasrc/main/java/org/janelia/saalfeldlab/n5/readdata/prefetch/AggregatingSliceTrackingLazyRead.java renamed to src/main/java/org/janelia/saalfeldlab/n5/readdata/prefetch/AggregatingPrefetchLazyRead.java src/main/java/org/janelia/saalfeldlab/n5/readdata/prefetch/AggregatingSliceTrackingLazyRead.java renamed to src/main/java/org/janelia/saalfeldlab/n5/readdata/prefetch/AggregatingPrefetchLazyRead.java

@@ -6,9 +6,14 @@
 import org.janelia.saalfeldlab.n5.readdata.LazyRead;
 import org.janelia.saalfeldlab.n5.readdata.Range;
 
-public class AggregatingSliceTrackingLazyRead extends SliceTrackingLazyRead {
+/**
+ * A {@link SliceTrackingLazyRead} that implements {@link #prefetch} to
+ * aggregate overlapping / adjacent ranges and then materialize each aggregated
+ * range.
+ */
+public class AggregatingPrefetchLazyRead extends SliceTrackingLazyRead {
 
-	public AggregatingSliceTrackingLazyRead(final LazyRead delegate) {
+	public AggregatingPrefetchLazyRead(final LazyRead delegate) {
 		super(delegate);
 	}
 

…efetch/DefaultSliceTrackingLazyRead.java …/prefetch/EnclosingPrefetchLazyRead.javasrc/main/java/org/janelia/saalfeldlab/n5/readdata/prefetch/DefaultSliceTrackingLazyRead.java renamed to src/main/java/org/janelia/saalfeldlab/n5/readdata/prefetch/EnclosingPrefetchLazyRead.java src/main/java/org/janelia/saalfeldlab/n5/readdata/prefetch/DefaultSliceTrackingLazyRead.java renamed to src/main/java/org/janelia/saalfeldlab/n5/readdata/prefetch/EnclosingPrefetchLazyRead.java

@@ -5,9 +5,13 @@
 import org.janelia.saalfeldlab.n5.readdata.LazyRead;
 import org.janelia.saalfeldlab.n5.readdata.Range;
 
-public class DefaultSliceTrackingLazyRead extends SliceTrackingLazyRead {
+/**
+ * A {@link SliceTrackingLazyRead} that implements {@link #prefetch} to
+ * materialize the bounding range of all requested ranges.
+ */
+public class EnclosingPrefetchLazyRead extends SliceTrackingLazyRead {
 
-	public DefaultSliceTrackingLazyRead(final LazyRead delegate) {
+	public EnclosingPrefetchLazyRead(final LazyRead delegate) {
 		super(delegate);
 	}
 

src/test/java/org/janelia/saalfeldlab/n5/kva/TrackingKeyValueAccess.java

@@ -5,7 +5,7 @@
 import org.janelia.saalfeldlab.n5.readdata.LazyRead;
 import org.janelia.saalfeldlab.n5.readdata.ReadData;
 import org.janelia.saalfeldlab.n5.readdata.VolatileReadData;
-import org.janelia.saalfeldlab.n5.readdata.prefetch.AggregatingSliceTrackingLazyRead;
+import org.janelia.saalfeldlab.n5.readdata.prefetch.AggregatingPrefetchLazyRead;
 
 public class TrackingKeyValueAccess extends DelegateKeyValueAccess {
 
@@ -31,7 +31,7 @@ public VolatileReadData createReadData(final String normalPath) {
         final TrackingLazyRead trackingLazyRead = new TrackingLazyRead(volatileReadData);
         LazyRead lazyRead = trackingLazyRead;
         if (aggregate)
-            lazyRead = new AggregatingSliceTrackingLazyRead(trackingLazyRead);
+            lazyRead = new AggregatingPrefetchLazyRead(trackingLazyRead);
         return VolatileReadData.from( lazyRead );
     }
 

src/test/java/org/janelia/saalfeldlab/n5/readdata/prefetch/SliceTrackingLazyReadTests.java

@@ -160,7 +160,7 @@ private static void assertStoredSlices(TestableSliceTracker sliceTracking, List<
 	/**
 	 * Testable wrapper for DefaultSliceTrackingLazyRead that exposes slices.
 	 */
-	static class TestableDefaultSliceTracker extends DefaultSliceTrackingLazyRead implements TestableSliceTracker {
+	static class TestableDefaultSliceTracker extends EnclosingPrefetchLazyRead implements TestableSliceTracker {
 		public TestableDefaultSliceTracker(LazyRead delegate) {
 			super(delegate);
 		}
@@ -174,7 +174,7 @@ public List<Range> getSlices() {
 	/**
 	 * Testable wrapper for AggregatingSliceTrackingLazyRead that exposes slices.
 	 */
-	static class TestableAggregatingSliceTracker extends AggregatingSliceTrackingLazyRead implements TestableSliceTracker {
+	static class TestableAggregatingSliceTracker extends AggregatingPrefetchLazyRead implements TestableSliceTracker {
 		public TestableAggregatingSliceTracker(LazyRead delegate) {
 			super(delegate);
 		}