Rebase on main

apache · Aug 21, 2024 · a0792d5 · a0792d5
1 parent 7d622c4
commit a0792d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/api/src/main/java/org/apache/iceberg/types/Types.java b/api/src/main/java/org/apache/iceberg/types/Types.java
@@ -512,7 +512,7 @@ public NestedField withWriteDefault(Object newWriteDefault) {
     }
 
     public NestedField withFieldId(int newId) {
-      return new NestedField(isOptional, newId, name, type, doc);
+      return new NestedField(isOptional, newId, name, type, doc, initialDefault, writeDefault);
     }
 
     public int fieldId() {

diff --git a/core/src/test/java/org/apache/iceberg/avro/TestReadDefaultValues.java b/core/src/test/java/org/apache/iceberg/avro/TestReadDefaultValues.java
@@ -41,7 +41,7 @@ public class TestReadDefaultValues {
 
   @Rule public TemporaryFolder temp = new TemporaryFolder();
 
-  private static final Object[][] typesWithDefaults =
+  private static final Object[][] TYPES_WITH_DEFAULTS =
       new Object[][] {
         {Types.BooleanType.get(), "true"},
         {Types.IntegerType.get(), "1"},
@@ -110,7 +110,7 @@ public class TestReadDefaultValues {
 
   @Test
   public void testDefaultValueApplied() throws IOException {
-    for (Object[] typeWithDefault : typesWithDefaults) {
+    for (Object[] typeWithDefault : TYPES_WITH_DEFAULTS) {
       Type type = (Type) typeWithDefault[0];
       String defaultValueJson = (String) typeWithDefault[1];
       Object defaultValue = SingleValueParser.fromJson(type, defaultValueJson);
@@ -155,7 +155,7 @@ public void testDefaultValueApplied() throws IOException {
 
   @Test
   public void testDefaultValueNotApplied() throws IOException {
-    for (Object[] typeWithDefault : typesWithDefaults) {
+    for (Object[] typeWithDefault : TYPES_WITH_DEFAULTS) {
       Type type = (Type) typeWithDefault[0];
       String defaultValueJson = (String) typeWithDefault[1];
       Object defaultValue = SingleValueParser.fromJson(type, defaultValueJson);