You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ie...@apache.org on 2017/03/27 03:22:20 UTC
[1/3] beam git commit: Fix Regex#AllMatches javadoc
Repository: beam
Updated Branches:
refs/heads/master c9e55a436 -> 026aec856
Fix Regex#AllMatches javadoc
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/b49bae3a
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/b49bae3a
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/b49bae3a
Branch: refs/heads/master
Commit: b49bae3a5881778e051ca7b285ac6ce5938239f4
Parents: c9e55a4
Author: wtanaka.com <wt...@yahoo.com>
Authored: Sun Mar 26 01:07:54 2017 -1000
Committer: Isma�l Mej�a <ie...@apache.org>
Committed: Mon Mar 27 05:19:51 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/beam/sdk/transforms/Regex.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/b49bae3a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Regex.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Regex.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Regex.java
index 7e85605..a494fc9 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Regex.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Regex.java
@@ -486,7 +486,8 @@ public class Regex {
/**
* {@code Regex.MatchesName<String>} takes a {@code PCollection<String>} and returns a {@code
- * PCollection<String>} representing the value extracted from all the Regex groups of the input
+ * PCollection<List<String>>} representing the value extracted from all the
+ * Regex groups of the input
* {@code PCollection} to the number of times that element occurs in the input.
*
* <p>This transform runs a Regex on the entire input line. If the entire line does not match the
@@ -497,8 +498,8 @@ public class Regex {
*
* <pre>{@code
* PCollection<String> words = ...;
- * PCollection<String> values =
- * words.apply(Regex.matches("myregex (mygroup)"));
+ * PCollection<List<String>> values =
+ * words.apply(Regex.allMatches("myregex (mygroup)"));
* }</pre>
*/
public static class AllMatches
[3/3] beam git commit: This closes #2329
Posted by ie...@apache.org.
This closes #2329
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/026aec85
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/026aec85
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/026aec85
Branch: refs/heads/master
Commit: 026aec856c13a7e1e3da08646b9b97ccf1f40e3c
Parents: c9e55a4 b92b966
Author: Isma�l Mej�a <ie...@apache.org>
Authored: Mon Mar 27 05:20:22 2017 +0200
Committer: Isma�l Mej�a <ie...@apache.org>
Committed: Mon Mar 27 05:20:22 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/beam/sdk/transforms/Regex.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[2/3] beam git commit: Fix Regex#FindAll javadoc
Posted by ie...@apache.org.
Fix Regex#FindAll javadoc
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/b92b9664
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/b92b9664
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/b92b9664
Branch: refs/heads/master
Commit: b92b96643732b05326150decace502194656662c
Parents: b49bae3
Author: wtanaka.com <wt...@yahoo.com>
Authored: Sun Mar 26 01:11:26 2017 -1000
Committer: Isma�l Mej�a <ie...@apache.org>
Committed: Mon Mar 27 05:19:56 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/beam/sdk/transforms/Regex.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/b92b9664/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Regex.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Regex.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Regex.java
index a494fc9..690d321 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Regex.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Regex.java
@@ -710,7 +710,8 @@ public class Regex {
/**
* {@code Regex.Find<String>} takes a {@code PCollection<String>} and returns a {@code
- * PCollection<String>} representing the value extracted from the Regex groups of the input {@code
+ * PCollection<List<String>>} representing the value extracted from the
+ * Regex groups of the input {@code
* PCollection} to the number of times that element occurs in the input.
*
* <p>This transform runs a Regex on the entire input line. If a portion of the line does not
@@ -721,8 +722,8 @@ public class Regex {
*
* <pre>{@code
* PCollection<String> words = ...;
- * PCollection<String> values =
- * words.apply(Regex.find("myregex (mygroup)"));
+ * PCollection<List<String>> values =
+ * words.apply(Regex.findAll("myregex (mygroup)"));
* }</pre>
*/
public static class FindAll extends PTransform<PCollection<String>, PCollection<List<String>>> {