This closes #104

iemejia · Dec 9, 2016 · 37adeb9 · 37adeb9
2 parents eb5397b + c5f8a46
commit 37adeb9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/content/get-started/mobile-gaming-example/index.html b/content/get-started/mobile-gaming-example/index.html
@@ -255,7 +255,7 @@ <h3 id="what-does-userscore-do">What Does UserScore Do?</h3>
   <span class="o">}</span>
 
   <span class="nd">@Override</span>
-  <span class="kd">public</span> <span class="n">PCollection</span><span class="o">&lt;</span><span class="n">KV</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Integer</span><span class="o">&gt;&gt;</span> <span class="nf">apply</span><span class="o">(</span>
+  <span class="kd">public</span> <span class="n">PCollection</span><span class="o">&lt;</span><span class="n">KV</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Integer</span><span class="o">&gt;&gt;</span> <span class="nf">expand</span><span class="o">(</span>
       <span class="n">PCollection</span><span class="o">&lt;</span><span class="n">GameActionInfo</span><span class="o">&gt;</span> <span class="n">gameInfo</span><span class="o">)</span> <span class="o">{</span>
 
     <span class="k">return</span> <span class="n">gameInfo</span>
@@ -518,7 +518,7 @@ <h4 id="calculating-user-score-based-on-processing-time">Calculating User Score
   <span class="o">}</span>
 
   <span class="nd">@Override</span>
-  <span class="kd">public</span> <span class="n">PCollection</span><span class="o">&lt;</span><span class="n">KV</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Integer</span><span class="o">&gt;&gt;</span> <span class="nf">apply</span><span class="o">(</span><span class="n">PCollection</span><span class="o">&lt;</span><span class="n">GameActionInfo</span><span class="o">&gt;</span> <span class="n">input</span><span class="o">)</span> <span class="o">{</span>
+  <span class="kd">public</span> <span class="n">PCollection</span><span class="o">&lt;</span><span class="n">KV</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Integer</span><span class="o">&gt;&gt;</span> <span class="nf">expand</span><span class="o">(</span><span class="n">PCollection</span><span class="o">&lt;</span><span class="n">GameActionInfo</span><span class="o">&gt;</span> <span class="n">input</span><span class="o">)</span> <span class="o">{</span>
     <span class="k">return</span> <span class="n">input</span><span class="o">.</span><span class="na">apply</span><span class="o">(</span><span class="s">"LeaderboardUserGlobalWindow"</span><span class="o">,</span>
         <span class="n">Window</span><span class="o">.&lt;</span><span class="n">GameActionInfo</span><span class="o">&gt;</span><span class="n">into</span><span class="o">(</span><span class="k">new</span> <span class="n">GlobalWindows</span><span class="o">())</span>
             <span class="c1">// Get periodic results every ten minutes.</span>
@@ -570,7 +570,7 @@ <h4 id="calculating-team-score-based-on-event-time">Calculating Team Score based
   <span class="o">}</span>
 
   <span class="nd">@Override</span>
-  <span class="kd">public</span> <span class="n">PCollection</span><span class="o">&lt;</span><span class="n">KV</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Integer</span><span class="o">&gt;&gt;</span> <span class="nf">apply</span><span class="o">(</span><span class="n">PCollection</span><span class="o">&lt;</span><span class="n">GameActionInfo</span><span class="o">&gt;</span> <span class="n">infos</span><span class="o">)</span> <span class="o">{</span>
+  <span class="kd">public</span> <span class="n">PCollection</span><span class="o">&lt;</span><span class="n">KV</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Integer</span><span class="o">&gt;&gt;</span> <span class="nf">expand</span><span class="o">(</span><span class="n">PCollection</span><span class="o">&lt;</span><span class="n">GameActionInfo</span><span class="o">&gt;</span> <span class="n">infos</span><span class="o">)</span> <span class="o">{</span>
     <span class="k">return</span> <span class="n">infos</span><span class="o">.</span><span class="na">apply</span><span class="o">(</span><span class="s">"LeaderboardTeamFixedWindows"</span><span class="o">,</span>
         <span class="n">Window</span><span class="o">.&lt;</span><span class="n">GameActionInfo</span><span class="o">&gt;</span><span class="n">into</span><span class="o">(</span><span class="n">FixedWindows</span><span class="o">.</span><span class="na">of</span><span class="o">(</span><span class="n">teamWindowDuration</span><span class="o">))</span>
             <span class="c1">// We will get early (speculative) results as well as cumulative</span>
@@ -628,7 +628,7 @@ <h4 id="abuse-detection">Abuse Detection</h4>
   <span class="kd">private</span> <span class="kd">static</span> <span class="kd">final</span> <span class="kt">double</span> <span class="n">SCORE_WEIGHT</span> <span class="o">=</span> <span class="mf">2.5</span><span class="o">;</span>
 
   <span class="nd">@Override</span>
-  <span class="kd">public</span> <span class="n">PCollection</span><span class="o">&lt;</span><span class="n">KV</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Integer</span><span class="o">&gt;&gt;</span> <span class="nf">apply</span><span class="o">(</span><span class="n">PCollection</span><span class="o">&lt;</span><span class="n">KV</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Integer</span><span class="o">&gt;&gt;</span> <span class="n">userScores</span><span class="o">)</span> <span class="o">{</span>
+  <span class="kd">public</span> <span class="n">PCollection</span><span class="o">&lt;</span><span class="n">KV</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Integer</span><span class="o">&gt;&gt;</span> <span class="nf">expand</span><span class="o">(</span><span class="n">PCollection</span><span class="o">&lt;</span><span class="n">KV</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Integer</span><span class="o">&gt;&gt;</span> <span class="n">userScores</span><span class="o">)</span> <span class="o">{</span>
 
     <span class="c1">// Get the sum of scores for each user.</span>
     <span class="n">PCollection</span><span class="o">&lt;</span><span class="n">KV</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Integer</span><span class="o">&gt;&gt;</span> <span class="n">sumScores</span> <span class="o">=</span> <span class="n">userScores</span>

diff --git a/content/get-started/wordcount-example/index.html b/content/get-started/wordcount-example/index.html
@@ -373,7 +373,7 @@ <h3 id="creating-composite-transforms">Creating Composite Transforms</h3>
 <div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">static</span> <span class="kd">class</span> <span class="nc">CountWords</span> <span class="kd">extends</span> <span class="n">PTransform</span><span class="o">&lt;</span><span class="n">PCollection</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;,</span>
     <span class="n">PCollection</span><span class="o">&lt;</span><span class="n">KV</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Long</span><span class="o">&gt;&gt;&gt;</span> <span class="o">{</span>
   <span class="nd">@Override</span>
-  <span class="kd">public</span> <span class="n">PCollection</span><span class="o">&lt;</span><span class="n">KV</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Long</span><span class="o">&gt;&gt;</span> <span class="nf">apply</span><span class="o">(</span><span class="n">PCollection</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">lines</span><span class="o">)</span> <span class="o">{</span>
+  <span class="kd">public</span> <span class="n">PCollection</span><span class="o">&lt;</span><span class="n">KV</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">Long</span><span class="o">&gt;&gt;</span> <span class="nf">expand</span><span class="o">(</span><span class="n">PCollection</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">lines</span><span class="o">)</span> <span class="o">{</span>
 
     <span class="c1">// Convert lines of text into individual words.</span>
     <span class="n">PCollection</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">words</span> <span class="o">=</span> <span class="n">lines</span><span class="o">.</span><span class="na">apply</span><span class="o">(</span>

diff --git a/src/get-started/mobile-gaming-example.md b/src/get-started/mobile-gaming-example.md
@@ -77,7 +77,7 @@ public static class ExtractAndSumScore
   }
 
   @Override
-  public PCollection<KV<String, Integer>> apply(
+  public PCollection<KV<String, Integer>> expand(
       PCollection<GameActionInfo> gameInfo) {
 
     return gameInfo
@@ -320,7 +320,7 @@ static class CalculateUserScores
   }
 
   @Override
-  public PCollection<KV<String, Integer>> apply(PCollection<GameActionInfo> input) {
+  public PCollection<KV<String, Integer>> expand(PCollection<GameActionInfo> input) {
     return input.apply("LeaderboardUserGlobalWindow",
         Window.<GameActionInfo>into(new GlobalWindows())
             // Get periodic results every ten minutes.
@@ -374,7 +374,7 @@ static class CalculateTeamScores
   }
 
   @Override
-  public PCollection<KV<String, Integer>> apply(PCollection<GameActionInfo> infos) {
+  public PCollection<KV<String, Integer>> expand(PCollection<GameActionInfo> infos) {
     return infos.apply("LeaderboardTeamFixedWindows",
         Window.<GameActionInfo>into(FixedWindows.of(teamWindowDuration))
             // We will get early (speculative) results as well as cumulative
@@ -428,7 +428,7 @@ public static class CalculateSpammyUsers
   private static final double SCORE_WEIGHT = 2.5;
 
   @Override
-  public PCollection<KV<String, Integer>> apply(PCollection<KV<String, Integer>> userScores) {
+  public PCollection<KV<String, Integer>> expand(PCollection<KV<String, Integer>> userScores) {
 
     // Get the sum of scores for each user.
     PCollection<KV<String, Integer>> sumScores = userScores

diff --git a/src/get-started/wordcount-example.md b/src/get-started/wordcount-example.md
@@ -188,7 +188,7 @@ When `CountWords` is defined, we specify its ultimate input and output; the inpu
 public static class CountWords extends PTransform<PCollection<String>,
     PCollection<KV<String, Long>>> {
   @Override
-  public PCollection<KV<String, Long>> apply(PCollection<String> lines) {
+  public PCollection<KV<String, Long>> expand(PCollection<String> lines) {
 
     // Convert lines of text into individual words.
     PCollection<String> words = lines.apply(