Skip to content

Commit 9829d6d

Browse files
authored
Merge pull request #37792: [ErrorProne] Fix AutoValueBoxedValues warnings across the codebase
1 parent 8e0736a commit 9829d6d

58 files changed

Lines changed: 253 additions & 371 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1578,7 +1578,6 @@ class BeamModulePlugin implements Plugin<Project> {
15781578
"UnnecessaryLongToIntConversion",
15791579
"UnusedVariable",
15801580
// intended suppressions emerged in newer protobuf versions
1581-
"AutoValueBoxedValues",
15821581
// For backward compatibility. Public method checked in before this check impl
15831582
// Possible use in interface subclasses
15841583
"ClassInitializationDeadlock",

examples/java/src/main/java/org/apache/beam/examples/complete/datatokenization/utils/CsvConverters.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ public static Builder newBuilder() {
435435
@Nullable
436436
public abstract String delimiter();
437437

438-
public abstract Boolean hasHeaders();
438+
public abstract boolean hasHeaders();
439439

440440
public abstract String inputFileSpec();
441441

@@ -468,7 +468,7 @@ public abstract static class Builder {
468468

469469
public abstract Builder setDelimiter(@Nullable String delimiter);
470470

471-
public abstract Builder setHasHeaders(Boolean hasHeaders);
471+
public abstract Builder setHasHeaders(boolean hasHeaders);
472472

473473
public abstract Builder setInputFileSpec(String inputFileSpec);
474474

@@ -486,8 +486,6 @@ public ReadCsv build() {
486486

487487
checkArgument(readCsv.csvFormat() != null, "Csv format must not be null.");
488488

489-
checkArgument(readCsv.hasHeaders() != null, "Header information must be provided.");
490-
491489
return readCsv;
492490
}
493491
}

it/clickhouse/src/main/java/org/apache/beam/it/clickhouse/conditions/ClickHouseRowsCheck.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public abstract class ClickHouseRowsCheck extends ConditionCheck {
3030

3131
abstract String table();
3232

33-
abstract Integer minRows();
33+
abstract int minRows();
3434

3535
abstract @Nullable Integer maxRows();
3636

@@ -85,7 +85,7 @@ public abstract static class Builder {
8585

8686
public abstract Builder setTable(String table);
8787

88-
public abstract Builder setMinRows(Integer minRows);
88+
public abstract Builder setMinRows(int minRows);
8989

9090
public abstract Builder setMaxRows(Integer maxRows);
9191

it/datadog/src/main/java/org/apache/beam/it/datadog/conditions/DatadogLogEntriesCheck.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public abstract class DatadogLogEntriesCheck extends ConditionCheck {
2828

2929
abstract DatadogResourceManager resourceManager();
3030

31-
abstract Integer minEntries();
31+
abstract int minEntries();
3232

3333
@Nullable
3434
abstract Integer maxEntries();
@@ -78,7 +78,7 @@ public abstract static class Builder {
7878

7979
public abstract Builder setResourceManager(DatadogResourceManager resourceManager);
8080

81-
public abstract Builder setMinEntries(Integer minEvents);
81+
public abstract Builder setMinEntries(int minEvents);
8282

8383
public abstract Builder setMaxEntries(Integer maxEvents);
8484

it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/bigquery/conditions/BigQueryRowsCheck.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public abstract class BigQueryRowsCheck extends ConditionCheck {
3131

3232
abstract TableId tableId();
3333

34-
abstract Integer minRows();
34+
abstract int minRows();
3535

3636
abstract @Nullable Integer maxRows();
3737

@@ -87,7 +87,7 @@ public abstract static class Builder {
8787

8888
public abstract Builder setTableId(TableId tableId);
8989

90-
public abstract Builder setMinRows(Integer minRows);
90+
public abstract Builder setMinRows(int minRows);
9191

9292
public abstract Builder setMaxRows(Integer maxRows);
9393

it/google-cloud-platform/src/main/java/org/apache/beam/it/gcp/pubsub/conditions/PubsubMessagesCheck.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public abstract class PubsubMessagesCheck extends ConditionCheck {
3636

3737
abstract SubscriptionName subscription();
3838

39-
abstract Integer minMessages();
39+
abstract int minMessages();
4040

4141
abstract @Nullable Integer maxMessages();
4242

@@ -104,7 +104,7 @@ public abstract static class Builder {
104104

105105
public abstract Builder setSubscription(SubscriptionName subscription);
106106

107-
public abstract Builder setMinMessages(Integer minMessages);
107+
public abstract Builder setMinMessages(int minMessages);
108108

109109
public abstract Builder setMaxMessages(Integer maxMessages);
110110

it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigquery/BigQueryStreamingLT.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,18 +160,18 @@ public static void cleanup() {
160160
@AutoValue
161161
abstract static class TestConfiguration {
162162
/** Rows will be generated for this many minutes. */
163-
abstract Integer getMinutes();
163+
abstract int getMinutes();
164164

165165
/** Data shape: The byte-size for each field. */
166-
abstract Integer getByteSizePerField();
166+
abstract int getByteSizePerField();
167167

168168
/** Data shape: The number of fields per row. */
169-
abstract Integer getNumFields();
169+
abstract int getNumFields();
170170

171171
/**
172172
* Rate of generated elements sent to the sink. Will run with a minimum of 1k rows per second.
173173
*/
174-
abstract Integer getRowsPerSecond();
174+
abstract int getRowsPerSecond();
175175

176176
abstract String getRunner();
177177

it/google-cloud-platform/src/test/java/org/apache/beam/it/gcp/bigtable/BigTableIOLT.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public void testBigtableWriteAndRead() throws IOException {
142142
region,
143143
readInfo.jobId(),
144144
getBeamMetricsName(PipelineMetricsType.COUNTER, READ_ELEMENT_METRIC_NAME));
145-
assertEquals(configuration.getNumRows(), numRecords, 0.5);
145+
assertEquals((double) configuration.getNumRows(), numRecords, 0.5);
146146

147147
// export metrics
148148
MetricsConfiguration metricsConfig =
@@ -214,13 +214,13 @@ private PipelineLauncher.LaunchInfo testRead() throws IOException {
214214
/** Options for BigtableIO load test. */
215215
@AutoValue
216216
abstract static class Configuration {
217-
abstract Long getNumRows();
217+
abstract long getNumRows();
218218

219-
abstract Integer getPipelineTimeout();
219+
abstract int getPipelineTimeout();
220220

221221
abstract String getRunner();
222222

223-
abstract Integer getValueSizeBytes();
223+
abstract int getValueSizeBytes();
224224

225225
static Configuration of(long numRows, int pipelineTimeout, String runner, int valueSizeBytes) {
226226
return new AutoValue_BigTableIOLT_Configuration.Builder()

it/kafka/src/test/java/org/apache/beam/it/kafka/KafkaIOLT.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public void testWriteAndRead() throws IOException {
145145
region,
146146
readInfo.jobId(),
147147
getBeamMetricsName(PipelineMetricsType.COUNTER, READ_ELEMENT_METRIC_NAME));
148-
assertEquals(configuration.getNumRows(), numRecords, 10.0);
148+
assertEquals((double) configuration.getNumRows(), numRecords, 10.0);
149149
} finally {
150150
// clean up pipelines
151151
if (pipelineLauncher.getJobStatus(project, region, writeInfo.jobId())
@@ -207,13 +207,13 @@ private PipelineLauncher.LaunchInfo testRead() throws IOException {
207207
/** Options for Kafka IO load test. */
208208
@AutoValue
209209
abstract static class Configuration {
210-
abstract Long getNumRows();
210+
abstract long getNumRows();
211211

212-
abstract Integer getPipelineTimeout();
212+
abstract int getPipelineTimeout();
213213

214214
abstract String getRunner();
215215

216-
abstract Integer getRowSize();
216+
abstract int getRowSize();
217217

218218
static Configuration of(long numRows, int pipelineTimeout, String runner) {
219219
return new AutoValue_KafkaIOLT_Configuration.Builder()

it/mongodb/src/main/java/org/apache/beam/it/mongodb/conditions/MongoDBDocumentsCheck.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public abstract class MongoDBDocumentsCheck extends ConditionCheck {
3030

3131
abstract String collectionName();
3232

33-
abstract Integer minDocuments();
33+
abstract int minDocuments();
3434

3535
abstract @Nullable Integer maxDocuments();
3636

@@ -88,7 +88,7 @@ public abstract static class Builder {
8888

8989
public abstract Builder setCollectionName(String collectionName);
9090

91-
public abstract Builder setMinDocuments(Integer minDocuments);
91+
public abstract Builder setMinDocuments(int minDocuments);
9292

9393
public abstract Builder setMaxDocuments(Integer maxDocuments);
9494

0 commit comments

Comments
 (0)