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 kw...@apache.org on 2022/07/18 11:36:51 UTC
[jackrabbit-oak] 01/01: OAK-9844: Fix invalid nullness annotations on primitives
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch bugfix/fix-nullness-annotations-on-primitives
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 1eaabf5fc6173e4734d826532f8fe659c6f556bd
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Jul 18 13:36:44 2022 +0200
OAK-9844: Fix invalid nullness annotations on primitives
---
.../org/apache/jackrabbit/oak/segment/ImmutableRecordNumbers.java | 8 +++-----
.../src/main/java/org/apache/jackrabbit/oak/segment/Segment.java | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbers.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbers.java
index 574f1db7ae..b12de05d18 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbers.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbers.java
@@ -31,11 +31,9 @@ import org.jetbrains.annotations.NotNull;
*/
class ImmutableRecordNumbers implements RecordNumbers {
- @NotNull
- private final int[] offsets;
+ private final int @NotNull [] offsets;
- @NotNull
- private final byte[] type;
+ private final byte @NotNull [] type;
/**
* Create a new instance based on arrays for the offsets and types.
@@ -46,7 +44,7 @@ class ImmutableRecordNumbers implements RecordNumbers {
* @param offsets Offsets per position. -1 if not mapped.
* @param type Types per position. Not defined if not mapped.
*/
- public ImmutableRecordNumbers(@NotNull int[] offsets, @NotNull byte[] type) {
+ public ImmutableRecordNumbers(int @NotNull [] offsets, byte @NotNull [] type) {
this.offsets = offsets;
this.type = type;
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
index 7950025ec6..05377be74a 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
@@ -170,7 +170,7 @@ public class Segment {
Segment(
@NotNull SegmentId id,
@NotNull SegmentReader reader,
- @NotNull byte[] buffer,
+ byte @NotNull [] buffer,
@NotNull RecordNumbers recordNumbers,
@NotNull SegmentReferences segmentReferences,
@NotNull String info