Skip to content

Commit 56dd62a

Browse files
committed
OAK-11359: Remove usage of Guava Ints.checkedCast
1 parent c15d389 commit 56dd62a

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.List;
2525

2626
import org.apache.jackrabbit.guava.common.io.ByteStreams;
27-
import org.apache.jackrabbit.guava.common.primitives.Ints;
2827
import org.apache.jackrabbit.oak.api.Blob;
2928
import org.apache.jackrabbit.oak.api.PropertyState;
3029
import org.apache.jackrabbit.oak.api.Type;
@@ -312,7 +311,7 @@ public void copyBytes(DataInput input, long numBytes) throws IOException {
312311

313312
private static int determineBlobSize(NodeBuilder file){
314313
if (file.hasProperty(OakDirectory.PROP_BLOB_SIZE)){
315-
return Ints.checkedCast(file.getProperty(OakDirectory.PROP_BLOB_SIZE).getValue(Type.LONG));
314+
return Math.toIntExact(file.getProperty(OakDirectory.PROP_BLOB_SIZE).getValue(Type.LONG));
316315
}
317316
return DEFAULT_BLOB_SIZE;
318317
}

oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/invalidData/InvalidIndexDefinitionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public void invalidQueryFilterRegex() throws CommitFailedException {
121121
root.commit();
122122
}
123123

124-
@Test(expected = IllegalArgumentException.class)
124+
@Test(expected = RuntimeException.class)
125125
public void invalidBlobSize() throws CommitFailedException {
126126
Tree def = createIndexNodeAndData();
127127
// 1L + Integer.MAX_VALUE results in IllegalArgumentException: Out of range: 2147483648
@@ -140,7 +140,7 @@ public void negativeBlobSize() throws CommitFailedException {
140140
assertQuery(query, List.of("/tmp/testNode"));
141141
}
142142

143-
@Test(expected = IllegalArgumentException.class)
143+
@Test(expected = RuntimeException.class)
144144
public void invalidMaxFieldLength() throws CommitFailedException {
145145
Tree def = createIndexNodeAndData();
146146
// 1L + Integer.MAX_VALUE results in IllegalArgumentException: Out of range: 2147483648

oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
2019
package org.apache.jackrabbit.oak.plugins.index.search;
2120

2221
import org.apache.jackrabbit.JcrConstants;
2322
import org.apache.jackrabbit.guava.common.collect.Iterables;
24-
import org.apache.jackrabbit.guava.common.primitives.Ints;
2523
import org.apache.jackrabbit.oak.api.IllegalRepositoryStateException;
2624
import org.apache.jackrabbit.oak.api.PropertyState;
2725
import org.apache.jackrabbit.oak.api.Root;
@@ -1892,7 +1890,7 @@ private static IndexFormatVersion determineVersionForFreshIndex(PropertyState fu
18921890
}
18931891

18941892
private static IndexFormatVersion versionFrom(PropertyState ps) {
1895-
return IndexFormatVersion.getVersion(Ints.checkedCast(ps.getValue(Type.LONG)));
1893+
return IndexFormatVersion.getVersion(Math.toIntExact(ps.getValue(Type.LONG)));
18961894
}
18971895

18981896
private static boolean hasIndexingRules(NodeState defn) {

oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/ConfigUtil.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
2019
package org.apache.jackrabbit.oak.plugins.index.search.util;
2120

2221
import java.util.Collections;
2322

2423
import org.apache.jackrabbit.guava.common.collect.Iterables;
25-
import org.apache.jackrabbit.guava.common.primitives.Ints;
2624
import org.apache.jackrabbit.JcrConstants;
2725
import org.apache.jackrabbit.oak.api.Blob;
2826
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -51,7 +49,7 @@ public static boolean getOptionalValue(NodeState definition, String propName, bo
5149
public static int getOptionalValue(NodeState definition, String propName, int defaultVal) {
5250
try {
5351
PropertyState ps = definition.getProperty(propName);
54-
return ps == null ? defaultVal : Ints.checkedCast(ps.getValue(Type.LONG));
52+
return ps == null ? defaultVal : Math.toIntExact(ps.getValue(Type.LONG));
5553
} catch (IllegalStateException e) {
5654
throw new IllegalStateException(String.format(ILLEGAL_STATE_EXCEPTION_ERROR_MESSAGE, propName), e);
5755
}

0 commit comments

Comments
 (0)