Skip to content

Commit 0ce5929

Browse files
committed
Suppress warnings for javac too
Convert IntelliJ-specific suppression into annotation that javac obeys.
1 parent 3d3114d commit 0ce5929

File tree

6 files changed

+22
-21
lines changed

6 files changed

+22
-21
lines changed

core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorContext.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ default Tracer getTracer()
3636

3737
default Node getCurrentNode()
3838
{
39-
//noinspection deprecation
40-
return getNodeManager().getCurrentNode();
39+
@SuppressWarnings("deprecation")
40+
Node currentNode = getNodeManager().getCurrentNode();
41+
return currentNode;
4142
}
4243

4344
default NodeManager getNodeManager()

plugin/trino-base-jdbc/src/main/java/io/trino/plugin/jdbc/expression/GenericRewrite.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@ public boolean isEnabled(ConnectorSession session)
5959
public io.trino.matching.Pattern<ConnectorExpression> getPattern()
6060
{
6161
// TODO make ConnectorExpressionRule.getPattern result type flexible
62-
//noinspection unchecked
63-
return (io.trino.matching.Pattern<ConnectorExpression>) expressionPattern.getPattern();
62+
@SuppressWarnings("unchecked")
63+
var pattern = (io.trino.matching.Pattern<ConnectorExpression>) expressionPattern.getPattern();
64+
return pattern;
6465
}
6566

6667
@Override

plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2413,7 +2413,7 @@ public void setTableProperties(ConnectorSession session, ConnectorTableHandle ta
24132413
UpdateProperties updateProperties = transaction.updateProperties();
24142414

24152415
if (properties.containsKey(EXTRA_PROPERTIES_PROPERTY)) {
2416-
//noinspection unchecked
2416+
@SuppressWarnings("unchecked")
24172417
Map<String, String> extraProperties = (Map<String, String>) properties.get(EXTRA_PROPERTIES_PROPERTY)
24182418
.orElseThrow(() -> new IllegalArgumentException("The extra_properties property cannot be empty"));
24192419
verifyExtraProperties(properties.keySet(), extraProperties, allowedExtraProperties);
@@ -2422,7 +2422,7 @@ public void setTableProperties(ConnectorSession session, ConnectorTableHandle ta
24222422

24232423
if (properties.containsKey(PARQUET_BLOOM_FILTER_COLUMNS_PROPERTY)) {
24242424
checkFormatForProperty(getFileFormat(icebergTable).toIceberg(), FileFormat.PARQUET, PARQUET_BLOOM_FILTER_COLUMNS_PROPERTY);
2425-
//noinspection unchecked
2425+
@SuppressWarnings("unchecked")
24262426
List<String> parquetBloomFilterColumns = (List<String>) properties.get(PARQUET_BLOOM_FILTER_COLUMNS_PROPERTY)
24272427
.orElseThrow(() -> new IllegalArgumentException("The parquet_bloom_filter_columns property cannot be empty"));
24282428
validateParquetBloomFilterColumns(getColumnMetadatas(SchemaParser.fromJson(table.getTableSchemaJson()), typeManager), parquetBloomFilterColumns);
@@ -2438,7 +2438,7 @@ public void setTableProperties(ConnectorSession session, ConnectorTableHandle ta
24382438

24392439
if (properties.containsKey(ORC_BLOOM_FILTER_COLUMNS_PROPERTY)) {
24402440
checkFormatForProperty(getFileFormat(icebergTable).toIceberg(), FileFormat.ORC, ORC_BLOOM_FILTER_COLUMNS_PROPERTY);
2441-
//noinspection unchecked
2441+
@SuppressWarnings("unchecked")
24422442
List<String> orcBloomFilterColumns = (List<String>) properties.get(ORC_BLOOM_FILTER_COLUMNS_PROPERTY)
24432443
.orElseThrow(() -> new IllegalArgumentException("The orc_bloom_filter_columns property cannot be empty"));
24442444
if (orcBloomFilterColumns.isEmpty()) {

plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/system/EntriesTable.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -191,38 +191,38 @@ private void appendDataFile(RowBlockBuilder blockBuilder, StructProjection dataF
191191
Long fileSizeInBytes = dataFile.get(++position, Long.class);
192192
BIGINT.writeLong(fieldBuilders.get(position), fileSizeInBytes);
193193

194-
//noinspection unchecked
194+
@SuppressWarnings("unchecked")
195195
Map<Integer, Long> columnSizes = dataFile.get(++position, Map.class);
196196
appendIntegerBigintMap((MapBlockBuilder) fieldBuilders.get(position), columnSizes);
197197

198-
//noinspection unchecked
198+
@SuppressWarnings("unchecked")
199199
Map<Integer, Long> valueCounts = dataFile.get(++position, Map.class);
200200
appendIntegerBigintMap((MapBlockBuilder) fieldBuilders.get(position), valueCounts);
201201

202-
//noinspection unchecked
202+
@SuppressWarnings("unchecked")
203203
Map<Integer, Long> nullValueCounts = dataFile.get(++position, Map.class);
204204
appendIntegerBigintMap((MapBlockBuilder) fieldBuilders.get(position), nullValueCounts);
205205

206-
//noinspection unchecked
206+
@SuppressWarnings("unchecked")
207207
Map<Integer, Long> nanValueCounts = dataFile.get(++position, Map.class);
208208
appendIntegerBigintMap((MapBlockBuilder) fieldBuilders.get(position), nanValueCounts);
209209

210210
switch (ContentType.of(content)) {
211211
case DATA, EQUALITY_DELETE -> {
212-
//noinspection unchecked
212+
@SuppressWarnings("unchecked")
213213
Map<Integer, ByteBuffer> lowerBounds = dataFile.get(++position, Map.class);
214214
appendIntegerVarcharMap((MapBlockBuilder) fieldBuilders.get(position), lowerBounds);
215215

216-
//noinspection unchecked
216+
@SuppressWarnings("unchecked")
217217
Map<Integer, ByteBuffer> upperBounds = dataFile.get(++position, Map.class);
218218
appendIntegerVarcharMap((MapBlockBuilder) fieldBuilders.get(position), upperBounds);
219219
}
220220
case POSITION_DELETE -> {
221-
//noinspection unchecked
221+
@SuppressWarnings("unchecked")
222222
Map<Integer, ByteBuffer> lowerBounds = dataFile.get(++position, Map.class);
223223
appendBoundsForPositionDelete((MapBlockBuilder) fieldBuilders.get(position), lowerBounds);
224224

225-
//noinspection unchecked
225+
@SuppressWarnings("unchecked")
226226
Map<Integer, ByteBuffer> upperBounds = dataFile.get(++position, Map.class);
227227
appendBoundsForPositionDelete((MapBlockBuilder) fieldBuilders.get(position), upperBounds);
228228
}
@@ -236,7 +236,7 @@ private void appendDataFile(RowBlockBuilder blockBuilder, StructProjection dataF
236236
VARBINARY.writeSlice(fieldBuilders.get(position), wrappedHeapBuffer(keyMetadata));
237237
}
238238

239-
//noinspection unchecked
239+
@SuppressWarnings("unchecked")
240240
List<Long> splitOffsets = dataFile.get(++position, List.class);
241241
appendBigintArray((ArrayBlockBuilder) fieldBuilders.get(position), splitOffsets);
242242

@@ -256,7 +256,7 @@ private void appendDataFile(RowBlockBuilder blockBuilder, StructProjection dataF
256256
fieldBuilders.get(++position).appendNull();
257257
}
258258
case EQUALITY_DELETE -> {
259-
//noinspection unchecked
259+
@SuppressWarnings("unchecked")
260260
List<Integer> equalityIds = dataFile.get(++position, List.class);
261261
appendIntegerArray((ArrayBlockBuilder) fieldBuilders.get(position), equalityIds);
262262

plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergSystemTables.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ void testEntriesAfterPositionDelete()
690690
assertThat(deleteFile.getField(4)).isEqualTo(1L); // record_count
691691
assertThat((long) deleteFile.getField(5)).isPositive(); // file_size_in_bytes
692692

693-
//noinspection unchecked
693+
@SuppressWarnings("unchecked")
694694
Map<Integer, Long> columnSizes = (Map<Integer, Long>) deleteFile.getField(6);
695695
switch (format) {
696696
case ORC -> assertThat(columnSizes).isNull();
@@ -706,15 +706,15 @@ void testEntriesAfterPositionDelete()
706706
assertThat(deleteFile.getField(9)).isEqualTo(value(Map.of(), null)); // nan_value_counts
707707

708708
// lower_bounds
709-
//noinspection unchecked
709+
@SuppressWarnings("unchecked")
710710
Map<Integer, String> lowerBounds = (Map<Integer, String>) deleteFile.getField(10);
711711
assertThat(lowerBounds)
712712
.hasSize(2)
713713
.satisfies(_ -> assertThat(lowerBounds.get(DELETE_FILE_POS.fieldId())).isEqualTo("0"))
714714
.satisfies(_ -> assertThat(lowerBounds.get(DELETE_FILE_PATH.fieldId())).contains(table.getName()));
715715

716716
// upper_bounds
717-
//noinspection unchecked
717+
@SuppressWarnings("unchecked")
718718
Map<Integer, String> upperBounds = (Map<Integer, String>) deleteFile.getField(11);
719719
assertThat(upperBounds)
720720
.hasSize(2)

testing/trino-testing/src/main/java/io/trino/testing/statistics/MetricComparator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ static List<MetricComparison> getMetricComparisons(String query, QueryRunner run
4343

4444
ImmutableList.Builder<MetricComparison> metricComparisons = ImmutableList.builder();
4545
for (int i = 0; i < metrics.size(); ++i) {
46-
//noinspection unchecked
4746
metricComparisons.add(new MetricComparison(
4847
metrics.get(i),
4948
estimatedValues.get(i),

0 commit comments

Comments
 (0)