Merge pull request #133 from davorbonaci/backport-21

Backport apache/beam#21
GoogleCloudPlatform · Mar 4, 2016 · 4516c84 · 4516c84
2 parents 962c621 + 30ca892
commit 4516c84
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/options/DataflowPipelineDebugOptions.java
@@ -173,7 +173,7 @@ public Dataflow create(PipelineOptions options) {
   /**
    * Whether to update the currently running pipeline with the same name as this one.
    *
-   * @deprecated This property is replaced by @{link DataflowPipelineOptions#getUpdate()}
+   * @deprecated This property is replaced by {@link DataflowPipelineOptions#getUpdate()}
    */
   @Deprecated
   @Description("If set, replace the existing pipeline with the name specified by --jobName with "

diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContext.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContext.java
@@ -407,7 +407,7 @@ public final <AggInputT> Aggregator<AggInputT, AggInputT> createAggregator(
   }
 
   /**
-   * Finalize the @{link DoFnWithContext} construction to prepare for processing.
+   * Finalize the {@link DoFnWithContext} construction to prepare for processing.
    * This method should be called by runners before any processing methods.
    */
   void prepareForProcessing() {

diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnTest.java b/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnTest.java
@@ -179,7 +179,7 @@ public void processElement(DoFn<String, String>.ProcessContext c) throws Excepti
   }
 
   /**
-   * Initialize a test pipeline with the specified @{link DoFn}.
+   * Initialize a test pipeline with the specified {@link DoFn}.
    */
   private <InputT, OutputT> TestPipeline createTestPipeline(DoFn<InputT, OutputT> fn) {
     TestPipeline pipeline = TestPipeline.create();

diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContextTest.java b/sdk/src/test/java/com/google/cloud/dataflow/sdk/transforms/DoFnWithContextTest.java
@@ -213,7 +213,7 @@ public void processElement(ProcessContext c) {}
   }
 
   /**
-   * Initialize a test pipeline with the specified @{link DoFn}.
+   * Initialize a test pipeline with the specified {@link DoFn}.
    */
   private <InputT, OutputT> TestPipeline createTestPipeline(DoFnWithContext<InputT, OutputT> fn) {
     TestPipeline pipeline = TestPipeline.create();

diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/SimpleDoFnRunnerTest.java b/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/SimpleDoFnRunnerTest.java
@@ -33,7 +33,7 @@
 import java.util.List;
 
 /**
- * Tests for base @{link DoFnRunnerBase} functionality.
+ * Tests for base {@link DoFnRunnerBase} functionality.
  */
 @RunWith(JUnit4.class)
 public class SimpleDoFnRunnerTest {

diff --git a/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/UserCodeExceptionTest.java b/sdk/src/test/java/com/google/cloud/dataflow/sdk/util/UserCodeExceptionTest.java
@@ -37,7 +37,7 @@
 import java.io.IOException;
 
 /**
- * Tests for @{link UserCodeException} functionality.
+ * Tests for {@link UserCodeException} functionality.
  */
 @RunWith(JUnit4.class)
 public class UserCodeExceptionTest {