Merge pull request #279 from spotify/up1

Beam 2.28 and other upgrades

Author: labianchin

dbeam-core/src/main/java/com/spotify/dbeam/avro/JdbcAvroMetering.java

@@ -41,7 +41,7 @@ public class JdbcAvroMetering {
   private Gauge rowsPerMinute = Metrics.gauge(this.getClass().getCanonicalName(), "rowsPerMinute");
   private Counter bytesWritten =
       Metrics.counter(this.getClass().getCanonicalName(), "bytesWritten");
-  private int rowCount = 0;
+  private long rowCount = 0;
   private long writeIterateStartTime;
 
   public JdbcAvroMetering(int countReportEvery, int logEvery) {

dbeam-core/src/test/java/com/spotify/dbeam/beam/BeamHelperTest.java

@@ -0,0 +1,38 @@
+/*-
+ * -\-\-
+ * DBeam Core
+ * --
+ * Copyright (C) 2016 - 2019 Spotify AB
+ * --
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * -/-/-
+ */
+
+package com.spotify.dbeam.beam;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import org.apache.beam.sdk.io.FileSystems;
+import org.apache.beam.sdk.options.PipelineOptionsFactory;
+import org.junit.Test;
+
+public class BeamHelperTest {
+
+  @Test(expected = FileNotFoundException.class)
+  public void shouldWorkWithGcs() throws IOException {
+    FileSystems.setDefaultPipelineOptions(PipelineOptionsFactory.create());
+    // This test ensures that gcsio / GcsUtil work properly and have the right classes on classpath
+    BeamHelper.readFromFile("gs://does-not-exist-1");
+  }
+
+}

dbeam-core/src/test/java/com/spotify/dbeam/options/PasswordReaderTest.java

@@ -85,4 +85,5 @@ public void shouldDecryptPasswordOnpasswordFileKmsEncryptedParameter() throws IO
 
     Assert.assertEquals(Optional.of("something_decrypted"), actualPassword);
   }
+
 }