AVRO-3048: Use SpecificRecord's MODEL$ in builder creation (apache#1206)

* AVRO-3048: Use SpecificRecord's MODEL$ in builder creation * AVRO-3048: fix formatting of code templates
Dieken · May 4, 2021 · 1034773 · 1034773
1 parent 6987101
commit 1034773
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 17 deletions.
diff --git a/lang/java/avro/src/main/java/org/apache/avro/specific/SpecificErrorBuilderBase.java b/lang/java/avro/src/main/java/org/apache/avro/specific/SpecificErrorBuilderBase.java
@@ -44,6 +44,16 @@ protected SpecificErrorBuilderBase(Schema schema) {
     super(schema, SpecificData.get());
   }
 
+  /**
+   * Creates a SpecificErrorBuilderBase for building errors of the given type.
+   * 
+   * @param schema the schema associated with the error class.
+   * @param model  the SpecificData instance associated with the error class
+   */
+  protected SpecificErrorBuilderBase(Schema schema, SpecificData model) {
+    super(schema, model);
+  }
+
   /**
    * SpecificErrorBuilderBase copy constructor.
    * 

diff --git a/lang/java/avro/src/main/java/org/apache/avro/specific/SpecificRecordBuilderBase.java b/lang/java/avro/src/main/java/org/apache/avro/specific/SpecificRecordBuilderBase.java
@@ -35,6 +35,16 @@ protected SpecificRecordBuilderBase(Schema schema) {
     super(schema, SpecificData.getForSchema(schema));
   }
 
+  /**
+   * Creates a SpecificRecordBuilderBase for building records of the given type.
+   * 
+   * @param schema the schema associated with the record class.
+   * @param model  the SpecificData associated with the specific record class
+   */
+  protected SpecificRecordBuilderBase(Schema schema, SpecificData model) {
+    super(schema, model);
+  }
+
   /**
    * SpecificRecordBuilderBase copy constructor.
    * 

diff --git a/...iler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/record.vm b/...iler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/record.vm
@@ -310,7 +310,7 @@ static {
 
     /** Creates a new Builder */
     private Builder() {
-      super(SCHEMA$);
+      super(SCHEMA$, MODEL$);
     }
 
     /**
@@ -338,7 +338,7 @@ static {
      */
     private Builder(#if ($schema.getNamespace())$this.mangle($schema.getNamespace()).#end${this.mangle($schema.getName())} other) {
 #if ($schema.isError())      super(other)#else
-      super(SCHEMA$)#end;
+      super(SCHEMA$, MODEL$)#end;
 #foreach ($field in $schema.getFields())
       if (isValidValue(fields()[$field.pos()], other.${this.mangle($field.name(), $schema.isError())})) {
         this.${this.mangle($field.name(), $schema.isError())} = data().deepCopy(fields()[$field.pos()].schema(), other.${this.mangle($field.name(), $schema.isError())});

diff --git a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/FieldTest.java b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/FieldTest.java
@@ -310,7 +310,7 @@ public static class Builder extends org.apache.avro.specific.SpecificRecordBuild
 
     /** Creates a new Builder */
     private Builder() {
-      super(SCHEMA$);
+      super(SCHEMA$, MODEL$);
     }
 
     /**
@@ -350,7 +350,7 @@ private Builder(avro.examples.baseball.FieldTest.Builder other) {
      * @param other The existing instance to copy.
      */
     private Builder(avro.examples.baseball.FieldTest other) {
-      super(SCHEMA$);
+      super(SCHEMA$, MODEL$);
       if (isValidValue(fields()[0], other.number)) {
         this.number = data().deepCopy(fields()[0].schema(), other.number);
         fieldSetFlags()[0] = true;

diff --git a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Player.java b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Player.java
@@ -242,7 +242,7 @@ public static class Builder extends org.apache.avro.specific.SpecificRecordBuild
 
     /** Creates a new Builder */
     private Builder() {
-      super(SCHEMA$);
+      super(SCHEMA$, MODEL$);
     }
 
     /**
@@ -274,7 +274,7 @@ private Builder(avro.examples.baseball.Player.Builder other) {
      * @param other The existing instance to copy.
      */
     private Builder(avro.examples.baseball.Player other) {
-      super(SCHEMA$);
+      super(SCHEMA$, MODEL$);
       if (isValidValue(fields()[0], other.number)) {
         this.number = data().deepCopy(fields()[0].schema(), other.number);
         fieldSetFlags()[0] = true;

diff --git a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Proto.java b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Proto.java
@@ -24,4 +24,4 @@ public interface Callback extends Proto {
      */
     void bar(org.apache.avro.ipc.Callback<java.lang.Void> callback) throws java.io.IOException;
   }
-}
+}
diff --git a/lang/java/tools/src/test/compiler/output/AddExtraOptionalGettersTest.java b/lang/java/tools/src/test/compiler/output/AddExtraOptionalGettersTest.java
@@ -207,7 +207,7 @@ public static class Builder extends org.apache.avro.specific.SpecificRecordBuild
 
     /** Creates a new Builder */
     private Builder() {
-      super(SCHEMA$);
+      super(SCHEMA$, MODEL$);
     }
 
     /**
@@ -231,7 +231,7 @@ private Builder(avro.examples.baseball.AddExtraOptionalGettersTest.Builder other
      * @param other The existing instance to copy.
      */
     private Builder(avro.examples.baseball.AddExtraOptionalGettersTest other) {
-      super(SCHEMA$);
+      super(SCHEMA$, MODEL$);
       if (isValidValue(fields()[0], other.name)) {
         this.name = data().deepCopy(fields()[0].schema(), other.name);
         fieldSetFlags()[0] = true;

diff --git a/lang/java/tools/src/test/compiler/output/NoSettersTest.java b/lang/java/tools/src/test/compiler/output/NoSettersTest.java
@@ -179,7 +179,7 @@ public static class Builder extends org.apache.avro.specific.SpecificRecordBuild
 
     /** Creates a new Builder */
     private Builder() {
-      super(SCHEMA$);
+      super(SCHEMA$, MODEL$);
     }
 
     /**
@@ -203,7 +203,7 @@ private Builder(avro.examples.baseball.NoSettersTest.Builder other) {
      * @param other The existing instance to copy.
      */
     private Builder(avro.examples.baseball.NoSettersTest other) {
-      super(SCHEMA$);
+      super(SCHEMA$, MODEL$);
       if (isValidValue(fields()[0], other.name)) {
         this.name = data().deepCopy(fields()[0].schema(), other.name);
         fieldSetFlags()[0] = true;

diff --git a/lang/java/tools/src/test/compiler/output/OptionalGettersAllFieldsTest.java b/lang/java/tools/src/test/compiler/output/OptionalGettersAllFieldsTest.java
@@ -239,7 +239,7 @@ public static class Builder extends org.apache.avro.specific.SpecificRecordBuild
 
     /** Creates a new Builder */
     private Builder() {
-      super(SCHEMA$);
+      super(SCHEMA$, MODEL$);
     }
 
     /**
@@ -271,7 +271,7 @@ private Builder(avro.examples.baseball.OptionalGettersAllFieldsTest.Builder othe
      * @param other The existing instance to copy.
      */
     private Builder(avro.examples.baseball.OptionalGettersAllFieldsTest other) {
-      super(SCHEMA$);
+      super(SCHEMA$, MODEL$);
       if (isValidValue(fields()[0], other.name)) {
         this.name = data().deepCopy(fields()[0].schema(), other.name);
         fieldSetFlags()[0] = true;

diff --git a/lang/java/tools/src/test/compiler/output/OptionalGettersNullableFieldsTest.java b/lang/java/tools/src/test/compiler/output/OptionalGettersNullableFieldsTest.java
@@ -239,7 +239,7 @@ public static class Builder extends org.apache.avro.specific.SpecificRecordBuild
 
     /** Creates a new Builder */
     private Builder() {
-      super(SCHEMA$);
+      super(SCHEMA$, MODEL$);
     }
 
     /**
@@ -271,7 +271,7 @@ private Builder(avro.examples.baseball.OptionalGettersNullableFieldsTest.Builder
      * @param other The existing instance to copy.
      */
     private Builder(avro.examples.baseball.OptionalGettersNullableFieldsTest other) {
-      super(SCHEMA$);
+      super(SCHEMA$, MODEL$);
       if (isValidValue(fields()[0], other.name)) {
         this.name = data().deepCopy(fields()[0].schema(), other.name);
         fieldSetFlags()[0] = true;

diff --git a/lang/java/tools/src/test/compiler/output/Player.java b/lang/java/tools/src/test/compiler/output/Player.java
@@ -242,7 +242,7 @@ public static class Builder extends org.apache.avro.specific.SpecificRecordBuild
 
     /** Creates a new Builder */
     private Builder() {
-      super(SCHEMA$);
+      super(SCHEMA$, MODEL$);
     }
 
     /**
@@ -274,7 +274,7 @@ private Builder(avro.examples.baseball.Player.Builder other) {
      * @param other The existing instance to copy.
      */
     private Builder(avro.examples.baseball.Player other) {
-      super(SCHEMA$);
+      super(SCHEMA$, MODEL$);
       if (isValidValue(fields()[0], other.number)) {
         this.number = data().deepCopy(fields()[0].schema(), other.number);
         fieldSetFlags()[0] = true;
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,4 +24,4 @@ public interface Callback extends Proto { @@
          */
         void bar(org.apache.avro.ipc.Callback<java.lang.Void> callback) throws java.io.IOException;
       }
-    }
+    }