You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2017/01/31 05:06:37 UTC

[1/2] beam git commit: Upgrade google-auto-value to 1.3

Repository: beam
Updated Branches:
  refs/heads/master 4e425ca1b -> 7a235f9d9


Upgrade google-auto-value to 1.3


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/cb6125b8
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/cb6125b8
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/cb6125b8

Branch: refs/heads/master
Commit: cb6125b865bad1ccd4f13235da04d50d23e05d66
Parents: 4e425ca
Author: peihe <pe...@users.noreply.github.com>
Authored: Fri Jan 27 17:25:06 2017 -0800
Committer: Dan Halperin <dh...@google.com>
Committed: Mon Jan 30 21:06:24 2017 -0800

----------------------------------------------------------------------
 pom.xml                                                            | 2 +-
 .../org/apache/beam/sdk/io/BoundedReadFromUnboundedSource.java     | 2 +-
 .../io/mqtt/src/main/java/org/apache/beam/sdk/io/mqtt/MqttIO.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/cb6125b8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 69c12f6..1c868a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@
     <datastore.client.version>1.2.0</datastore.client.version>
     <datastore.proto.version>1.2.0</datastore.proto.version>
     <google-auto-service.version>1.0-rc2</google-auto-service.version>
-    <google-auto-value.version>1.1</google-auto-value.version>
+    <google-auto-value.version>1.3</google-auto-value.version>
     <google-auth.version>0.6.0</google-auth.version>
     <google-clients.version>1.22.0</google-clients.version>
     <google-cloud-bigdataoss.version>1.4.5</google-cloud-bigdataoss.version>

http://git-wip-us.apache.org/repos/asf/beam/blob/cb6125b8/sdks/java/core/src/main/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSource.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSource.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSource.java
index 04e1755..d7f1d7b 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSource.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/BoundedReadFromUnboundedSource.java
@@ -148,7 +148,7 @@ public class BoundedReadFromUnboundedSource<T> extends PTransform<PBegin, PColle
   abstract static class UnboundedToBoundedSourceAdapter<T>
       extends BoundedSource<ValueWithRecordId<T>> {
     @Nullable abstract UnboundedSource<T, ?> getSource();
-    @Nullable abstract long getMaxNumRecords();
+    abstract long getMaxNumRecords();
     @Nullable abstract Duration getMaxReadTime();
 
     abstract Builder<T> toBuilder();

http://git-wip-us.apache.org/repos/asf/beam/blob/cb6125b8/sdks/java/io/mqtt/src/main/java/org/apache/beam/sdk/io/mqtt/MqttIO.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/mqtt/src/main/java/org/apache/beam/sdk/io/mqtt/MqttIO.java b/sdks/java/io/mqtt/src/main/java/org/apache/beam/sdk/io/mqtt/MqttIO.java
index 221f9b1..26234cf 100644
--- a/sdks/java/io/mqtt/src/main/java/org/apache/beam/sdk/io/mqtt/MqttIO.java
+++ b/sdks/java/io/mqtt/src/main/java/org/apache/beam/sdk/io/mqtt/MqttIO.java
@@ -493,7 +493,7 @@ public class MqttIO {
   public abstract static class Write extends PTransform<PCollection<byte[]>, PDone> {
 
     @Nullable abstract ConnectionConfiguration connectionConfiguration();
-    @Nullable abstract boolean retained();
+    abstract boolean retained();
 
     abstract Builder builder();
 


[2/2] beam git commit: This closes #1862

Posted by dh...@apache.org.
This closes #1862


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/7a235f9d
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/7a235f9d
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/7a235f9d

Branch: refs/heads/master
Commit: 7a235f9d9de24ca37748f30d04af94a39ac262f6
Parents: 4e425ca cb6125b
Author: Dan Halperin <dh...@google.com>
Authored: Mon Jan 30 21:06:32 2017 -0800
Committer: Dan Halperin <dh...@google.com>
Committed: Mon Jan 30 21:06:32 2017 -0800

----------------------------------------------------------------------
 pom.xml                                                            | 2 +-
 .../org/apache/beam/sdk/io/BoundedReadFromUnboundedSource.java     | 2 +-
 .../io/mqtt/src/main/java/org/apache/beam/sdk/io/mqtt/MqttIO.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------