You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by pa...@apache.org on 2018/05/30 18:51:33 UTC

[beam] branch master updated: [BEAM-4322] Enforce ErrorProne analysis in protobuf extensions project

This is an automated email from the ASF dual-hosted git repository.

pabloem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new b414da9  [BEAM-4322] Enforce ErrorProne analysis in protobuf extensions project
b414da9 is described below

commit b414da99ba31f4bedf37af2aa2f46dcb4c081f3e
Author: Cade Markegard <ca...@gmail.com>
AuthorDate: Wed May 30 08:18:04 2018 -0700

    [BEAM-4322] Enforce ErrorProne analysis in protobuf extensions project
---
 build_rules.gradle                                                     | 2 +-
 sdks/java/extensions/protobuf/build.gradle                             | 3 ++-
 .../org/apache/beam/sdk/extensions/protobuf/ByteStringCoderTest.java   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build_rules.gradle b/build_rules.gradle
index 6f38a84..d67b840 100644
--- a/build_rules.gradle
+++ b/build_rules.gradle
@@ -421,7 +421,7 @@ ext.applyJavaNature = {
     if (configuration.enableErrorProne) {
       options.compilerArgs += [
         "-XepDisableWarningsInGeneratedCode",
-        "-XepExcludedPaths:.*/build/generated.*avro-java/.*",
+        "-XepExcludedPaths:(.*/)?(build/generated.*avro-java|build/generated)/.*",
         "-Xep:MutableConstantField:OFF" // Guava's immutable collections cannot appear on API surface.
       ]
     }
diff --git a/sdks/java/extensions/protobuf/build.gradle b/sdks/java/extensions/protobuf/build.gradle
index 2bba1a4..c8b80ca 100644
--- a/sdks/java/extensions/protobuf/build.gradle
+++ b/sdks/java/extensions/protobuf/build.gradle
@@ -17,7 +17,7 @@
  */
 
 apply from: project(":").file("build_rules.gradle")
-applyJavaNature()
+applyJavaNature(failOnWarning: true)
 applyGrpcNature()
 
 description = "Apache Beam :: SDKs :: Java :: Extensions :: Protobuf"
@@ -27,6 +27,7 @@ dependencies {
   compile library.java.guava
   shadow project(path: ":beam-sdks-java-core", configuration: "shadow")
   shadow library.java.protobuf_java
+  shadow library.java.findbugs_annotations
   testCompile project(path: ":beam-sdks-java-core", configuration: "shadowTest")
   testCompile library.java.hamcrest_core
   testCompile library.java.mockito_core
diff --git a/sdks/java/extensions/protobuf/src/test/java/org/apache/beam/sdk/extensions/protobuf/ByteStringCoderTest.java b/sdks/java/extensions/protobuf/src/test/java/org/apache/beam/sdk/extensions/protobuf/ByteStringCoderTest.java
index 78928a1..495fc96 100644
--- a/sdks/java/extensions/protobuf/src/test/java/org/apache/beam/sdk/extensions/protobuf/ByteStringCoderTest.java
+++ b/sdks/java/extensions/protobuf/src/test/java/org/apache/beam/sdk/extensions/protobuf/ByteStringCoderTest.java
@@ -56,7 +56,7 @@ public class ByteStringCoderTest {
   static {
     ImmutableList.Builder<ByteString> builder = ImmutableList.builder();
     for (String s : TEST_STRING_VALUES) {
-      builder.add(ByteString.copyFrom(s.getBytes()));
+      builder.add(ByteString.copyFromUtf8(s));
     }
     TEST_VALUES = builder.build();
   }

-- 
To stop receiving notification emails like this one, please contact
pabloem@apache.org.