Index: oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/Buffer.java =================================================================== --- oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/Buffer.java (nonexistent) +++ oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/Buffer.java (working copy) @@ -0,0 +1,255 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.jackrabbit.oak.segment.spi.persistence; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.CharBuffer; +import java.nio.channels.FileChannel; +import java.nio.channels.FileChannel.MapMode; +import java.nio.channels.WritableByteChannel; +import java.nio.charset.Charset; +import java.util.zip.CRC32; + +/** + * This is a wrapper around {@link ByteBuffer}. It maintains the same semantics + * and mechanisms of the {@link ByteBuffer}. + *

+ * Java 9 introduced API changes to some methods in {@link ByteBuffer}. Instead + * of returning instances of {@link java.nio.Buffer Buffer}, those methods were + * rewritten to return instances of {@link ByteBuffer} instead. While this is + * perfectly fine at compile time, running "modern" code on Java 8 and earlier + * throws {@link NoSuchMethodError}. In order to prevent occurrences of this + * exceptions in the future, {@link Buffer} is used consistently in place of + * {@link ByteBuffer}. Since it is not possible to directly convert a {@link + * Buffer} into a {@link ByteBuffer} and the other way around, {@link Buffer} + * makes it less likely to develop dangerous code in the future. + */ +final public class Buffer { + + private final ByteBuffer buffer; + + private Buffer(ByteBuffer buffer) { + this.buffer = buffer; + } + + public static Buffer map(FileChannel channel, MapMode mode, long position, long size) throws IOException { + return new Buffer(channel.map(mode, position, size)); + } + + public static Buffer wrap(byte[] buffer) { + return new Buffer(ByteBuffer.wrap(buffer)); + } + + public static Buffer wrap(byte[] buffer, int pos, int len) { + return new Buffer(ByteBuffer.wrap(buffer, pos, len)); + } + + public static Buffer allocate(int cap) { + return new Buffer(ByteBuffer.allocate(cap)); + } + + public static Buffer allocateDirect(int cap) { + return new Buffer(ByteBuffer.allocateDirect(cap)); + } + + public int remaining() { + return buffer.remaining(); + } + + public Buffer asReadOnlyBuffer() { + return new Buffer(buffer.asReadOnlyBuffer()); + } + + public Buffer position(int pos) { + ((java.nio.Buffer) buffer).position(pos); + return this; + } + + public int position() { + return buffer.position(); + } + + public Buffer limit(int lim) { + ((java.nio.Buffer) buffer).limit(lim); + return this; + } + + public int limit() { + return buffer.limit(); + } + + public Buffer slice() { + return new Buffer(buffer.slice()); + } + + public int readFully(FileChannel channel, int position) throws IOException { + int result = 0; + while (buffer.remaining() > 0) { + int count = channel.read(buffer, position); + if (count < 0) { + break; + } + result += count; + position += count; + } + return result; + } + + public Buffer flip() { + ((java.nio.Buffer) buffer).flip(); + return this; + } + + public int getInt() { + return buffer.getInt(); + } + + public int getInt(int pos) { + return buffer.getInt(pos); + } + + public Buffer mark() { + ((java.nio.Buffer) buffer).mark(); + return this; + } + + public Buffer get(byte[] b) { + buffer.get(b); + return this; + } + + public Buffer get(byte[] b, int pos, int len) { + buffer.get(b, pos, len); + return this; + } + + public byte get(int pos) { + return buffer.get(pos); + } + + public byte get() { + return buffer.get(); + } + + public Buffer reset() { + ((java.nio.Buffer) buffer).reset(); + return this; + } + + public void update(CRC32 checksum) { + checksum.update(buffer); + } + + public byte[] array() { + return buffer.array(); + } + + public int capacity() { + return buffer.capacity(); + } + + public boolean isDirect() { + return buffer.isDirect(); + } + + public Buffer put(byte[] b) { + buffer.put(b); + return this; + } + + public Buffer put(byte[] buf, int pos, int len) { + buffer.put(buf, pos, len); + return this; + } + + public Buffer put(byte b) { + buffer.put(b); + return this; + } + + public Buffer put(Buffer b) { + buffer.put(b.buffer); + return this; + } + + public Buffer rewind() { + ((java.nio.Buffer) buffer).rewind(); + return this; + } + + public long getLong(int pos) { + return buffer.getLong(pos); + } + + public long getLong() { + return buffer.getLong(); + } + + public short getShort(int pos) { + return buffer.getShort(pos); + } + + public Buffer duplicate() { + return new Buffer(buffer.duplicate()); + } + + public CharBuffer decode(Charset charset) { + return charset.decode(buffer); + } + + public boolean hasRemaining() { + return buffer.hasRemaining(); + } + + public int write(WritableByteChannel channel) throws IOException { + return channel.write(buffer); + } + + public Buffer putInt(int i) { + buffer.putInt(i); + return this; + } + + public Buffer putLong(long l) { + buffer.putLong(l); + return this; + } + + @Override + public int hashCode() { + return buffer.hashCode(); + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (obj == this) { + return true; + } + if (obj instanceof Buffer) { + return buffer.equals(((Buffer) obj).buffer); + } + return false; + } + +} Property changes on: oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/Buffer.java ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveReader.java =================================================================== --- oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveReader.java (revision 1865091) +++ oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveReader.java (working copy) @@ -36,10 +36,11 @@ import com.microsoft.azure.storage.blob.CloudBlob; import com.microsoft.azure.storage.blob.CloudBlobDirectory; import com.microsoft.azure.storage.blob.CloudBlockBlob; + +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveEntry; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveReader; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; public class AzureSegmentArchiveReader implements SegmentArchiveReader { static final boolean OFF_HEAP = getBoolean("access.off.heap"); Index: oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java =================================================================== --- oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java (revision 1865091) +++ oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureSegmentArchiveWriter.java (working copy) @@ -34,12 +34,13 @@ import com.microsoft.azure.storage.StorageException; import com.microsoft.azure.storage.blob.CloudBlobDirectory; import com.microsoft.azure.storage.blob.CloudBlockBlob; + +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.azure.queue.SegmentWriteAction; import org.apache.jackrabbit.oak.segment.azure.queue.SegmentWriteQueue; import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitor; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveWriter; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; public class AzureSegmentArchiveWriter implements SegmentArchiveWriter { Index: oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureUtilities.java =================================================================== --- oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureUtilities.java (revision 1865091) +++ oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureUtilities.java (working copy) @@ -36,8 +36,8 @@ import com.microsoft.azure.storage.blob.CloudBlobContainer; import com.microsoft.azure.storage.blob.CloudBlobDirectory; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.spi.RepositoryNotReachableException; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/queue/SegmentWriteAction.java =================================================================== --- oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/queue/SegmentWriteAction.java (revision 1865091) +++ oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/queue/SegmentWriteAction.java (working copy) @@ -16,8 +16,8 @@ */ package org.apache.jackrabbit.oak.segment.azure.queue; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.azure.AzureSegmentArchiveEntry; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import java.io.IOException; import java.util.UUID; Index: oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/SegmentStoreMigrator.java =================================================================== --- oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/SegmentStoreMigrator.java (revision 1865091) +++ oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/SegmentStoreMigrator.java (working copy) @@ -22,6 +22,7 @@ import com.microsoft.azure.storage.StorageException; import com.microsoft.azure.storage.blob.CloudBlobDirectory; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.azure.AzurePersistence; import org.apache.jackrabbit.oak.segment.azure.tool.ToolUtils.SegmentStoreType; import org.apache.jackrabbit.oak.segment.file.tar.TarPersistence; @@ -28,7 +29,6 @@ import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitorAdapter; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitorAdapter; import org.apache.jackrabbit.oak.segment.spi.monitor.RemoteStoreMonitorAdapter; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.apache.jackrabbit.oak.segment.spi.persistence.GCJournalFile; import org.apache.jackrabbit.oak.segment.spi.persistence.JournalFileReader; import org.apache.jackrabbit.oak.segment.spi.persistence.JournalFileWriter; Index: oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java =================================================================== --- oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java (revision 1865091) +++ oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/tool/ToolUtils.java (working copy) @@ -37,6 +37,8 @@ import com.microsoft.azure.storage.StorageCredentialsAccountAndKey; import com.microsoft.azure.storage.StorageException; import com.microsoft.azure.storage.blob.CloudBlobDirectory; + +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.azure.AzurePersistence; import org.apache.jackrabbit.oak.segment.azure.AzureUtilities; import org.apache.jackrabbit.oak.segment.file.FileStore; @@ -48,7 +50,6 @@ import org.apache.jackrabbit.oak.segment.spi.monitor.RemoteStoreMonitorAdapter; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; /** * Utility class for common stuff pertaining to tooling. Index: oak-segment-azure/src/test/java/oak/apache/jackrabbit/oak/segment/azure/tool/SegmentCopyTestBase.java =================================================================== --- oak-segment-azure/src/test/java/oak/apache/jackrabbit/oak/segment/azure/tool/SegmentCopyTestBase.java (revision 1865091) +++ oak-segment-azure/src/test/java/oak/apache/jackrabbit/oak/segment/azure/tool/SegmentCopyTestBase.java (working copy) @@ -29,6 +29,7 @@ import java.util.Collections; import java.util.List; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.SegmentCache; import org.apache.jackrabbit.oak.segment.SegmentNodeStore; import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders; @@ -45,7 +46,6 @@ import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveReader; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; Index: oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureReadSegmentTest.java =================================================================== --- oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureReadSegmentTest.java (revision 1865091) +++ oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureReadSegmentTest.java (working copy) @@ -22,6 +22,7 @@ import com.microsoft.azure.storage.blob.CloudBlobContainer; import com.microsoft.azure.storage.blob.CloudBlobDirectory; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.SegmentId; import org.apache.jackrabbit.oak.segment.SegmentNotFoundException; import org.apache.jackrabbit.oak.segment.file.FileStore; @@ -31,7 +32,6 @@ import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitor; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; import org.apache.jackrabbit.oak.segment.spi.monitor.RemoteStoreMonitor; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveReader; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveWriter; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CheckpointCompactor.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CheckpointCompactor.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CheckpointCompactor.java (working copy) @@ -33,9 +33,9 @@ import java.util.Map; import java.util.Map.Entry; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.file.GCNodeWriteMonitor; import org.apache.jackrabbit.oak.segment.file.cancel.Canceller; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.gc.GCMonitor; import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Compactor.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Compactor.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Compactor.java (working copy) @@ -33,10 +33,10 @@ import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeBuilder; import org.apache.jackrabbit.oak.segment.file.GCNodeWriteMonitor; import org.apache.jackrabbit.oak.segment.file.cancel.Canceller; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateDiff; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/data/SegmentData.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/data/SegmentData.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/data/SegmentData.java (working copy) @@ -20,7 +20,7 @@ import java.io.IOException; import java.io.OutputStream; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; /** * Access the data of a segment. Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/data/SegmentDataLoader.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/data/SegmentDataLoader.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/data/SegmentDataLoader.java (working copy) @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.segment.data; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; class SegmentDataLoader { Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/data/SegmentDataRaw.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/data/SegmentDataRaw.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/data/SegmentDataRaw.java (working copy) @@ -20,7 +20,7 @@ import java.io.IOException; import java.io.OutputStream; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; class SegmentDataRaw implements SegmentData { Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/data/SegmentDataUtils.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/data/SegmentDataUtils.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/data/SegmentDataUtils.java (working copy) @@ -23,7 +23,7 @@ import java.nio.channels.WritableByteChannel; import org.apache.commons.io.HexDump; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; class SegmentDataUtils { Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/data/SegmentDataV12.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/data/SegmentDataV12.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/data/SegmentDataV12.java (working copy) @@ -20,8 +20,9 @@ import java.io.IOException; import java.io.OutputStream; +import org.apache.jackrabbit.oak.commons.Buffer; + import com.google.common.base.Charsets; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; class SegmentDataV12 implements SegmentData { Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/data/SegmentDataV13.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/data/SegmentDataV13.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/data/SegmentDataV13.java (working copy) @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.segment.data; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; class SegmentDataV13 extends SegmentDataV12 { Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java (working copy) @@ -64,11 +64,11 @@ import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState; import org.apache.jackrabbit.oak.segment.RecordWriters.RecordWriter; import org.apache.jackrabbit.oak.segment.WriteOperationHandler.WriteOperation; import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.state.DefaultNodeStateDiff; import org.apache.jackrabbit.oak.spi.state.NodeState; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/AbstractFileStore.java (working copy) @@ -30,6 +30,7 @@ import java.util.function.Consumer; import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.CachingSegmentReader; import org.apache.jackrabbit.oak.segment.RecordType; import org.apache.jackrabbit.oak.segment.Revisions; @@ -54,7 +55,6 @@ import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; import org.apache.jackrabbit.oak.segment.spi.monitor.RemoteStoreMonitor; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.stats.StatsOptions; import org.jetbrains.annotations.NotNull; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java (working copy) @@ -38,6 +38,8 @@ import com.google.common.base.Supplier; import com.google.common.io.Closer; import com.google.common.util.concurrent.UncheckedExecutionException; + +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.RecordId; import org.apache.jackrabbit.oak.segment.Segment; import org.apache.jackrabbit.oak.segment.SegmentId; @@ -53,7 +55,6 @@ import org.apache.jackrabbit.oak.segment.spi.persistence.RepositoryLock; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence; import org.apache.jackrabbit.oak.segment.spi.RepositoryNotReachableException; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.stats.CounterStats; import org.apache.jackrabbit.oak.stats.StatisticsProvider; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexLoader.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexLoader.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexLoader.java (working copy) @@ -19,7 +19,7 @@ import java.io.IOException; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.util.ReaderAtEnd; public class BinaryReferencesIndexLoader { Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexLoaderV1.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexLoaderV1.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexLoaderV1.java (working copy) @@ -26,7 +26,8 @@ import java.util.zip.CRC32; import com.google.common.base.Charsets; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; + +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.util.ReaderAtEnd; class BinaryReferencesIndexLoaderV1 { Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexLoaderV2.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexLoaderV2.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexLoaderV2.java (working copy) @@ -26,7 +26,8 @@ import java.util.zip.CRC32; import com.google.common.base.Charsets; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; + +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.util.ReaderAtEnd; class BinaryReferencesIndexLoaderV2 { Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexWriter.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexWriter.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexWriter.java (working copy) @@ -25,8 +25,9 @@ import java.util.UUID; import java.util.zip.CRC32; +import org.apache.jackrabbit.oak.commons.Buffer; + import com.google.common.base.Charsets; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; /** * Maintains the transient state of a binary references index, formats it and Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/FileAccess.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/FileAccess.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/FileAccess.java (working copy) @@ -26,7 +26,7 @@ import java.io.RandomAccessFile; import java.nio.channels.FileChannel; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; /** * A wrapper around either memory mapped files or random access files, to allow Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GraphLoader.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GraphLoader.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GraphLoader.java (working copy) @@ -28,7 +28,7 @@ import java.util.UUID; import java.util.zip.CRC32; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.util.ReaderAtEnd; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexEntryV1.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexEntryV1.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexEntryV1.java (working copy) @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.segment.file.tar.index; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; class IndexEntryV1 implements IndexEntry { Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexEntryV2.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexEntryV2.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexEntryV2.java (working copy) @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.segment.file.tar.index; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; class IndexEntryV2 implements IndexEntry { Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoaderV1.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoaderV1.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoaderV1.java (working copy) @@ -17,12 +17,12 @@ package org.apache.jackrabbit.oak.segment.file.tar.index; -import static org.apache.jackrabbit.oak.segment.spi.persistence.Buffer.wrap; +import static org.apache.jackrabbit.oak.commons.Buffer.wrap; import java.io.IOException; import java.util.zip.CRC32; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.util.ReaderAtEnd; class IndexLoaderV1 { Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoaderV2.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoaderV2.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoaderV2.java (working copy) @@ -17,12 +17,12 @@ package org.apache.jackrabbit.oak.segment.file.tar.index; -import static org.apache.jackrabbit.oak.segment.spi.persistence.Buffer.wrap; +import static org.apache.jackrabbit.oak.commons.Buffer.wrap; import java.io.IOException; import java.util.zip.CRC32; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.util.ReaderAtEnd; class IndexLoaderV2 { Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV1.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV1.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV1.java (working copy) @@ -23,7 +23,7 @@ import java.util.Set; import java.util.UUID; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; class IndexV1 implements Index { Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV2.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV2.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV2.java (working copy) @@ -23,7 +23,7 @@ import java.util.Set; import java.util.UUID; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; class IndexV2 implements Index { Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexWriter.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexWriter.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexWriter.java (working copy) @@ -23,7 +23,7 @@ import java.util.List; import java.util.zip.CRC32; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; /** * Builds an index incrementally in memory, and serializes its contents into a Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarManager.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarManager.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarManager.java (working copy) @@ -19,8 +19,8 @@ package org.apache.jackrabbit.oak.segment.file.tar; import static com.google.common.base.Charsets.UTF_8; +import static org.apache.jackrabbit.oak.commons.Buffer.wrap; import static org.apache.jackrabbit.oak.segment.file.tar.TarConstants.BLOCK_SIZE; -import static org.apache.jackrabbit.oak.segment.spi.persistence.Buffer.wrap; import java.io.File; import java.io.IOException; @@ -35,10 +35,10 @@ import java.util.zip.CRC32; import org.apache.commons.io.filefilter.SuffixFileFilter; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.file.tar.index.Index; import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitor; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveReader; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveWriter; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarReader.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarReader.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarReader.java (working copy) @@ -30,6 +30,8 @@ import java.util.concurrent.TimeUnit; import com.google.common.base.Stopwatch; + +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.file.tar.binaries.BinaryReferencesIndexLoader; import org.apache.jackrabbit.oak.segment.file.tar.binaries.InvalidBinaryReferencesIndexException; import org.apache.jackrabbit.oak.segment.file.tar.index.Index; @@ -39,7 +41,6 @@ import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveEntry; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveReader; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.apache.jackrabbit.oak.segment.util.ReaderAtEnd; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarWriter.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarWriter.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/SegmentTarWriter.java (working copy) @@ -35,6 +35,8 @@ import java.util.zip.CRC32; import com.google.common.base.Stopwatch; + +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.file.tar.index.IndexEntry; import org.apache.jackrabbit.oak.segment.file.tar.index.IndexWriter; import org.apache.jackrabbit.oak.segment.file.tar.index.SimpleIndexEntry; @@ -41,7 +43,6 @@ import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitor; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitor; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveWriter; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java (working copy) @@ -48,6 +48,8 @@ import com.google.common.base.Predicate; import com.google.common.collect.Iterables; + +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.file.FileReaper; import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitor; import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitorAdapter; @@ -55,7 +57,6 @@ import org.apache.jackrabbit.oak.segment.spi.monitor.RemoteStoreMonitor; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentNodeStorePersistence; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.apache.jackrabbit.oak.stats.CounterStats; import org.apache.jackrabbit.oak.stats.NoopStats; import org.jetbrains.annotations.NotNull; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java (working copy) @@ -41,6 +41,8 @@ import java.util.stream.Collectors; import com.google.common.base.Predicate; + +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.file.tar.binaries.BinaryReferencesIndex; import org.apache.jackrabbit.oak.segment.file.tar.binaries.BinaryReferencesIndexLoader; import org.apache.jackrabbit.oak.segment.file.tar.binaries.InvalidBinaryReferencesIndexException; @@ -48,7 +50,6 @@ import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveEntry; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveReader; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java (working copy) @@ -37,8 +37,8 @@ import java.util.UUID; import java.util.zip.CRC32; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.file.tar.binaries.BinaryReferencesIndexWriter; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveWriter; import org.apache.jackrabbit.oak.stats.CounterStats; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java (working copy) @@ -25,6 +25,8 @@ import java.util.concurrent.ConcurrentMap; import com.google.common.collect.Maps; + +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.CachingSegmentReader; import org.apache.jackrabbit.oak.segment.Revisions; import org.apache.jackrabbit.oak.segment.Segment; @@ -36,7 +38,6 @@ import org.apache.jackrabbit.oak.segment.SegmentStore; import org.apache.jackrabbit.oak.segment.SegmentTracker; import org.apache.jackrabbit.oak.segment.SegmentWriter; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.stats.NoopStats; import org.jetbrains.annotations.NotNull; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordId.java (working copy) @@ -26,7 +26,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; import org.jetbrains.annotations.NotNull; /** Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java (working copy) @@ -46,6 +46,7 @@ import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.commons.StringUtils; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; import org.apache.jackrabbit.oak.segment.RecordNumbers.Entry; @@ -53,7 +54,6 @@ import org.apache.jackrabbit.oak.segment.data.SegmentData; import org.apache.jackrabbit.oak.segment.data.StringData; import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferMonitor.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferMonitor.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferMonitor.java (working copy) @@ -25,7 +25,7 @@ import java.lang.ref.WeakReference; import java.util.Set; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.stats.CounterStats; import org.apache.jackrabbit.oak.stats.StatisticsProvider; import org.jetbrains.annotations.NotNull; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java (working copy) @@ -44,9 +44,9 @@ import com.google.common.base.Suppliers; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState; import org.apache.jackrabbit.oak.plugins.memory.MemoryChildNodeEntry; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.state.AbstractNodeState; import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java (working copy) @@ -29,7 +29,8 @@ import com.google.common.base.Charsets; import com.google.common.io.ByteStreams; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; + +import org.apache.jackrabbit.oak.commons.Buffer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentWriter.java (working copy) @@ -21,7 +21,7 @@ import java.io.InputStream; import org.apache.jackrabbit.oak.api.Blob; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/Buffer.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/Buffer.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/Buffer.java (nonexistent) @@ -1,255 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.jackrabbit.oak.segment.spi.persistence; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.CharBuffer; -import java.nio.channels.FileChannel; -import java.nio.channels.FileChannel.MapMode; -import java.nio.channels.WritableByteChannel; -import java.nio.charset.Charset; -import java.util.zip.CRC32; - -/** - * This is a wrapper around {@link ByteBuffer}. It maintains the same semantics - * and mechanisms of the {@link ByteBuffer}. - *

- * Java 9 introduced API changes to some methods in {@link ByteBuffer}. Instead - * of returning instances of {@link java.nio.Buffer Buffer}, those methods were - * rewritten to return instances of {@link ByteBuffer} instead. While this is - * perfectly fine at compile time, running "modern" code on Java 8 and earlier - * throws {@link NoSuchMethodError}. In order to prevent occurrences of this - * exceptions in the future, {@link Buffer} is used consistently in place of - * {@link ByteBuffer}. Since it is not possible to directly convert a {@link - * Buffer} into a {@link ByteBuffer} and the other way around, {@link Buffer} - * makes it less likely to develop dangerous code in the future. - */ -final public class Buffer { - - private final ByteBuffer buffer; - - private Buffer(ByteBuffer buffer) { - this.buffer = buffer; - } - - public static Buffer map(FileChannel channel, MapMode mode, long position, long size) throws IOException { - return new Buffer(channel.map(mode, position, size)); - } - - public static Buffer wrap(byte[] buffer) { - return new Buffer(ByteBuffer.wrap(buffer)); - } - - public static Buffer wrap(byte[] buffer, int pos, int len) { - return new Buffer(ByteBuffer.wrap(buffer, pos, len)); - } - - public static Buffer allocate(int cap) { - return new Buffer(ByteBuffer.allocate(cap)); - } - - public static Buffer allocateDirect(int cap) { - return new Buffer(ByteBuffer.allocateDirect(cap)); - } - - public int remaining() { - return buffer.remaining(); - } - - public Buffer asReadOnlyBuffer() { - return new Buffer(buffer.asReadOnlyBuffer()); - } - - public Buffer position(int pos) { - ((java.nio.Buffer) buffer).position(pos); - return this; - } - - public int position() { - return buffer.position(); - } - - public Buffer limit(int lim) { - ((java.nio.Buffer) buffer).limit(lim); - return this; - } - - public int limit() { - return buffer.limit(); - } - - public Buffer slice() { - return new Buffer(buffer.slice()); - } - - public int readFully(FileChannel channel, int position) throws IOException { - int result = 0; - while (buffer.remaining() > 0) { - int count = channel.read(buffer, position); - if (count < 0) { - break; - } - result += count; - position += count; - } - return result; - } - - public Buffer flip() { - ((java.nio.Buffer) buffer).flip(); - return this; - } - - public int getInt() { - return buffer.getInt(); - } - - public int getInt(int pos) { - return buffer.getInt(pos); - } - - public Buffer mark() { - ((java.nio.Buffer) buffer).mark(); - return this; - } - - public Buffer get(byte[] b) { - buffer.get(b); - return this; - } - - public Buffer get(byte[] b, int pos, int len) { - buffer.get(b, pos, len); - return this; - } - - public byte get(int pos) { - return buffer.get(pos); - } - - public byte get() { - return buffer.get(); - } - - public Buffer reset() { - ((java.nio.Buffer) buffer).reset(); - return this; - } - - public void update(CRC32 checksum) { - checksum.update(buffer); - } - - public byte[] array() { - return buffer.array(); - } - - public int capacity() { - return buffer.capacity(); - } - - public boolean isDirect() { - return buffer.isDirect(); - } - - public Buffer put(byte[] b) { - buffer.put(b); - return this; - } - - public Buffer put(byte[] buf, int pos, int len) { - buffer.put(buf, pos, len); - return this; - } - - public Buffer put(byte b) { - buffer.put(b); - return this; - } - - public Buffer put(Buffer b) { - buffer.put(b.buffer); - return this; - } - - public Buffer rewind() { - ((java.nio.Buffer) buffer).rewind(); - return this; - } - - public long getLong(int pos) { - return buffer.getLong(pos); - } - - public long getLong() { - return buffer.getLong(); - } - - public short getShort(int pos) { - return buffer.getShort(pos); - } - - public Buffer duplicate() { - return new Buffer(buffer.duplicate()); - } - - public CharBuffer decode(Charset charset) { - return charset.decode(buffer); - } - - public boolean hasRemaining() { - return buffer.hasRemaining(); - } - - public int write(WritableByteChannel channel) throws IOException { - return channel.write(buffer); - } - - public Buffer putInt(int i) { - buffer.putInt(i); - return this; - } - - public Buffer putLong(long l) { - buffer.putLong(l); - return this; - } - - @Override - public int hashCode() { - return buffer.hashCode(); - } - - @Override - public boolean equals(Object obj) { - if (obj == null) { - return false; - } - if (obj == this) { - return true; - } - if (obj instanceof Buffer) { - return buffer.equals(((Buffer) obj).buffer); - } - return false; - } - -} Property changes on: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/Buffer.java ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveReader.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveReader.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveReader.java (working copy) @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.List; +import org.apache.jackrabbit.oak.commons.Buffer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveWriter.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveWriter.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/SegmentArchiveWriter.java (working copy) @@ -20,6 +20,7 @@ import java.io.IOException; +import org.apache.jackrabbit.oak.commons.Buffer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/split/UnclosedSegmentArchiveReader.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/split/UnclosedSegmentArchiveReader.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/split/UnclosedSegmentArchiveReader.java (working copy) @@ -19,10 +19,10 @@ import java.io.IOException; import java.util.List; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.file.tar.binaries.BinaryReferencesIndexWriter; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveEntry; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveReader; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; Index: oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/util/ReaderAtEnd.java =================================================================== --- oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/util/ReaderAtEnd.java (revision 1865091) +++ oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/util/ReaderAtEnd.java (working copy) @@ -19,7 +19,7 @@ import java.io.IOException; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; /** * Read raw data from the end of an underlying data source. The data source is Index: oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CacheWeightEstimator.java =================================================================== --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CacheWeightEstimator.java (revision 1865091) +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CacheWeightEstimator.java (working copy) @@ -32,11 +32,11 @@ import org.apache.commons.lang.RandomStringUtils; import org.apache.jackrabbit.oak.cache.AbstractCacheStats; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.commons.StringUtils; import org.apache.jackrabbit.oak.segment.CacheWeights.StringCacheWeigher; import org.apache.jackrabbit.oak.segment.file.PriorityCache; import org.apache.jackrabbit.oak.segment.memory.MemoryStore; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.junit.Before; import org.junit.Test; Index: oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactorTest.java =================================================================== --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactorTest.java (revision 1865091) +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/CompactorTest.java (working copy) @@ -37,11 +37,11 @@ import org.apache.jackrabbit.oak.api.Blob; import org.apache.jackrabbit.oak.api.CommitFailedException; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.file.FileStore; import org.apache.jackrabbit.oak.segment.file.GCNodeWriteMonitor; import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException; import org.apache.jackrabbit.oak.segment.file.cancel.Canceller; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.EmptyHook; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; Index: oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexLoaderTest.java =================================================================== --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexLoaderTest.java (revision 1865091) +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexLoaderTest.java (working copy) @@ -28,7 +28,8 @@ import java.util.zip.CRC32; import com.google.common.base.Charsets; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; + +import org.apache.jackrabbit.oak.commons.Buffer; import org.junit.Test; public class BinaryReferencesIndexLoaderTest { Index: oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexLoaderV1Test.java =================================================================== --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexLoaderV1Test.java (revision 1865091) +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexLoaderV1Test.java (working copy) @@ -27,7 +27,8 @@ import java.util.zip.CRC32; import com.google.common.base.Charsets; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; + +import org.apache.jackrabbit.oak.commons.Buffer; import org.junit.Test; public class BinaryReferencesIndexLoaderV1Test { Index: oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexLoaderV2Test.java =================================================================== --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexLoaderV2Test.java (revision 1865091) +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexLoaderV2Test.java (working copy) @@ -27,7 +27,8 @@ import java.util.zip.CRC32; import com.google.common.base.Charsets; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; + +import org.apache.jackrabbit.oak.commons.Buffer; import org.junit.Test; public class BinaryReferencesIndexLoaderV2Test { Index: oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexWriterTest.java =================================================================== --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexWriterTest.java (revision 1865091) +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/binaries/BinaryReferencesIndexWriterTest.java (working copy) @@ -29,7 +29,7 @@ import java.util.Set; import java.util.UUID; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; import org.junit.Test; public class BinaryReferencesIndexWriterTest { Index: oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoaderTest.java =================================================================== --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoaderTest.java (revision 1865091) +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoaderTest.java (working copy) @@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; import org.junit.Test; public class IndexLoaderTest { Index: oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoaderV1Test.java =================================================================== --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoaderV1Test.java (revision 1865091) +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoaderV1Test.java (working copy) @@ -22,7 +22,7 @@ import java.util.zip.CRC32; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; import org.junit.Test; public class IndexLoaderV1Test { Index: oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoaderV2Test.java =================================================================== --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoaderV2Test.java (revision 1865091) +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexLoaderV2Test.java (working copy) @@ -22,7 +22,7 @@ import java.util.zip.CRC32; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; import org.junit.Test; public class IndexLoaderV2Test { Index: oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV1Test.java =================================================================== --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV1Test.java (revision 1865091) +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV1Test.java (working copy) @@ -23,7 +23,7 @@ import java.util.Set; import java.util.UUID; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; import org.junit.Test; public class IndexV1Test { Index: oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV2Test.java =================================================================== --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV2Test.java (revision 1865091) +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/index/IndexV2Test.java (working copy) @@ -23,7 +23,7 @@ import java.util.Set; import java.util.UUID; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; import org.junit.Test; public class IndexV2Test { Index: oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFilesTest.java =================================================================== --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFilesTest.java (revision 1865091) +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFilesTest.java (working copy) @@ -40,11 +40,11 @@ import java.util.Set; import java.util.UUID; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.file.tar.TarFiles.CleanupResult; import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitorAdapter; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitorAdapter; import org.apache.jackrabbit.oak.segment.spi.monitor.RemoteStoreMonitorAdapter; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.junit.After; import org.junit.Before; import org.junit.Rule; Index: oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFileTest.java =================================================================== --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFileTest.java (revision 1865091) +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFileTest.java (working copy) @@ -35,9 +35,9 @@ import java.util.Set; import java.util.UUID; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.spi.monitor.FileStoreMonitorAdapter; import org.apache.jackrabbit.oak.segment.spi.monitor.IOMonitorAdapter; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveEntry; import org.apache.jackrabbit.oak.segment.spi.persistence.SegmentArchiveManager; import org.junit.Before; Index: oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/NodeRecordTest.java =================================================================== --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/NodeRecordTest.java (revision 1865091) +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/NodeRecordTest.java (working copy) @@ -25,11 +25,12 @@ import static org.junit.Assert.assertNotNull; import com.google.common.base.Supplier; + +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState; import org.apache.jackrabbit.oak.segment.file.FileStore; import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder; import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.jetbrains.annotations.NotNull; import org.junit.Rule; import org.junit.Test; Index: oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferMonitorTest.java =================================================================== --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferMonitorTest.java (revision 1865091) +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferMonitorTest.java (working copy) @@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.jackrabbit.api.stats.RepositoryStatistics; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.stats.CounterStats; import org.apache.jackrabbit.oak.stats.HistogramStats; import org.apache.jackrabbit.oak.stats.MeterStats; Index: oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTestUtils.java =================================================================== --- oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTestUtils.java (revision 1865091) +++ oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/StandbyTestUtils.java (working copy) @@ -25,6 +25,8 @@ import com.google.common.hash.Hashing; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; + +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.segment.RecordId; import org.apache.jackrabbit.oak.segment.Segment; import org.apache.jackrabbit.oak.segment.SegmentId; @@ -31,7 +33,6 @@ import org.apache.jackrabbit.oak.segment.SegmentIdProvider; import org.apache.jackrabbit.oak.segment.SegmentReader; import org.apache.jackrabbit.oak.segment.SegmentStore; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; public class StandbyTestUtils { Index: oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/PersistingDiff.java =================================================================== --- oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/PersistingDiff.java (revision 1865091) +++ oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/PersistingDiff.java (working copy) @@ -27,6 +27,7 @@ import com.google.common.collect.Lists; import org.apache.jackrabbit.oak.api.PropertyState; +import org.apache.jackrabbit.oak.commons.Buffer; import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeBuilder; import org.apache.jackrabbit.oak.segment.RecordId; import org.apache.jackrabbit.oak.segment.SegmentNodeState; @@ -33,7 +34,6 @@ import org.apache.jackrabbit.oak.segment.SegmentReader; import org.apache.jackrabbit.oak.segment.SegmentWriter; import org.apache.jackrabbit.oak.segment.file.FileStore; -import org.apache.jackrabbit.oak.segment.spi.persistence.Buffer; import org.apache.jackrabbit.oak.spi.blob.BlobStore; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;