From 1cc1d124327fca6a638aac8656873336b64fee5a Mon Sep 17 00:00:00 2001 From: Chris Hegarty <62058229+ChrisHegarty@users.noreply.github.com> Date: Wed, 31 May 2023 22:16:10 +0100 Subject: [PATCH] Fix lossy-conversions lint warnings (#96398) JDK 20 added a new javac lint warning for possible lossy conversion in compound assignments - because of implicit type casts, e.g. warning: [lossy-conversions] implicit cast from int to byte in compound assignment is possibly lossy The change resolves all such warnings, by either widening the type of the left-hand operand, or explicitly casting the type of the right-hand operand. --- .../java/org/elasticsearch/painless/api/CIDR.java | 4 ++-- .../action/termvectors/GetTermVectorsIT.java | 2 +- .../org/elasticsearch/blocks/SimpleBlocksIT.java | 2 +- .../org/elasticsearch/index/IndexingPressureIT.java | 8 ++++---- .../memory/breaker/CircuitBreakerServiceIT.java | 8 ++++---- .../elasticsearch/indices/state/CloseIndexIT.java | 2 +- .../search/aggregations/bucket/HistogramIT.java | 2 +- .../common/RandomBasedUUIDGenerator.java | 2 +- .../common/io/stream/ByteArrayStreamInput.java | 2 +- .../org/elasticsearch/common/network/CIDRUtils.java | 4 ++-- .../elasticsearch/index/mapper/BinaryRangeUtil.java | 6 +++--- .../index/mapper/IpScriptFieldType.java | 4 ++-- .../elasticsearch/index/mapper/RangeFieldMapper.java | 4 ++-- .../elasticsearch/script/VectorScoreScriptUtils.java | 2 +- .../bucket/BestBucketsDeferringCollector.java | 2 +- .../bucket/range/IpRangeAggregationBuilder.java | 4 ++-- .../action/search/SearchPhaseControllerTests.java | 2 +- .../index/shard/StoreRecoveryTests.java | 2 +- .../index/snapshots/blobstore/FileInfoTests.java | 6 +++--- .../recovery/PeerRecoveryTargetServiceTests.java | 2 +- .../bucket/prefix/InternalIpPrefixTests.java | 2 +- .../bucket/range/InternalBinaryRangeTests.java | 2 +- .../xpack/ccr/action/ShardChangesAction.java | 2 +- .../xpack/core/security/authc/support/BCrypt.java | 4 ++-- .../StratifiedTrainTestSplitterTests.java | 2 +- .../codecs/lucene54/Lucene54DocValuesConsumer.java | 2 +- .../xpack/lucene/bwc/codecs/lucene70/fst/FST.java | 2 +- .../bwc/codecs/lucene70/fst/ForwardBytesReader.java | 2 +- .../bwc/codecs/lucene70/fst/ReverseBytesReader.java | 2 +- .../testkit/RepositoryAnalysisFailureIT.java | 2 +- .../spatial/index/fielddata/TriangleTreeWriter.java | 12 ++++++------ .../datetime/DateTimeToCharProcessorTests.java | 2 +- 32 files changed, 53 insertions(+), 53 deletions(-) diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/api/CIDR.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/api/CIDR.java index a9421db5b6fe4..8ce32e182cb18 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/api/CIDR.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/api/CIDR.java @@ -66,8 +66,8 @@ private static Tuple getLowerUpper(Tuple c // Borrowed from Lucene for (int i = prefixLength; i < 8 * lower.length; i++) { int m = 1 << (7 - (i & 7)); - lower[i >> 3] &= ~m; - upper[i >> 3] |= m; + lower[i >> 3] &= (byte) ~m; + upper[i >> 3] |= (byte) m; } return new Tuple<>(lower, upper); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/termvectors/GetTermVectorsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/termvectors/GetTermVectorsIT.java index 2bca41b1d5136..4044cb7a7dc45 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/termvectors/GetTermVectorsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/termvectors/GetTermVectorsIT.java @@ -1017,7 +1017,7 @@ public void testArtificialDocWithPreference() throws InterruptedException, IOExc List shardIds = Arrays.stream(searchShardsResponse.getGroups()).map(s -> s.getShardId().id()).toList(); // request termvectors of artificial document from each shard - int sumTotalTermFreq = 0; + long sumTotalTermFreq = 0; int sumDocFreq = 0; for (Integer shardId : shardIds) { TermVectorsResponse tvResponse = client().prepareTermVectors() diff --git a/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java b/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java index 40a9b3a0dc6ce..8628f2542390c 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/blocks/SimpleBlocksIT.java @@ -369,7 +369,7 @@ public void testAddBlockWhileIndexingDocuments() throws Exception { ensureGreen(indexName); final APIBlock block = randomAddableBlock(); - int nbDocs = 0; + long nbDocs = 0; try { try (BackgroundIndexer indexer = new BackgroundIndexer(indexName, client(), 1000)) { indexer.setFailureAssertion(t -> { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/IndexingPressureIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/IndexingPressureIT.java index 262ad8c95bc6a..6ff7470252122 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/IndexingPressureIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/IndexingPressureIT.java @@ -103,7 +103,7 @@ public void testWriteIndexingPressureMetricsAreIncremented() throws Exception { final Releasable replicaRelease = blockReplicas(replicaThreadPool); final BulkRequest bulkRequest = new BulkRequest(); - int totalRequestSize = 0; + long totalRequestSize = 0; for (int i = 0; i < 80; ++i) { IndexRequest request = new IndexRequest(INDEX_NAME).id(UUIDs.base64UUID()) .source(Collections.singletonMap("key", randomAlphaOfLength(50))); @@ -235,7 +235,7 @@ public void testWriteIndexingPressureMetricsAreIncremented() throws Exception { public void testWriteCanBeRejectedAtCoordinatingLevel() throws Exception { final BulkRequest bulkRequest = new BulkRequest(); - int totalRequestSize = 0; + long totalRequestSize = 0; for (int i = 0; i < 80; ++i) { IndexRequest request = new IndexRequest(INDEX_NAME).id(UUIDs.base64UUID()) .source(Collections.singletonMap("key", randomAlphaOfLength(50))); @@ -300,7 +300,7 @@ public void testWriteCanBeRejectedAtCoordinatingLevel() throws Exception { public void testWriteCanBeRejectedAtPrimaryLevel() throws Exception { final BulkRequest bulkRequest = new BulkRequest(); - int totalRequestSize = 0; + long totalRequestSize = 0; for (int i = 0; i < 80; ++i) { IndexRequest request = new IndexRequest(INDEX_NAME).id(UUIDs.base64UUID()) .source(Collections.singletonMap("key", randomAlphaOfLength(50))); @@ -370,7 +370,7 @@ public void testWritesWillSucceedIfBelowThreshold() throws Exception { int thresholdToStopSending = 800 * 1024; ArrayList> responses = new ArrayList<>(); - int totalRequestSize = 0; + long totalRequestSize = 0; while (totalRequestSize < thresholdToStopSending) { IndexRequest request = new IndexRequest(INDEX_NAME).id(UUIDs.base64UUID()) .source(Collections.singletonMap("key", randomAlphaOfLength(500))); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java index 5df04831d74ab..e0e7154ad7c15 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java @@ -149,12 +149,12 @@ public void testMemoryBreaker() throws Exception { assertFailures(searchRequest, RestStatus.INTERNAL_SERVER_ERROR, containsString(errMsg)); NodesStatsResponse stats = client.admin().cluster().prepareNodesStats().setBreaker(true).get(); - int breaks = 0; + long breaks = 0; for (NodeStats stat : stats.getNodes()) { CircuitBreakerStats breakerStats = stat.getBreaker().getStats(CircuitBreaker.FIELDDATA); breaks += breakerStats.getTrippedCount(); } - assertThat(breaks, greaterThanOrEqualTo(1)); + assertThat(breaks, greaterThanOrEqualTo(1L)); } public void testRamAccountingTermsEnum() throws Exception { @@ -215,12 +215,12 @@ public void testRamAccountingTermsEnum() throws Exception { assertFailures(searchRequest, RestStatus.INTERNAL_SERVER_ERROR, containsString(errMsg)); NodesStatsResponse stats = client.admin().cluster().prepareNodesStats().setBreaker(true).get(); - int breaks = 0; + long breaks = 0; for (NodeStats stat : stats.getNodes()) { CircuitBreakerStats breakerStats = stat.getBreaker().getStats(CircuitBreaker.FIELDDATA); breaks += breakerStats.getTrippedCount(); } - assertThat(breaks, greaterThanOrEqualTo(1)); + assertThat(breaks, greaterThanOrEqualTo(1L)); } public void testRequestBreaker() throws Exception { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexIT.java index d60f1cf21508e..15a75e5565931 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexIT.java @@ -236,7 +236,7 @@ public void testCloseWhileIndexingDocuments() throws Exception { final String indexName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT); createIndex(indexName); - int nbDocs = 0; + long nbDocs = 0; try (BackgroundIndexer indexer = new BackgroundIndexer(indexName, client(), MAX_DOCS)) { indexer.setFailureAssertion(t -> assertException(t, indexName)); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java index 90b3b84bd6980..a7aaf40357317 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java @@ -300,7 +300,7 @@ public void testSingleValuedFieldWithRandomOffset() throws Exception { assertThat(histo.getName(), equalTo("histo")); assertThat(histo.getBuckets().size(), equalTo(expectedNumberOfBuckets)); - int docsCounted = 0; + long docsCounted = 0; for (int i = 0; i < expectedNumberOfBuckets; ++i) { Histogram.Bucket bucket = histo.getBuckets().get(i); assertThat(bucket, notNullValue()); diff --git a/server/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java b/server/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java index f9541f9627b84..e731cf3bc58be 100644 --- a/server/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java +++ b/server/src/main/java/org/elasticsearch/common/RandomBasedUUIDGenerator.java @@ -70,7 +70,7 @@ private static byte[] getUUIDBytes(Random random) { * The high field of th clock sequence multiplexed with the variant. * We set only the MSB of the variant*/ randomBytes[8] &= 0x3f; /* clear the 2 most significant bits */ - randomBytes[8] |= 0x80; /* set the variant (MSB is set)*/ + randomBytes[8] |= (byte) 0x80; /* set the variant (MSB is set)*/ return randomBytes; } } diff --git a/server/src/main/java/org/elasticsearch/common/io/stream/ByteArrayStreamInput.java b/server/src/main/java/org/elasticsearch/common/io/stream/ByteArrayStreamInput.java index 0a816d65dcafe..e904646213680 100644 --- a/server/src/main/java/org/elasticsearch/common/io/stream/ByteArrayStreamInput.java +++ b/server/src/main/java/org/elasticsearch/common/io/stream/ByteArrayStreamInput.java @@ -59,7 +59,7 @@ public void reset(byte[] bytes, int offset, int len) { } public void skipBytes(long count) { - pos += count; + pos += (int) count; } @Override diff --git a/server/src/main/java/org/elasticsearch/common/network/CIDRUtils.java b/server/src/main/java/org/elasticsearch/common/network/CIDRUtils.java index 6d34c45b239c3..ea4d6da9b7bec 100644 --- a/server/src/main/java/org/elasticsearch/common/network/CIDRUtils.java +++ b/server/src/main/java/org/elasticsearch/common/network/CIDRUtils.java @@ -63,8 +63,8 @@ private static Tuple getLowerUpper(Tuple c // Borrowed from Lucene for (int i = prefixLength; i < 8 * lower.length; i++) { int m = 1 << (7 - (i & 7)); - lower[i >> 3] &= ~m; - upper[i >> 3] |= m; + lower[i >> 3] &= (byte) ~m; + upper[i >> 3] |= (byte) m; } return new Tuple<>(lower, upper); } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/BinaryRangeUtil.java b/server/src/main/java/org/elasticsearch/index/mapper/BinaryRangeUtil.java index 4f23fe88548ce..6c31b684fa791 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/BinaryRangeUtil.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/BinaryRangeUtil.java @@ -233,11 +233,11 @@ private static byte[] encode(long l, int sign) { } // write the header - encoded[0] |= sign << 7; + encoded[0] |= (byte) (sign << 7); if (sign > 0) { - encoded[0] |= numAdditionalBytes << 3; + encoded[0] |= (byte) (numAdditionalBytes << 3); } else { - encoded[0] |= (15 - numAdditionalBytes) << 3; + encoded[0] |= (byte) ((15 - numAdditionalBytes) << 3); } return encoded; } diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IpScriptFieldType.java b/server/src/main/java/org/elasticsearch/index/mapper/IpScriptFieldType.java index 9ed1493eea145..e8f04ae062f49 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/IpScriptFieldType.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/IpScriptFieldType.java @@ -198,8 +198,8 @@ private Query cidrQuery(String term, SearchExecutionContext context) { byte upper[] = addr.getAddress(); for (int i = prefixLength; i < 8 * lower.length; i++) { int m = 1 << (7 - (i & 7)); - lower[i >> 3] &= ~m; - upper[i >> 3] |= m; + lower[i >> 3] &= (byte) ~m; + upper[i >> 3] |= (byte) m; } // Force the terms into IPv6 BytesRef lowerBytes = new BytesRef(InetAddressPoint.encode(InetAddressPoint.decode(lower))); diff --git a/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java index 2678fe6ca19d7..4f1fd8330f8bc 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/RangeFieldMapper.java @@ -444,8 +444,8 @@ private static Range parseIpRangeFromCidr(final XContentParser parser) throws IO byte[] upper = lower.clone(); for (int i = cidr.v2(); i < 8 * lower.length; i++) { int m = 1 << 7 - (i & 7); - lower[i >> 3] &= ~m; - upper[i >> 3] |= m; + lower[i >> 3] &= (byte) ~m; + upper[i >> 3] |= (byte) m; } try { return new Range(RangeType.IP, InetAddress.getByAddress(lower), InetAddress.getByAddress(upper), true, true); diff --git a/server/src/main/java/org/elasticsearch/script/VectorScoreScriptUtils.java b/server/src/main/java/org/elasticsearch/script/VectorScoreScriptUtils.java index ab3b12434f86a..f5d4a3d66be4a 100644 --- a/server/src/main/java/org/elasticsearch/script/VectorScoreScriptUtils.java +++ b/server/src/main/java/org/elasticsearch/script/VectorScoreScriptUtils.java @@ -99,7 +99,7 @@ public FloatDenseVectorFunction( if (normalizeQuery) { for (int dim = 0; dim < this.queryVector.length; dim++) { - this.queryVector[dim] /= queryMagnitude; + this.queryVector[dim] /= (float) queryMagnitude; } } } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java index 99d5fee99fdeb..91d5517dead08 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/BestBucketsDeferringCollector.java @@ -184,7 +184,7 @@ public void prepareSelectedBuckets(long... selectedBuckets) throws IOException { final PackedLongValues.Iterator buckets = entry.buckets.iterator(); int doc = 0; for (long i = 0, end = entry.docDeltas.size(); i < end; ++i) { - doc += docDeltaIterator.next(); + doc += (int) docDeltaIterator.next(); final long bucket = buckets.next(); final long rebasedBucket = this.selectedBuckets.find(bucket); if (rebasedBucket != -1) { diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java index cfe55fc6c4ac9..64b3c6a0839bc 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java @@ -128,8 +128,8 @@ public static class Range implements ToXContentObject, Writeable { byte upper[] = address.getAddress(); for (int i = prefixLength; i < 8 * lower.length; i++) { int m = 1 << (7 - (i & 7)); - lower[i >> 3] &= ~m; - upper[i >> 3] |= m; + lower[i >> 3] &= (byte) ~m; + upper[i >> 3] |= (byte) m; } this.key = key; try { diff --git a/server/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java b/server/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java index 25a9bc5aef3da..2d5369b25cb80 100644 --- a/server/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java +++ b/server/src/test/java/org/elasticsearch/action/search/SearchPhaseControllerTests.java @@ -489,7 +489,7 @@ private static int getTotalQueryHits(AtomicArray results) { for (SearchPhaseResult shardResult : results.asList()) { TopDocs topDocs = shardResult.queryResult().topDocs().topDocs; assert topDocs.totalHits.relation == Relation.EQUAL_TO; - resultCount += topDocs.totalHits.value; + resultCount += (int) topDocs.totalHits.value; } return resultCount; } diff --git a/server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java b/server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java index af609ffc4d67d..8c2c547c89d62 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java @@ -89,7 +89,7 @@ public void testAddIndices() throws IOException { final long maxSeqNo = randomNonNegativeLong(); final long maxUnsafeAutoIdTimestamp = randomNonNegativeLong(); StoreRecovery.addIndices(indexStats, target, indexSort, dirs, maxSeqNo, maxUnsafeAutoIdTimestamp, null, 0, false, false); - int numFiles = 0; + long numFiles = 0; Predicate filesFilter = (f) -> f.startsWith("segments") == false && f.equals("write.lock") == false && f.startsWith("extra") == false; diff --git a/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java b/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java index 0447f7394beac..f061f54d54b9f 100644 --- a/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java +++ b/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java @@ -168,7 +168,7 @@ public void testGetPartSize() { ); int numBytes = 0; for (int i = 0; i < info.numberOfParts(); i++) { - numBytes += info.partBytes(i); + numBytes += (int) info.partBytes(i); } assertEquals(numBytes, 36); @@ -179,7 +179,7 @@ public void testGetPartSize() { ); numBytes = 0; for (int i = 0; i < info.numberOfParts(); i++) { - numBytes += info.partBytes(i); + numBytes += (int) info.partBytes(i); } assertEquals(numBytes, 35); final int numIters = randomIntBetween(10, 100); @@ -193,7 +193,7 @@ public void testGetPartSize() { info = new BlobStoreIndexShardSnapshot.FileInfo("foo", metadata, ByteSizeValue.ofBytes(randomIntBetween(1, 1000))); numBytes = 0; for (int i = 0; i < info.numberOfParts(); i++) { - numBytes += info.partBytes(i); + numBytes += (int) info.partBytes(i); } assertEquals(numBytes, metadata.length()); } diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java index 53f9ec0a168f6..4e837f577c2dc 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java @@ -835,7 +835,7 @@ private InputStream getFaultyInputStream(DownloadFileErrorType downloadFileError System.arraycopy(fileData, 0, fileDataCopy, 0, fileData.length); // Corrupt the file for (int i = 0; i < randomIntBetween(1, fileDataCopy.length); i++) { - fileDataCopy[i] ^= 0xFF; + fileDataCopy[i] ^= (byte) 0xFF; } return new ByteArrayInputStream(fileDataCopy); } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/prefix/InternalIpPrefixTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/prefix/InternalIpPrefixTests.java index 079953f64f8bc..61f43bf152e0b 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/prefix/InternalIpPrefixTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/prefix/InternalIpPrefixTests.java @@ -101,7 +101,7 @@ private byte[] mask(int prefixLength) { int m = 0; int b = 0x80; for (int i = 0; i < prefixLength; i++) { - mask[m] |= b; + mask[m] |= (byte) b; b = b >> 1; if (b == 0) { m++; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java index 92e86b83d2b59..1140411a3b93e 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java @@ -91,7 +91,7 @@ protected void assertReduced(InternalBinaryRange reduced, List to_seqno[" + toSeqNo + "]"; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/BCrypt.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/BCrypt.java index d13faf469da86..8cd023ce66732 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/BCrypt.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/support/BCrypt.java @@ -1399,13 +1399,13 @@ private static byte[] decode_base64(String s, int maxolen) throws IllegalArgumen c2 = char64(s.charAt(off++)); if (c1 == -1 || c2 == -1) break; o = (byte) (c1 << 2); - o |= (c2 & 0x30) >> 4; + o |= (byte) ((c2 & 0x30) >> 4); rs.append((char) o); if (++olen >= maxolen || off >= slen) break; c3 = char64(s.charAt(off++)); if (c3 == -1) break; o = (byte) ((c2 & 0x0f) << 4); - o |= (c3 & 0x3c) >> 2; + o |= (byte) ((c3 & 0x3c) >> 2); rs.append((char) o); if (++olen >= maxolen || off >= slen) break; c4 = char64(s.charAt(off++)); diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/dataframe/traintestsplit/StratifiedTrainTestSplitterTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/dataframe/traintestsplit/StratifiedTrainTestSplitterTests.java index 581270538ce8a..27daa80d0a506 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/dataframe/traintestsplit/StratifiedTrainTestSplitterTests.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/dataframe/traintestsplit/StratifiedTrainTestSplitterTests.java @@ -169,7 +169,7 @@ public void testIsTraining_GivenRowsWithDependentVariableValue_AndTrainingPercen long expectedTotalTrainingCount = 0; for (long classCount : classCounts.values()) { - expectedTotalTrainingCount += trainingFraction * classCount; + expectedTotalTrainingCount += (long) (trainingFraction * classCount); } assertThat(actualTotalTrainingCount, greaterThanOrEqualTo(expectedTotalTrainingCount - 2)); assertThat(actualTotalTrainingCount, lessThanOrEqualTo(expectedTotalTrainingCount)); diff --git a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene54/Lucene54DocValuesConsumer.java b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene54/Lucene54DocValuesConsumer.java index ea66a110405e1..332b8fddfe166 100644 --- a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene54/Lucene54DocValuesConsumer.java +++ b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene54/Lucene54DocValuesConsumer.java @@ -343,7 +343,7 @@ void writeMissingBitset(Iterable values) throws IOException { bits = 0; } if (v != null) { - bits |= 1 << (count & 7); + bits |= (byte) (1 << (count & 7)); } count++; } diff --git a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene70/fst/FST.java b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene70/fst/FST.java index e5e684e08cd87..e7b7141c98d00 100644 --- a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene70/fst/FST.java +++ b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene70/fst/FST.java @@ -996,7 +996,7 @@ private void writePresenceBits(FSTCompiler fstCompiler, FSTCompiler.UnCompile presenceIndex -= Byte.SIZE; } // Set the bit at presenceIndex to flag that the corresponding arc is present. - presenceBits |= 1 << presenceIndex; + presenceBits |= (byte) (1 << presenceIndex); previousLabel = label; } assert presenceIndex == (nodeIn.arcs[nodeIn.numArcs - 1].label - nodeIn.arcs[0].label) % 8; diff --git a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene70/fst/ForwardBytesReader.java b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene70/fst/ForwardBytesReader.java index dcabb3a4d68f2..ec54f82d2f270 100644 --- a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene70/fst/ForwardBytesReader.java +++ b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene70/fst/ForwardBytesReader.java @@ -44,7 +44,7 @@ public void readBytes(byte[] b, int offset, int len) { @Override public void skipBytes(long count) { - pos += count; + pos += (int) count; } @Override diff --git a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene70/fst/ReverseBytesReader.java b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene70/fst/ReverseBytesReader.java index 8d22cc77694dd..8490e93c0387c 100644 --- a/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene70/fst/ReverseBytesReader.java +++ b/x-pack/plugin/old-lucene-versions/src/main/java/org/elasticsearch/xpack/lucene/bwc/codecs/lucene70/fst/ReverseBytesReader.java @@ -42,7 +42,7 @@ public void readBytes(byte[] b, int offset, int len) { @Override public void skipBytes(long count) { - pos -= count; + pos -= (int) count; } @Override diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/testkit/RepositoryAnalysisFailureIT.java b/x-pack/plugin/snapshot-repo-test-kit/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/testkit/RepositoryAnalysisFailureIT.java index 6cbb6f227bc75..2d498ff23b8e8 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/testkit/RepositoryAnalysisFailureIT.java +++ b/x-pack/plugin/snapshot-repo-test-kit/src/internalClusterTest/java/org/elasticsearch/repositories/blobstore/testkit/RepositoryAnalysisFailureIT.java @@ -157,7 +157,7 @@ public byte[] onRead(byte[] actualContents, long position, long length) { final byte[] disruptedContents = actualContents == null ? null : Arrays.copyOf(actualContents, actualContents.length); if (actualContents != null && countDown.countDown()) { // CRC32 should always detect a single bit flip - disruptedContents[Math.toIntExact(position + randomLongBetween(0, length - 1))] ^= 1 << between(0, 7); + disruptedContents[Math.toIntExact(position + randomLongBetween(0, length - 1))] ^= (byte) (1 << between(0, 7)); } return disruptedContents; } diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/fielddata/TriangleTreeWriter.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/fielddata/TriangleTreeWriter.java index 4510101796549..a2132bb5758a3 100644 --- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/fielddata/TriangleTreeWriter.java +++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/fielddata/TriangleTreeWriter.java @@ -146,17 +146,17 @@ private void writeNode(StreamOutput out, int parentMaxX, int parentMaxY, BytesSt private void writeMetadata(StreamOutput out) throws IOException { byte metadata = 0; - metadata |= (left != null) ? (1 << 0) : 0; - metadata |= (right != null) ? (1 << 1) : 0; + metadata |= (byte) ((left != null) ? (1 << 0) : 0); + metadata |= (byte) ((right != null) ? (1 << 1) : 0); if (component.type == ShapeField.DecodedTriangle.TYPE.POINT) { metadata |= (1 << 2); } else if (component.type == ShapeField.DecodedTriangle.TYPE.LINE) { metadata |= (1 << 3); - metadata |= (component.ab) ? (1 << 4) : 0; + metadata |= (byte) ((component.ab) ? (1 << 4) : 0); } else { - metadata |= (component.ab) ? (1 << 4) : 0; - metadata |= (component.bc) ? (1 << 5) : 0; - metadata |= (component.ca) ? (1 << 6) : 0; + metadata |= (byte) ((component.ab) ? (1 << 4) : 0); + metadata |= (byte) ((component.bc) ? (1 << 5) : 0); + metadata |= (byte) ((component.ca) ? (1 << 6) : 0); } out.writeByte(metadata); } diff --git a/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTimeToCharProcessorTests.java b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTimeToCharProcessorTests.java index ae9ab70579f2b..901ec4f1767a6 100644 --- a/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTimeToCharProcessorTests.java +++ b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTimeToCharProcessorTests.java @@ -163,7 +163,7 @@ private static ZonedDateTime dateTimeWithFractions(String secondAndFractionsSinc int fractions = b.remainder(BigDecimal.ONE).movePointRight(9).intValueExact(); int adjustment = 0; if (fractions < 0) { - fractions += 1e9; + fractions += (int) 1e9; adjustment = -1; } return dateTime((seconds + adjustment) * 1000).withNano(fractions);