From 3236d38c8b71a337698d46da5f94213e20b2bbae Mon Sep 17 00:00:00 2001 From: Julie Tibshirani Date: Tue, 14 Apr 2020 00:23:12 -0700 Subject: [PATCH] Avoid using a raw Arc type. (#1429) This fixes some compiler warnings that popped up recently. --- .../src/java/org/apache/lucene/util/fst/FST.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/FST.java b/lucene/core/src/java/org/apache/lucene/util/fst/FST.java index dca727572d2..260e9dab1ae 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/FST.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/FST.java @@ -334,7 +334,7 @@ public final class FST implements Accountable { static class BitTable { /** See {@link BitTableUtil#isBitSet(int, FST.BytesReader)}. */ - static boolean isBitSet(int bitIndex, Arc arc, FST.BytesReader in) throws IOException { + static boolean isBitSet(int bitIndex, Arc arc, FST.BytesReader in) throws IOException { assert arc.nodeFlags() == ARCS_FOR_DIRECT_ADDRESSING; in.setPosition(arc.bitTableStart); return BitTableUtil.isBitSet(bitIndex, in); @@ -344,28 +344,28 @@ public final class FST implements Accountable { * See {@link BitTableUtil#countBits(int, FST.BytesReader)}. * The count of bit set is the number of arcs of a direct addressing node. */ - static int countBits(Arc arc, FST.BytesReader in) throws IOException { + static int countBits(Arc arc, FST.BytesReader in) throws IOException { assert arc.nodeFlags() == ARCS_FOR_DIRECT_ADDRESSING; in.setPosition(arc.bitTableStart); return BitTableUtil.countBits(getNumPresenceBytes(arc.numArcs()), in); } /** See {@link BitTableUtil#countBitsUpTo(int, FST.BytesReader)}. */ - static int countBitsUpTo(int bitIndex, Arc arc, FST.BytesReader in) throws IOException { + static int countBitsUpTo(int bitIndex, Arc arc, FST.BytesReader in) throws IOException { assert arc.nodeFlags() == ARCS_FOR_DIRECT_ADDRESSING; in.setPosition(arc.bitTableStart); return BitTableUtil.countBitsUpTo(bitIndex, in); } /** See {@link BitTableUtil#nextBitSet(int, int, FST.BytesReader)}. */ - static int nextBitSet(int bitIndex, Arc arc, FST.BytesReader in) throws IOException { + static int nextBitSet(int bitIndex, Arc arc, FST.BytesReader in) throws IOException { assert arc.nodeFlags() == ARCS_FOR_DIRECT_ADDRESSING; in.setPosition(arc.bitTableStart); return BitTableUtil.nextBitSet(bitIndex, getNumPresenceBytes(arc.numArcs()), in); } /** See {@link BitTableUtil#previousBitSet(int, FST.BytesReader)}. */ - static int previousBitSet(int bitIndex, Arc arc, FST.BytesReader in) throws IOException { + static int previousBitSet(int bitIndex, Arc arc, FST.BytesReader in) throws IOException { assert arc.nodeFlags() == ARCS_FOR_DIRECT_ADDRESSING; in.setPosition(arc.bitTableStart); return BitTableUtil.previousBitSet(bitIndex, in); @@ -374,7 +374,7 @@ public final class FST implements Accountable { /** * Asserts the bit-table of the provided {@link Arc} is valid. */ - static boolean assertIsValid(Arc arc, FST.BytesReader in) throws IOException { + static boolean assertIsValid(Arc arc, FST.BytesReader in) throws IOException { assert arc.bytesPerArc() > 0; assert arc.nodeFlags() == ARCS_FOR_DIRECT_ADDRESSING; // First bit must be set.