diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index d9f3de5ea766..129f8c4900d1 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -1545,7 +1545,6 @@ class BeamModulePlugin implements Plugin { "EqualsUnsafeCast", "EscapedEntity", "ExtendsAutoValue", - "InlineFormatString", "InlineMeSuggester", "InvalidBlockTag", "InvalidInlineTag", diff --git a/it/common/src/main/java/org/apache/beam/it/common/TestProperties.java b/it/common/src/main/java/org/apache/beam/it/common/TestProperties.java index 18ed00a3b15c..4456882f8163 100644 --- a/it/common/src/main/java/org/apache/beam/it/common/TestProperties.java +++ b/it/common/src/main/java/org/apache/beam/it/common/TestProperties.java @@ -67,8 +67,6 @@ private TestProperties() {} public static final String DEFAULT_REGION = "us-central1"; // Error messages - private static final String CLI_ERR_MSG = "-D%s is required on the command line"; - private static final String ENV_VAR_MSG = "%s is required as an environment variable"; private static final Logger LOG = LoggerFactory.getLogger(TestProperties.class); @@ -170,8 +168,8 @@ private static String getProperty(String name, Type type, boolean required) { if (required) { String errMsg = type == Type.PROPERTY - ? String.format(CLI_ERR_MSG, name) - : String.format(ENV_VAR_MSG, name); + ? String.format("-D%s is required on the command line", name) + : String.format("%s is required as an environment variable", name); checkState(value != null, errMsg); } diff --git a/runners/samza/src/main/java/org/apache/beam/runners/samza/metrics/SamzaTransformMetrics.java b/runners/samza/src/main/java/org/apache/beam/runners/samza/metrics/SamzaTransformMetrics.java index 49da3effd8c9..229b6da4e7c0 100644 --- a/runners/samza/src/main/java/org/apache/beam/runners/samza/metrics/SamzaTransformMetrics.java +++ b/runners/samza/src/main/java/org/apache/beam/runners/samza/metrics/SamzaTransformMetrics.java @@ -37,7 +37,6 @@ public class SamzaTransformMetrics implements Serializable { private static final int DEFAULT_LOOKBACK_TIMER_WINDOW_SIZE_MS = 180000; private static final String GROUP = "SamzaBeamTransformMetrics"; - private static final String METRIC_NAME_PATTERN = "%s-%s"; private static final String TRANSFORM_LATENCY_METRIC = "handle-message-ns"; private static final String TRANSFORM_WATERMARK_PROGRESS = "output-watermark-ms"; private static final String TRANSFORM_IP_THROUGHPUT = "num-input-messages"; @@ -138,6 +137,6 @@ private static Timer getTimerWithCustomizedLookBackWindow(String transformName) private static String getMetricNameWithPrefix(String metricName, String transformName) { // Replace all non-alphanumeric characters with underscore final String samzaSafeMetricName = transformName.replaceAll("[^A-Za-z0-9_]", "_"); - return String.format(METRIC_NAME_PATTERN, samzaSafeMetricName, metricName); + return String.format("%s-%s", samzaSafeMetricName, metricName); } } diff --git a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIO.java b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIO.java index 7c0ab785ae7e..8362fa85b0b9 100644 --- a/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIO.java +++ b/sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIO.java @@ -1389,10 +1389,6 @@ private BigQueryStorageQuerySource createStorageQuerySource( getDirectReadPicosTimestampPrecision()); } - private static final String QUERY_VALIDATION_FAILURE_ERROR = - "Validation of query \"%1$s\" failed. If the query depends on an earlier stage of the" - + " pipeline, This validation can be disabled using #withoutValidation."; - @Override public void validate(PipelineOptions options) { // Even if existence validation is disabled, we need to make sure that the BigQueryIO @@ -1452,7 +1448,11 @@ public void validate(PipelineOptions options) { getQueryLocation()); } catch (Exception e) { throw new IllegalArgumentException( - String.format(QUERY_VALIDATION_FAILURE_ERROR, getQuery().get()), e); + String.format( + "Validation of query \"%1$s\" failed. If the query depends on an earlier stage of the" + + " pipeline, This validation can be disabled using #withoutValidation.", + getQuery().get()), + e); } // If the user provided a temp dataset, check if the dataset exists before launching the diff --git a/sdks/java/io/splunk/src/main/java/org/apache/beam/sdk/io/splunk/HttpEventPublisher.java b/sdks/java/io/splunk/src/main/java/org/apache/beam/sdk/io/splunk/HttpEventPublisher.java index f34fcb7c4e0e..d6fded956a21 100644 --- a/sdks/java/io/splunk/src/main/java/org/apache/beam/sdk/io/splunk/HttpEventPublisher.java +++ b/sdks/java/io/splunk/src/main/java/org/apache/beam/sdk/io/splunk/HttpEventPublisher.java @@ -93,8 +93,6 @@ abstract class HttpEventPublisher { private static final String CONTENT_TYPE = Joiner.on('/').join(MEDIA_TYPE.getType(), MEDIA_TYPE.getSubType()); - private static final String AUTHORIZATION_SCHEME = "Splunk %s"; - private static final String HTTPS_PROTOCOL_PREFIX = "https"; /** Provides a builder for creating a {@link HttpEventPublisher}. */ @@ -184,7 +182,7 @@ void close() throws IOException { * @param token Splunk's HEC authorization token */ private void setHeaders(HttpRequest request, String token) { - request.getHeaders().setAuthorization(String.format(AUTHORIZATION_SCHEME, token)); + request.getHeaders().setAuthorization(String.format("Splunk %s", token)); if (enableGzipHttpCompression()) { request.getHeaders().setContentEncoding("gzip");