minor refinements

apache · Nov 1, 2023 · b0867b1 · b0867b1
1 parent 128d307
commit b0867b1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/...n/java/org/apache/beam/sdk/schemas/transforms/providers/JavaExplodeTransformProvider.java b/...n/java/org/apache/beam/sdk/schemas/transforms/providers/JavaExplodeTransformProvider.java
@@ -67,7 +67,7 @@ protected SchemaTransform from(Configuration configuration) {
 
   @Override
   public String identifier() {
-    return String.format("beam:schematransform:org.apache.beam:yaml:explode-java:v1");
+    return "beam:schematransform:org.apache.beam:yaml:explode:v1";
   }
 
   @Override

diff --git a/...in/java/org/apache/beam/sdk/schemas/transforms/providers/JavaFilterTransformProvider.java b/...in/java/org/apache/beam/sdk/schemas/transforms/providers/JavaFilterTransformProvider.java
@@ -65,7 +65,7 @@ protected SchemaTransform from(Configuration configuration) {
 
   @Override
   public String identifier() {
-    return String.format("beam:schematransform:org.apache.beam:yaml:filter-java:v1");
+    return "beam:schematransform:org.apache.beam:yaml:filter-java:v1";
   }
 
   @Override

diff --git a/...va/org/apache/beam/sdk/schemas/transforms/providers/JavaMapToFieldsTransformProvider.java b/...va/org/apache/beam/sdk/schemas/transforms/providers/JavaMapToFieldsTransformProvider.java
@@ -67,7 +67,7 @@ protected SchemaTransform from(Configuration configuration) {
 
   @Override
   public String identifier() {
-    return String.format("beam:schematransform:org.apache.beam:yaml:map_to_fields-java:v1");
+    return "beam:schematransform:org.apache.beam:yaml:map_to_fields-java:v1";
   }
 
   @Override

diff --git a/sdks/python/apache_beam/yaml/yaml_mapping.py b/sdks/python/apache_beam/yaml/yaml_mapping.py
@@ -239,8 +239,6 @@ def expand(pcoll, error_handling=None, **kwargs):
   return expand
 
 
-# TODO(yaml): This should be available in all environments, in which case
-# we choose the one that matches best.
 class _Explode(beam.PTransform):
   def __init__(
       self,
@@ -289,11 +287,12 @@ def explode_zip(base, fields):
           copy[field] = values[ix]
         yield beam.Row(**copy)
 
+    cross_product = self._cross_product
     return (
         pcoll
         | beam.FlatMap(
             lambda row:
-            (explode_cross_product if self._cross_product else explode_zip)
+            (explode_cross_product if cross_product else explode_zip)
             ({name: getattr(row, name)
               for name in all_fields}, to_explode)))