Skip to content

Commit e1e0637

Browse files
authored
[ErrorProne] Fix FormatStringShouldUsePlaceholders string concat when Preconditions is used (#37745)
1 parent e5db1b3 commit e1e0637

18 files changed

Lines changed: 71 additions & 96 deletions

File tree

runners/flink/src/main/java/org/apache/beam/runners/flink/adapter/BeamFlinkDataStreamAdapter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,8 @@ FlinkInput.URN, flinkInputTranslator(flinkInputs),
228228
DataStream<InputT> flinkInput =
229229
Preconditions.checkStateNotNull(
230230
(DataStream<InputT>) inputMap.get(inputId),
231-
"missing input referenced in proto: " + inputId);
231+
"missing input referenced in proto: %s",
232+
inputId);
232233
context.addDataStream(
233234
Iterables.getOnlyElement(transform.getOutputsMap().values()),
234235
flinkInput.process(

runners/flink/src/main/java/org/apache/beam/runners/flink/translation/functions/FlinkSideInputReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public FlinkSideInputReader(
7474
public <T> @Nullable T get(PCollectionView<T> view, BoundedWindow window) {
7575
checkNotNull(view, "View passed to sideInput cannot be null");
7676
TupleTag<?> tag = view.getTagInternal();
77-
checkNotNull(sideInputs.get(tag), "Side input for " + view + " not available.");
77+
checkNotNull(sideInputs.get(tag), "Side input for %s not available.", view);
7878

7979
Map<BoundedWindow, T> sideInputs =
8080
runtimeContext.getBroadcastVariableWithInitializer(

runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/windmill/state/RangeCoder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public void verifyDeterministic() throws NonDeterministicException {
5454
@Override
5555
public void encode(Range<T> value, OutputStream outStream) throws IOException {
5656
Preconditions.checkState(
57-
value.lowerBoundType().equals(BoundType.CLOSED), "unexpected range " + value);
57+
value.lowerBoundType().equals(BoundType.CLOSED), "unexpected range %s", value);
5858
Preconditions.checkState(
59-
value.upperBoundType().equals(BoundType.OPEN), "unexpected range " + value);
59+
value.upperBoundType().equals(BoundType.OPEN), "unexpected range %s", value);
6060
boundCoder.encode(value.hasLowerBound() ? value.lowerEndpoint() : null, outStream);
6161
boundCoder.encode(value.hasUpperBound() ? value.upperEndpoint() : null, outStream);
6262
}

runners/java-fn-execution/src/main/java/org/apache/beam/runners/fnexecution/control/ReferenceCountingExecutableStageContextFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public ExecutableStageContext get(JobInfo jobInfo) {
115115
private void scheduleRelease(JobInfo jobInfo) {
116116
WrappedContext wrapper = getCache().get(jobInfo.jobId());
117117
Preconditions.checkState(
118-
wrapper != null, "Releasing context for unknown job: " + jobInfo.jobId());
118+
wrapper != null, "Releasing context for unknown job %s", jobInfo.jobId());
119119

120120
PipelineOptions pipelineOptions =
121121
PipelineOptionsTranslation.fromProto(jobInfo.pipelineOptions());

runners/prism/java/src/main/java/org/apache/beam/runners/prism/PrismLocator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ private static String userHome() {
242242
}
243243

244244
private static String mustGetPropertyAsLowerCase(String name) {
245-
return checkStateNotNull(System.getProperty(name), "System property: " + name + " not set")
245+
return checkStateNotNull(System.getProperty(name), "System property: %s not set", name)
246246
.toLowerCase();
247247
}
248248

sdks/java/core/src/main/java/org/apache/beam/sdk/coders/BigDecimalCoder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void encode(BigDecimal value, OutputStream outStream) throws IOException,
5555
@Override
5656
public void encode(BigDecimal value, OutputStream outStream, Context context)
5757
throws IOException, CoderException {
58-
checkNotNull(value, String.format("cannot encode a null %s", BigDecimal.class.getSimpleName()));
58+
checkNotNull(value);
5959
VAR_INT_CODER.encode(value.scale(), outStream);
6060
BIG_INT_CODER.encode(value.unscaledValue(), outStream, context);
6161
}
@@ -108,7 +108,7 @@ public boolean isRegisterByteSizeObserverCheap(BigDecimal value) {
108108
*/
109109
@Override
110110
protected long getEncodedElementByteSize(BigDecimal value) throws Exception {
111-
checkNotNull(value, String.format("cannot encode a null %s", BigDecimal.class.getSimpleName()));
111+
checkNotNull(value);
112112
return VAR_INT_CODER.getEncodedElementByteSize(value.scale())
113113
+ BIG_INT_CODER.getEncodedElementByteSize(value.unscaledValue());
114114
}

sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/AutoValueSchema.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,10 @@ private static void validateFieldNumbers(List<FieldValueTypeInformation> types)
7979
}
8080
Preconditions.checkState(
8181
number == i,
82-
"Expected field number "
83-
+ i
84-
+ " for field + "
85-
+ type.getName()
86-
+ " instead got "
87-
+ number);
82+
"Expected field number %s for field %s instead got %s",
83+
i,
84+
type.getName(),
85+
number);
8886
}
8987
}
9088

sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/JavaBeanSchema.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,10 @@ private static void validateFieldNumbers(List<FieldValueTypeInformation> types)
8181
}
8282
Preconditions.checkState(
8383
number == i,
84-
"Expected field number "
85-
+ i
86-
+ " for field: "
87-
+ type.getName()
88-
+ " instead got "
89-
+ number);
84+
"Expected field number %s for field %s instead got %s",
85+
i,
86+
type.getName(),
87+
number);
9088
}
9189
}
9290

sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/JavaFieldSchema.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,10 @@ private static void validateFieldNumbers(List<FieldValueTypeInformation> types)
103103
}
104104
Preconditions.checkState(
105105
number == i,
106-
"Expected field number "
107-
+ i
108-
+ " for field + "
109-
+ type.getName()
110-
+ " instead got "
111-
+ number);
106+
"Expected field number %s for field %s instead got %s",
107+
i,
108+
type.getName(),
109+
number);
112110
}
113111
}
114112

sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFnOutputReceivers.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,8 @@ public <T> OutputReceiver<Row> getRowReceiver(TupleTag<T> tag) {
169169
checkStateNotNull(outputCoder, "No output tag for %s ", tag);
170170
checkState(
171171
outputCoder instanceof SchemaCoder,
172-
"Output with tag " + tag + " must have a schema in order to call getRowReceiver");
172+
"Output with tag %s must have a schema in order to call getRowReceiver",
173+
tag);
173174
return DoFnOutputReceivers.rowReceiver(
174175
context, builderSupplier, tag, (SchemaCoder<T>) outputCoder);
175176
}

0 commit comments

Comments
 (0)