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 2016/05/24 02:01:24 UTC
[1/2] incubator-beam git commit: TypeDescriptor: remove bogus import
Repository: incubator-beam
Updated Branches:
refs/heads/master 2376aea8f -> 27abf446b
TypeDescriptor: remove bogus import
Misuse of Javadoc caused a bad import.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/ed8b1d5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/ed8b1d5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/ed8b1d5d
Branch: refs/heads/master
Commit: ed8b1d5da523fea3e0c13de071e5d18a29a2121f
Parents: 2376aea
Author: Dan Halperin <dh...@google.com>
Authored: Mon May 23 18:59:48 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Mon May 23 18:59:48 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/beam/sdk/values/TypeDescriptor.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/ed8b1d5d/sdks/java/core/src/main/java/org/apache/beam/sdk/values/TypeDescriptor.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/values/TypeDescriptor.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/values/TypeDescriptor.java
index 227c32f..eea720a 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/values/TypeDescriptor.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/values/TypeDescriptor.java
@@ -18,14 +18,11 @@
package org.apache.beam.sdk.values;
import com.google.common.collect.Lists;
-
import com.google.common.reflect.Invokable;
import com.google.common.reflect.Parameter;
import com.google.common.reflect.TypeParameter;
import com.google.common.reflect.TypeToken;
-import org.apache.velocity.runtime.parser.Token;
-
import java.io.Serializable;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -176,7 +173,7 @@ public abstract class TypeDescriptor<T> implements Serializable {
}
/**
- * Creates a new {@link SimpleTypeDescriptor} using the {@link Token}.
+ * Creates a new {@link SimpleTypeDescriptor} using the {@link #token}.
* Package visible so this isn't abused.
*/
<X> TypeDescriptor<T> where(TypeParameter<X> typeParam, TypeDescriptor<X> typeDescriptor) {
[2/2] incubator-beam git commit: Closes #381
Posted by dh...@apache.org.
Closes #381
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/27abf446
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/27abf446
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/27abf446
Branch: refs/heads/master
Commit: 27abf446b06060328fa1adf88f87fa282d733a71
Parents: 2376aea ed8b1d5
Author: Dan Halperin <dh...@google.com>
Authored: Mon May 23 19:01:13 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Mon May 23 19:01:13 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/beam/sdk/values/TypeDescriptor.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------