From 137d435d7a9a29653efacf592e81f7cfcaee74b1 Mon Sep 17 00:00:00 2001
From: Sahil Takiar <stakiar@linkedin.com>
Date: Thu, 12 May 2016 09:14:34 -0700
Subject: [PATCH] Fixing new FindBugs warnings, and setting Travis build to
 fail if new FindBugs warnings are added

---
 .../data/management/convertion/hive/LongWatermark.java   | 3 +++
 .../data/management/copy/hive/HiveDatasetFinder.java     | 3 +++
 .../gobblin/data/management/copy/hive/HiveUtils.java     | 9 ++++++++-
 .../data/management/copy/hive/WhitelistBlacklist.java    | 2 +-
 ligradle/findbugs/findbugsExclude.xml                    | 2 +-
 travis/build.sh                                          | 2 +-
 6 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/gobblin-data-management/src/main/java/gobblin/data/management/convertion/hive/LongWatermark.java b/gobblin-data-management/src/main/java/gobblin/data/management/convertion/hive/LongWatermark.java
index cc102103dc2..13b63fdc4aa 100644
--- a/gobblin-data-management/src/main/java/gobblin/data/management/convertion/hive/LongWatermark.java
+++ b/gobblin-data-management/src/main/java/gobblin/data/management/convertion/hive/LongWatermark.java
@@ -12,6 +12,7 @@
 package gobblin.data.management.convertion.hive;
 
 import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
 import com.google.gson.Gson;
@@ -24,11 +25,13 @@
  */
 @Getter
 @AllArgsConstructor
+@EqualsAndHashCode
 public class LongWatermark implements Watermark, Comparable<LongWatermark> {
 
   private static final Gson GSON = new Gson();
 
   private long value;
+
   @Override
   public JsonElement toJson() {
     return GSON.toJsonTree(this);
diff --git a/gobblin-data-management/src/main/java/gobblin/data/management/copy/hive/HiveDatasetFinder.java b/gobblin-data-management/src/main/java/gobblin/data/management/copy/hive/HiveDatasetFinder.java
index e3ad914cf64..7e549e6e36f 100644
--- a/gobblin-data-management/src/main/java/gobblin/data/management/copy/hive/HiveDatasetFinder.java
+++ b/gobblin-data-management/src/main/java/gobblin/data/management/copy/hive/HiveDatasetFinder.java
@@ -136,6 +136,9 @@ public Iterator<HiveDataset> getDatasetsIterator()
       @Nullable
       @Override
       public HiveDataset apply(@Nullable DbAndTable dbAndTable) {
+        if (dbAndTable == null) {
+          return null;
+        }
         try (AutoReturnableObject<IMetaStoreClient> client = clientPool.getClient()) {
           Table table = client.get().getTable(dbAndTable.getDb(), dbAndTable.getTable());
           return createHiveDataset(table);
diff --git a/gobblin-data-management/src/main/java/gobblin/data/management/copy/hive/HiveUtils.java b/gobblin-data-management/src/main/java/gobblin/data/management/copy/hive/HiveUtils.java
index f86175d7a18..490bc3490b6 100644
--- a/gobblin-data-management/src/main/java/gobblin/data/management/copy/hive/HiveUtils.java
+++ b/gobblin-data-management/src/main/java/gobblin/data/management/copy/hive/HiveUtils.java
@@ -17,7 +17,10 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.annotation.Nullable;
+
 import org.apache.commons.lang3.reflect.ConstructorUtils;
+
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.metastore.IMetaStoreClient;
@@ -31,6 +34,7 @@
 import org.apache.hadoop.mapred.InputSplit;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.JobConfigurable;
+
 import org.apache.thrift.TException;
 
 import com.google.common.base.Function;
@@ -56,7 +60,10 @@ public static Map<List<String>, Partition> getPartitionsMap(IMetaStoreClient cli
       Optional<String> filter) throws IOException {
     return Maps.uniqueIndex(getPartitions(client, table, filter), new Function<Partition, List<String>>() {
       @Override
-      public List<String> apply(Partition partition) {
+      public List<String> apply(@Nullable Partition partition) {
+        if (partition == null) {
+          return null;
+        }
         return partition.getValues();
       }
     });
diff --git a/gobblin-data-management/src/main/java/gobblin/data/management/copy/hive/WhitelistBlacklist.java b/gobblin-data-management/src/main/java/gobblin/data/management/copy/hive/WhitelistBlacklist.java
index 3089c71e4ca..8c81a80a22c 100644
--- a/gobblin-data-management/src/main/java/gobblin/data/management/copy/hive/WhitelistBlacklist.java
+++ b/gobblin-data-management/src/main/java/gobblin/data/management/copy/hive/WhitelistBlacklist.java
@@ -77,7 +77,7 @@ public boolean acceptDb(String db) {
    * @return Whether the input table is accepted by this {@link WhitelistBlacklist}.
    */
   public boolean acceptTable(String db, String table) {
-    return accept(db, Optional.of(table));
+    return accept(db, Optional.fromNullable(table));
   }
 
   private boolean accept(String db, Optional<String> table) {
diff --git a/ligradle/findbugs/findbugsExclude.xml b/ligradle/findbugs/findbugsExclude.xml
index 991ac6a9bba..67cc11bd3ba 100644
--- a/ligradle/findbugs/findbugsExclude.xml
+++ b/ligradle/findbugs/findbugsExclude.xml
@@ -24,7 +24,7 @@
 	</Match>
   <!-- Ignored until https://github.com/linkedin/gobblin/issues/969 has been resolved -->
   <Match>
-     <Class name="gobblin.metastore.DatabaseJobHistoryStore" />
+     <Class name="~gobblin\.metastore\.database\.DatabaseJobHistoryStoreV.*" />
      <Bug pattern="SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING" />
   </Match>
   <!-- Ignored until https://github.com/linkedin/gobblin/issues/976 has been resolved -->
diff --git a/travis/build.sh b/travis/build.sh
index 72c76b2bb55..464e4b6ce2e 100755
--- a/travis/build.sh
+++ b/travis/build.sh
@@ -18,4 +18,4 @@
 #!/bin/bash
 set -e
 
-./gradlew clean assemble -Dorg.gradle.parallel=false
+./gradlew clean build -x test -Dorg.gradle.parallel=false