You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by am...@apache.org on 2016/12/15 14:42:27 UTC
[1/2] incubator-beam git commit: [BEAM-932] Enable findbugs
validation (and fix existing issues)
Repository: incubator-beam
Updated Branches:
refs/heads/master 1ad638e51 -> 4323247a3
[BEAM-932] Enable findbugs validation (and fix existing issues)
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/bba3700a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/bba3700a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/bba3700a
Branch: refs/heads/master
Commit: bba3700aebd9dcaf88402b6845008cf7e5950cfe
Parents: 1ad638e
Author: Isma�l Mej�a <ie...@gmail.com>
Authored: Thu Dec 15 14:34:20 2016 +0100
Committer: Isma�l Mej�a <ie...@gmail.com>
Committed: Thu Dec 15 14:34:20 2016 +0100
----------------------------------------------------------------------
runners/spark/pom.xml | 10 ----
.../metrics/WithNamedAggregatorsSupport.java | 4 +-
.../spark/translation/WindowingHelpers.java | 3 +-
.../src/main/resources/beam/findbugs-filter.xml | 49 +++++++++++++++++---
4 files changed, 47 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/bba3700a/runners/spark/pom.xml
----------------------------------------------------------------------
diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml
index e8fffa2..5a2fe87 100644
--- a/runners/spark/pom.xml
+++ b/runners/spark/pom.xml
@@ -146,7 +146,6 @@
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
- <version>1.3.9</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -317,15 +316,6 @@
<build>
<pluginManagement>
<plugins>
- <!-- BEAM-931 -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/bba3700a/runners/spark/src/main/java/org/apache/beam/runners/spark/aggregators/metrics/WithNamedAggregatorsSupport.java
----------------------------------------------------------------------
diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/aggregators/metrics/WithNamedAggregatorsSupport.java b/runners/spark/src/main/java/org/apache/beam/runners/spark/aggregators/metrics/WithNamedAggregatorsSupport.java
index 6932ae6..5e71280 100644
--- a/runners/spark/src/main/java/org/apache/beam/runners/spark/aggregators/metrics/WithNamedAggregatorsSupport.java
+++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/aggregators/metrics/WithNamedAggregatorsSupport.java
@@ -121,8 +121,8 @@ public class WithNamedAggregatorsSupport extends MetricRegistry {
final String parentName = entry.getKey();
final Map<String, Gauge> gaugeMap = Maps.transformEntries(agg.renderAll(), toGauge());
final Map<String, Gauge> fullNameGaugeMap = Maps.newLinkedHashMap();
- for (String shortName : gaugeMap.keySet()) {
- fullNameGaugeMap.put(parentName + "." + shortName, gaugeMap.get(shortName));
+ for (Map.Entry<String, Gauge> gaugeEntry : gaugeMap.entrySet()) {
+ fullNameGaugeMap.put(parentName + "." + gaugeEntry.getKey(), gaugeEntry.getValue());
}
return Maps.filterValues(fullNameGaugeMap, Predicates.notNull());
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/bba3700a/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/WindowingHelpers.java
----------------------------------------------------------------------
diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/WindowingHelpers.java b/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/WindowingHelpers.java
index ec94f3e..0acff71 100644
--- a/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/WindowingHelpers.java
+++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/WindowingHelpers.java
@@ -18,6 +18,7 @@
package org.apache.beam.runners.spark.translation;
+import javax.annotation.Nonnull;
import org.apache.beam.sdk.util.WindowedValue;
import org.apache.spark.api.java.function.Function;
@@ -84,7 +85,7 @@ public final class WindowingHelpers {
public static <T> com.google.common.base.Function<WindowedValue<T>, T> unwindowValueFunction() {
return new com.google.common.base.Function<WindowedValue<T>, T>() {
@Override
- public T apply(WindowedValue<T> t) {
+ public T apply(@Nonnull WindowedValue<T> t) {
return t.getValue();
}
};
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/bba3700a/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml
----------------------------------------------------------------------
diff --git a/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml b/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml
index a696aeb..bfb4988 100644
--- a/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml
+++ b/sdks/java/build-tools/src/main/resources/beam/findbugs-filter.xml
@@ -125,6 +125,44 @@
</Match>
<Match>
+ <Class name="org.apache.beam.runners.spark.util.BroadcastHelper$CodedBroadcastHelper"/>
+ <Or>
+ <Field name="bcast" />
+ <Field name="value" />
+ </Or>
+ <Bug pattern="IS2_INCONSISTENT_SYNC"/>
+ <!--
+ Spark's Broadcast variables are a distributed and cached objects
+ and should not be treated as "normal" objects.
+ -->
+ </Match>
+
+ <Match>
+ <Class name="org.apache.beam.runners.spark.util.BroadcastHelper$DirectBroadcastHelper"/>
+ <Or>
+ <Field name="bcast" />
+ <Field name="value" />
+ </Or>
+ <Bug pattern="IS2_INCONSISTENT_SYNC"/>
+ <!--
+ Spark's Broadcast variables are a distributed and cached objects
+ and should not be treated as "normal" objects.
+ -->
+ </Match>
+
+ <Match>
+ <Class name="org.apache.beam.runners.spark.aggregators.metrics.sink.CsvSink"/>
+ <Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS"/>
+ <!-- Intentionally overriding parent name because inheritors should replace the parent. -->
+ </Match>
+
+ <Match>
+ <Class name="org.apache.beam.runners.spark.aggregators.metrics.sink.GraphiteSink"/>
+ <Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS"/>
+ <!-- Intentionally overriding parent name because inheritors should replace the parent. -->
+ </Match>
+
+ <Match>
<Class name="org.apache.beam.sdk.util.ZipFiles"/>
<Method name="zipDirectory" />
<Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
@@ -202,18 +240,17 @@
<!-- Called via reflection -->
</Match>
-
<!--
Baseline issues. No new issues should be added below this line and all existing issues should
have an associated JIRA
-->
<Match>
- <Class name="org.apache.beam.sdk.coders.JAXBCoder"/>
- <Method name="getContext"/>
- <Bug pattern="DC_DOUBLECHECK"/>
- <!--[BEAM-398] Possible double check of field-->
-</Match>
+ <Class name="org.apache.beam.sdk.coders.JAXBCoder"/>
+ <Method name="getContext"/>
+ <Bug pattern="DC_DOUBLECHECK"/>
+ <!--[BEAM-398] Possible double check of field-->
+ </Match>
<Match>
<Class name="org.apache.beam.sdk.io.range.OffsetRangeTracker"/>
<Field name="done"/>
[2/2] incubator-beam git commit: This closes #1463
Posted by am...@apache.org.
This closes #1463
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/4323247a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/4323247a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/4323247a
Branch: refs/heads/master
Commit: 4323247a3a8ea6fc06b99f66f0001f6956b494c9
Parents: 1ad638e bba3700
Author: Sela <an...@paypal.com>
Authored: Thu Dec 15 16:16:57 2016 +0200
Committer: Sela <an...@paypal.com>
Committed: Thu Dec 15 16:16:57 2016 +0200
----------------------------------------------------------------------
runners/spark/pom.xml | 10 ----
.../metrics/WithNamedAggregatorsSupport.java | 4 +-
.../spark/translation/WindowingHelpers.java | 3 +-
.../src/main/resources/beam/findbugs-filter.xml | 49 +++++++++++++++++---
4 files changed, 47 insertions(+), 19 deletions(-)
----------------------------------------------------------------------