You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by da...@apache.org on 2025/01/16 10:54:20 UTC
(jackrabbit-oak) branch OAK-11398 created (now 3081672b8b)
This is an automated email from the ASF dual-hosted git repository.
daim pushed a change to branch OAK-11398
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at 3081672b8b OAK-11398 : removed usage of Guava's Preconditions.checkPositionIndexes
This branch includes the following new commits:
new 3081672b8b OAK-11398 : removed usage of Guava's Preconditions.checkPositionIndexes
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(jackrabbit-oak) 01/01: OAK-11398 : removed usage of Guava's Preconditions.checkPositionIndexes
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
daim pushed a commit to branch OAK-11398
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 3081672b8b644275531fdeca46a71bcf73a5fd11
Author: Rishabh Kumar <di...@adobe.com>
AuthorDate: Thu Jan 16 16:24:05 2025 +0530
OAK-11398 : removed usage of Guava's Preconditions.checkPositionIndexes
---
.../oak/plugins/index/lucene/directory/OakBufferedIndexFile.java | 4 ++--
.../oak/plugins/index/lucene/directory/OakStreamingIndexFile.java | 4 ++--
.../src/main/java/org/apache/jackrabbit/oak/segment/BlockRecord.java | 4 ++--
.../java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java | 4 ++--
.../src/main/java/org/apache/jackrabbit/oak/segment/ListRecord.java | 4 ++--
.../main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java | 4 ++--
.../java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java | 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java
index dafdcf61fe..17df1ce82d 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java
@@ -34,9 +34,9 @@ import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.lucene.store.DataInput;
import org.jetbrains.annotations.NotNull;
+import static java.util.Objects.checkFromToIndex;
import static java.util.Objects.checkIndex;
import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
import static org.apache.jackrabbit.JcrConstants.JCR_DATA;
import static org.apache.jackrabbit.JcrConstants.JCR_LASTMODIFIED;
import static org.apache.jackrabbit.oak.api.Type.BINARIES;
@@ -237,7 +237,7 @@ class OakBufferedIndexFile implements OakIndexFile {
@Override
public void readBytes(byte[] b, int offset, int len)
throws IOException {
- checkPositionIndexes(offset, offset + len, requireNonNull(b).length);
+ checkFromToIndex(offset, offset + len, requireNonNull(b).length);
if (len < 0 || position + len > length) {
String msg = String.format("Invalid byte range request for [%s][%s], " +
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java
index 719585052e..8874b88c28 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java
@@ -33,7 +33,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
+import static java.util.Objects.checkFromToIndex;
import static org.apache.jackrabbit.JcrConstants.JCR_DATA;
import static org.apache.jackrabbit.JcrConstants.JCR_LASTMODIFIED;
import static org.apache.jackrabbit.oak.api.Type.BINARY;
@@ -222,7 +222,7 @@ class OakStreamingIndexFile implements OakIndexFile, AutoCloseable {
@Override
public void readBytes(byte[] b, int offset, int len)
throws IOException {
- checkPositionIndexes(offset, offset + len, requireNonNull(b).length);
+ checkFromToIndex(offset, offset + len, requireNonNull(b).length);
if (len < 0 || position + len > length) {
String msg = String.format("Invalid byte range request for [%s][%s], " +
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BlockRecord.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BlockRecord.java
index 43f7dcd3d1..e02ff87b0e 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BlockRecord.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BlockRecord.java
@@ -18,9 +18,9 @@
*/
package org.apache.jackrabbit.oak.segment;
+import static java.util.Objects.checkFromToIndex;
import static java.util.Objects.checkIndex;
import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
/**
* A record of type "BLOCK".
@@ -48,7 +48,7 @@ class BlockRecord extends Record {
public int read(int position, byte[] buffer, int offset, int length) {
checkIndex(position, size);
requireNonNull(buffer);
- checkPositionIndexes(offset, offset + length, buffer.length);
+ checkFromToIndex(offset, offset + length, buffer.length);
if (position + length > size) {
length = size - position;
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
index 937b72c549..395a992486 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
@@ -23,12 +23,12 @@ import static java.lang.Math.min;
import static java.util.Arrays.asList;
import static java.util.Collections.emptyMap;
import static java.util.Collections.nCopies;
+import static java.util.Objects.checkFromToIndex;
import static java.util.Objects.checkIndex;
import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.oak.commons.conditions.Validate.checkArgument;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndex;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
import static org.apache.jackrabbit.guava.common.collect.Iterables.addAll;
import static org.apache.jackrabbit.guava.common.io.ByteStreams.read;
import static org.apache.jackrabbit.oak.api.Type.BINARIES;
@@ -619,7 +619,7 @@ public class DefaultSegmentWriter implements SegmentWriter {
private RecordId writeBlock(@NotNull byte[] bytes, int offset, int length)
throws IOException {
requireNonNull(bytes);
- checkPositionIndexes(offset, offset + length, bytes.length);
+ checkFromToIndex(offset, offset + length, bytes.length);
return writeOperationHandler.execute(gcGeneration, newWriteOperation(
RecordWriters.newBlockWriter(bytes, offset, length)));
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ListRecord.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ListRecord.java
index 44adeebf7a..66108eabbd 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ListRecord.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ListRecord.java
@@ -18,9 +18,9 @@
*/
package org.apache.jackrabbit.oak.segment;
+import static java.util.Objects.checkFromToIndex;
import static java.util.Objects.checkIndex;
import static org.apache.jackrabbit.oak.commons.conditions.Validate.checkArgument;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
@@ -95,7 +95,7 @@ class ListRecord extends Record {
}
private void getEntries(int index, int count, List<RecordId> ids) {
- checkPositionIndexes(index, index + count, size);
+ checkFromToIndex(index, index + count, size);
Segment segment = getSegment();
if (size == 1) {
ids.add(getRecordId());
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java
index 1298e2edb5..29d588d51c 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentStream.java
@@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.oak.commons.conditions.Validate.checkArgument;
import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
+import static java.util.Objects.checkFromToIndex;
import java.io.IOException;
import java.io.InputStream;
@@ -140,7 +140,7 @@ public class SegmentStream extends InputStream {
@Override
public int read(@NotNull byte[] b, int off, int len) {
requireNonNull(b);
- checkPositionIndexes(off, off + len, b.length);
+ checkFromToIndex(off, off + len, b.length);
if (len == 0) {
return 0;
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java
index 87a3693875..750b7ec2ee 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java
@@ -18,8 +18,8 @@
*/
package org.apache.jackrabbit.oak.segment.file.tar;
+import static java.util.Objects.checkFromToIndex;
import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
import static java.lang.String.format;
import static org.apache.jackrabbit.oak.segment.file.tar.TarConstants.FILE_NAME_FORMAT;
@@ -144,7 +144,7 @@ class TarWriter implements Closeable {
long writeEntry(long msb, long lsb, byte[] data, int offset, int size, GCGeneration generation) throws IOException {
requireNonNull(data);
- checkPositionIndexes(offset, offset + size, data.length);
+ checkFromToIndex(offset, offset + size, data.length);
synchronized (this) {
Validate.checkState(!closed);