You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by mg...@apache.org on 2022/01/05 12:19:05 UTC

[avro] branch branch-1.11 updated (1dc8952 -> bc36c4a)

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

mgrigorov pushed a change to branch branch-1.11
in repository https://gitbox.apache.org/repos/asf/avro.git.


    from 1dc8952  AVRO-3277: Test against Ruby 3.1 (#1441)
     new aae1b9b  AVRO-3043: Remove redundant casts
     new bc36c4a  AVRO-3042 Update test expectations

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/avro/compiler/specific/templates/java/classic/record.vm  | 6 +++---
 .../compiler/output-string/avro/examples/baseball/FieldTest.java    | 6 +++---
 .../test/compiler/output-string/avro/examples/baseball/Player.java  | 6 +++---
 .../tools/src/test/compiler/output/AddExtraOptionalGettersTest.java | 6 +++---
 lang/java/tools/src/test/compiler/output/NoSettersTest.java         | 6 +++---
 .../src/test/compiler/output/OptionalGettersAllFieldsTest.java      | 6 +++---
 .../src/test/compiler/output/OptionalGettersNullableFieldsTest.java | 6 +++---
 lang/java/tools/src/test/compiler/output/Player.java                | 6 +++---
 8 files changed, 24 insertions(+), 24 deletions(-)

[avro] 02/02: AVRO-3042 Update test expectations

Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch branch-1.11
in repository https://gitbox.apache.org/repos/asf/avro.git

commit bc36c4a0b99a728abd08fba2dfc4defc106c6370
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Wed Jan 5 14:10:04 2022 +0200

    AVRO-3042 Update test expectations
    
    Signed-off-by: Martin Tzvetanov Grigorov <mg...@apache.org>
    (cherry picked from commit edd836f9d191b4ded5f1a23b432cb6913979c0d2)
---
 .../compiler/output-string/avro/examples/baseball/FieldTest.java    | 6 +++---
 .../test/compiler/output-string/avro/examples/baseball/Player.java  | 6 +++---
 .../tools/src/test/compiler/output/AddExtraOptionalGettersTest.java | 6 +++---
 lang/java/tools/src/test/compiler/output/NoSettersTest.java         | 6 +++---
 .../src/test/compiler/output/OptionalGettersAllFieldsTest.java      | 6 +++---
 .../src/test/compiler/output/OptionalGettersNullableFieldsTest.java | 6 +++---
 lang/java/tools/src/test/compiler/output/Player.java                | 6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

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
index e280704..59b8058 100644
--- 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
@@ -28,10 +28,10 @@ public class FieldTest extends org.apache.avro.specific.SpecificRecordBase imple
   }
 
   private static final BinaryMessageEncoder<FieldTest> ENCODER =
-      new BinaryMessageEncoder<FieldTest>(MODEL$, SCHEMA$);
+      new BinaryMessageEncoder<>(MODEL$, SCHEMA$);
 
   private static final BinaryMessageDecoder<FieldTest> DECODER =
-      new BinaryMessageDecoder<FieldTest>(MODEL$, SCHEMA$);
+      new BinaryMessageDecoder<>(MODEL$, SCHEMA$);
 
   /**
    * Return the BinaryMessageEncoder instance used by this class.
@@ -55,7 +55,7 @@ public class FieldTest extends org.apache.avro.specific.SpecificRecordBase imple
    * @return a BinaryMessageDecoder instance for this class backed by the given SchemaStore
    */
   public static BinaryMessageDecoder<FieldTest> createDecoder(SchemaStore resolver) {
-    return new BinaryMessageDecoder<FieldTest>(MODEL$, SCHEMA$, resolver);
+    return new BinaryMessageDecoder<>(MODEL$, SCHEMA$, resolver);
   }
 
   /**
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
index 09180cd..1785559 100644
--- 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
@@ -22,10 +22,10 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
   private static final SpecificData MODEL$ = new SpecificData();
 
   private static final BinaryMessageEncoder<Player> ENCODER =
-      new BinaryMessageEncoder<Player>(MODEL$, SCHEMA$);
+      new BinaryMessageEncoder<>(MODEL$, SCHEMA$);
 
   private static final BinaryMessageDecoder<Player> DECODER =
-      new BinaryMessageDecoder<Player>(MODEL$, SCHEMA$);
+      new BinaryMessageDecoder<>(MODEL$, SCHEMA$);
 
   /**
    * Return the BinaryMessageEncoder instance used by this class.
@@ -49,7 +49,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
    * @return a BinaryMessageDecoder instance for this class backed by the given SchemaStore
    */
   public static BinaryMessageDecoder<Player> createDecoder(SchemaStore resolver) {
-    return new BinaryMessageDecoder<Player>(MODEL$, SCHEMA$, resolver);
+    return new BinaryMessageDecoder<>(MODEL$, SCHEMA$, resolver);
   }
 
   /**
diff --git a/lang/java/tools/src/test/compiler/output/AddExtraOptionalGettersTest.java b/lang/java/tools/src/test/compiler/output/AddExtraOptionalGettersTest.java
index 1a06d36..5e0e6dd 100644
--- a/lang/java/tools/src/test/compiler/output/AddExtraOptionalGettersTest.java
+++ b/lang/java/tools/src/test/compiler/output/AddExtraOptionalGettersTest.java
@@ -22,10 +22,10 @@ public class AddExtraOptionalGettersTest extends org.apache.avro.specific.Specif
   private static final SpecificData MODEL$ = new SpecificData();
 
   private static final BinaryMessageEncoder<AddExtraOptionalGettersTest> ENCODER =
-      new BinaryMessageEncoder<AddExtraOptionalGettersTest>(MODEL$, SCHEMA$);
+      new BinaryMessageEncoder<>(MODEL$, SCHEMA$);
 
   private static final BinaryMessageDecoder<AddExtraOptionalGettersTest> DECODER =
-      new BinaryMessageDecoder<AddExtraOptionalGettersTest>(MODEL$, SCHEMA$);
+      new BinaryMessageDecoder<>(MODEL$, SCHEMA$);
 
   /**
    * Return the BinaryMessageEncoder instance used by this class.
@@ -49,7 +49,7 @@ public class AddExtraOptionalGettersTest extends org.apache.avro.specific.Specif
    * @return a BinaryMessageDecoder instance for this class backed by the given SchemaStore
    */
   public static BinaryMessageDecoder<AddExtraOptionalGettersTest> createDecoder(SchemaStore resolver) {
-    return new BinaryMessageDecoder<AddExtraOptionalGettersTest>(MODEL$, SCHEMA$, resolver);
+    return new BinaryMessageDecoder<>(MODEL$, SCHEMA$, resolver);
   }
 
   /**
diff --git a/lang/java/tools/src/test/compiler/output/NoSettersTest.java b/lang/java/tools/src/test/compiler/output/NoSettersTest.java
index 60f2fc5..550cfec 100644
--- a/lang/java/tools/src/test/compiler/output/NoSettersTest.java
+++ b/lang/java/tools/src/test/compiler/output/NoSettersTest.java
@@ -22,10 +22,10 @@ public class NoSettersTest extends org.apache.avro.specific.SpecificRecordBase i
   private static final SpecificData MODEL$ = new SpecificData();
 
   private static final BinaryMessageEncoder<NoSettersTest> ENCODER =
-      new BinaryMessageEncoder<NoSettersTest>(MODEL$, SCHEMA$);
+      new BinaryMessageEncoder<>(MODEL$, SCHEMA$);
 
   private static final BinaryMessageDecoder<NoSettersTest> DECODER =
-      new BinaryMessageDecoder<NoSettersTest>(MODEL$, SCHEMA$);
+      new BinaryMessageDecoder<>(MODEL$, SCHEMA$);
 
   /**
    * Return the BinaryMessageEncoder instance used by this class.
@@ -49,7 +49,7 @@ public class NoSettersTest extends org.apache.avro.specific.SpecificRecordBase i
    * @return a BinaryMessageDecoder instance for this class backed by the given SchemaStore
    */
   public static BinaryMessageDecoder<NoSettersTest> createDecoder(SchemaStore resolver) {
-    return new BinaryMessageDecoder<NoSettersTest>(MODEL$, SCHEMA$, resolver);
+    return new BinaryMessageDecoder<>(MODEL$, SCHEMA$, resolver);
   }
 
   /**
diff --git a/lang/java/tools/src/test/compiler/output/OptionalGettersAllFieldsTest.java b/lang/java/tools/src/test/compiler/output/OptionalGettersAllFieldsTest.java
index 3534558..bf2be16 100644
--- a/lang/java/tools/src/test/compiler/output/OptionalGettersAllFieldsTest.java
+++ b/lang/java/tools/src/test/compiler/output/OptionalGettersAllFieldsTest.java
@@ -22,10 +22,10 @@ public class OptionalGettersAllFieldsTest extends org.apache.avro.specific.Speci
   private static final SpecificData MODEL$ = new SpecificData();
 
   private static final BinaryMessageEncoder<OptionalGettersAllFieldsTest> ENCODER =
-      new BinaryMessageEncoder<OptionalGettersAllFieldsTest>(MODEL$, SCHEMA$);
+      new BinaryMessageEncoder<>(MODEL$, SCHEMA$);
 
   private static final BinaryMessageDecoder<OptionalGettersAllFieldsTest> DECODER =
-      new BinaryMessageDecoder<OptionalGettersAllFieldsTest>(MODEL$, SCHEMA$);
+      new BinaryMessageDecoder<>(MODEL$, SCHEMA$);
 
   /**
    * Return the BinaryMessageEncoder instance used by this class.
@@ -49,7 +49,7 @@ public class OptionalGettersAllFieldsTest extends org.apache.avro.specific.Speci
    * @return a BinaryMessageDecoder instance for this class backed by the given SchemaStore
    */
   public static BinaryMessageDecoder<OptionalGettersAllFieldsTest> createDecoder(SchemaStore resolver) {
-    return new BinaryMessageDecoder<OptionalGettersAllFieldsTest>(MODEL$, SCHEMA$, resolver);
+    return new BinaryMessageDecoder<>(MODEL$, SCHEMA$, resolver);
   }
 
   /**
diff --git a/lang/java/tools/src/test/compiler/output/OptionalGettersNullableFieldsTest.java b/lang/java/tools/src/test/compiler/output/OptionalGettersNullableFieldsTest.java
index 3e47389..0f9c2e6 100644
--- a/lang/java/tools/src/test/compiler/output/OptionalGettersNullableFieldsTest.java
+++ b/lang/java/tools/src/test/compiler/output/OptionalGettersNullableFieldsTest.java
@@ -22,10 +22,10 @@ public class OptionalGettersNullableFieldsTest extends org.apache.avro.specific.
   private static final SpecificData MODEL$ = new SpecificData();
 
   private static final BinaryMessageEncoder<OptionalGettersNullableFieldsTest> ENCODER =
-      new BinaryMessageEncoder<OptionalGettersNullableFieldsTest>(MODEL$, SCHEMA$);
+      new BinaryMessageEncoder<>(MODEL$, SCHEMA$);
 
   private static final BinaryMessageDecoder<OptionalGettersNullableFieldsTest> DECODER =
-      new BinaryMessageDecoder<OptionalGettersNullableFieldsTest>(MODEL$, SCHEMA$);
+      new BinaryMessageDecoder<>(MODEL$, SCHEMA$);
 
   /**
    * Return the BinaryMessageEncoder instance used by this class.
@@ -49,7 +49,7 @@ public class OptionalGettersNullableFieldsTest extends org.apache.avro.specific.
    * @return a BinaryMessageDecoder instance for this class backed by the given SchemaStore
    */
   public static BinaryMessageDecoder<OptionalGettersNullableFieldsTest> createDecoder(SchemaStore resolver) {
-    return new BinaryMessageDecoder<OptionalGettersNullableFieldsTest>(MODEL$, SCHEMA$, resolver);
+    return new BinaryMessageDecoder<>(MODEL$, SCHEMA$, resolver);
   }
 
   /**
diff --git a/lang/java/tools/src/test/compiler/output/Player.java b/lang/java/tools/src/test/compiler/output/Player.java
index a7890f7..059371e 100644
--- a/lang/java/tools/src/test/compiler/output/Player.java
+++ b/lang/java/tools/src/test/compiler/output/Player.java
@@ -22,10 +22,10 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
   private static final SpecificData MODEL$ = new SpecificData();
 
   private static final BinaryMessageEncoder<Player> ENCODER =
-      new BinaryMessageEncoder<Player>(MODEL$, SCHEMA$);
+      new BinaryMessageEncoder<>(MODEL$, SCHEMA$);
 
   private static final BinaryMessageDecoder<Player> DECODER =
-      new BinaryMessageDecoder<Player>(MODEL$, SCHEMA$);
+      new BinaryMessageDecoder<>(MODEL$, SCHEMA$);
 
   /**
    * Return the BinaryMessageEncoder instance used by this class.
@@ -49,7 +49,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
    * @return a BinaryMessageDecoder instance for this class backed by the given SchemaStore
    */
   public static BinaryMessageDecoder<Player> createDecoder(SchemaStore resolver) {
-    return new BinaryMessageDecoder<Player>(MODEL$, SCHEMA$, resolver);
+    return new BinaryMessageDecoder<>(MODEL$, SCHEMA$, resolver);
   }
 
   /**

[avro] 01/02: AVRO-3043: Remove redundant casts

Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch branch-1.11
in repository https://gitbox.apache.org/repos/asf/avro.git

commit aae1b9baaf8aae2741a56874d3d84f8a508b4ac1
Author: Fokko Driesprong <fo...@apache.org>
AuthorDate: Thu Feb 11 22:00:55 2021 +0100

    AVRO-3043: Remove redundant casts
    
    (cherry picked from commit 5ebc186856114c508f28203b19654658e87045e7)
---
 .../apache/avro/compiler/specific/templates/java/classic/record.vm  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/record.vm b/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/record.vm
index 4b11853..563cd86 100755
--- a/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/record.vm
+++ b/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/record.vm
@@ -64,10 +64,10 @@ public class ${this.mangle($schema.getName())}#if ($schema.isError()) extends or
 
 #if (!$schema.isError())
   private static final BinaryMessageEncoder<${this.mangle($schema.getName())}> ENCODER =
-      new BinaryMessageEncoder<${this.mangle($schema.getName())}>(MODEL$, SCHEMA$);
+      new BinaryMessageEncoder<>(MODEL$, SCHEMA$);
 
   private static final BinaryMessageDecoder<${this.mangle($schema.getName())}> DECODER =
-      new BinaryMessageDecoder<${this.mangle($schema.getName())}>(MODEL$, SCHEMA$);
+      new BinaryMessageDecoder<>(MODEL$, SCHEMA$);
 
   /**
    * Return the BinaryMessageEncoder instance used by this class.
@@ -91,7 +91,7 @@ public class ${this.mangle($schema.getName())}#if ($schema.isError()) extends or
    * @return a BinaryMessageDecoder instance for this class backed by the given SchemaStore
    */
   public static BinaryMessageDecoder<${this.mangle($schema.getName())}> createDecoder(SchemaStore resolver) {
-    return new BinaryMessageDecoder<${this.mangle($schema.getName())}>(MODEL$, SCHEMA$, resolver);
+    return new BinaryMessageDecoder<>(MODEL$, SCHEMA$, resolver);
   }
 
   /**