[beam] branch master updated: [BEAM-9605] BIP-1: Rename setRowOption to setOption on Option builder

[alexvanboxel]

This is an automated email from the ASF dual-hosted git repository.

alexvanboxel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 6ec49ce  [BEAM-9605] BIP-1: Rename setRowOption to setOption on Option 
builder
     new 894bcb0  Merge pull request #11249 from [BEAM-9605] BIP-1: Rename 
setRowOption to setOption on Option builder
6ec49ce is described below

commit 6ec49ce3633efee4274643ee176f1786571b5a25
Author: Alex Van Boxel <a...@vanboxel.be>
AuthorDate: Fri Mar 27 11:48:42 2020 +0100

    [BEAM-9605] BIP-1: Rename setRowOption to setOption on Option builder
    
    Added missing rename.
---
 .../apache/beam/runners/core/construction/SchemaTranslationTest.java  | 2 +-
 sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/Schema.java  | 4 ++--
 .../src/test/java/org/apache/beam/sdk/schemas/SchemaOptionsTest.java  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/SchemaTranslationTest.java
 
b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/SchemaTranslationTest.java
index bfb9adb..c80bbd6 100644
--- 
a/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/SchemaTranslationTest.java
+++ 
b/runners/core-construction-java/src/test/java/org/apache/beam/runners/core/construction/SchemaTranslationTest.java
@@ -74,7 +74,7 @@ public class SchemaTranslationTest {
               .setOption(
                   "field_option_map", FieldType.map(FieldType.STRING, 
FieldType.INT32), optionMap)
               .setOption("field_option_array", 
FieldType.array(FieldType.STRING), optionList)
-              .setRowOption("field_option_row", optionRow)
+              .setOption("field_option_row", optionRow)
               .setOption("field_option_value", FieldType.STRING, "other");
 
       return ImmutableList.<Schema>builder()
diff --git 
a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/Schema.java 
b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/Schema.java
index d0a8645..c7f5b46 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/Schema.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/Schema.java
@@ -1119,7 +1119,7 @@ public class Schema implements Serializable {
         this(new HashMap<>());
       }
 
-      public Builder setRowOption(String optionName, Row value) {
+      public Builder setOption(String optionName, Row value) {
         setOption(optionName, FieldType.row(value.getSchema()), value);
         return this;
       }
@@ -1209,7 +1209,7 @@ public class Schema implements Serializable {
     }
 
     public static Options.Builder setOption(String optionName, Row value) {
-      return Options.builder().setRowOption(optionName, value);
+      return Options.builder().setOption(optionName, value);
     }
   }
 
diff --git 
a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/SchemaOptionsTest.java
 
b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/SchemaOptionsTest.java
index b8bb0b0..81897a8 100644
--- 
a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/SchemaOptionsTest.java
+++ 
b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/SchemaOptionsTest.java
@@ -239,7 +239,7 @@ public class SchemaOptionsTest {
         .setOption("field_option_double", FieldType.DOUBLE, 12.0)
         .setOption("field_option_map", FieldType.map(FieldType.INT32, 
FieldType.STRING), TEST_MAP)
         .setOption("field_option_array", FieldType.array(FieldType.STRING), 
TEST_LIST)
-        .setRowOption("field_option_row", TEST_ROW)
+        .setOption("field_option_row", TEST_ROW)
         .setOption("field_option_value", FieldType.STRING, "other");
   }