chore: solve merge conflicts

Author: olavloite

google-cloud-spanner/src/main/java/com/google/cloud/spanner/ForwardingStructReader.java

@@ -136,12 +136,12 @@ public double getDouble(String columnName) {
 
   @Override
   public BigDecimal getBigDecimal(int columnIndex) {
-    return delegate.getBigDecimal(columnIndex);
+    return delegate.get().getBigDecimal(columnIndex);
   }
 
   @Override
   public BigDecimal getBigDecimal(String columnName) {
-    return delegate.getBigDecimal(columnName);
+    return delegate.get().getBigDecimal(columnName);
   }
 
   @Override
@@ -266,12 +266,12 @@ public List<Double> getDoubleList(String columnName) {
 
   @Override
   public List<BigDecimal> getBigDecimalList(int columnIndex) {
-    return delegate.getBigDecimalList(columnIndex);
+    return delegate.get().getBigDecimalList(columnIndex);
   }
 
   @Override
   public List<BigDecimal> getBigDecimalList(String columnName) {
-    return delegate.getBigDecimalList(columnName);
+    return delegate.get().getBigDecimalList(columnName);
   }
 
   @Override

google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java

@@ -272,9 +272,12 @@ public void numericNull() {
     assertThat(v.isNull()).isTrue();
     assertThat(v.toString()).isEqualTo(NULL_STRING);
 
-    expectedException.expect(IllegalStateException.class);
-    expectedException.expectMessage("null value");
-    v.getNumeric();
+    try {
+      v.getNumeric();
+      fail("missing expected IllegalStateException");
+    } catch (IllegalStateException e) {
+      assertThat(e.getMessage()).contains("null value");
+    }
   }
 
   @Test
@@ -641,18 +644,24 @@ public void numericArrayNull() {
     assertThat(v.isNull()).isTrue();
     assertThat(v.toString()).isEqualTo(NULL_STRING);
 
-    expectedException.expect(IllegalStateException.class);
-    expectedException.expectMessage("null value");
-    v.getNumericArray();
+    try {
+      v.getNumericArray();
+      fail("Expected exception");
+    } catch (IllegalStateException e) {
+      assertThat(e.getMessage().contains("Expected: ARRAY<INT64> actual: ARRAY<FLOAT64>"));
+    }
   }
 
   @Test
   public void numericArrayTryGetInt64Array() {
     Value value = Value.numericArray(Arrays.asList(BigDecimal.valueOf(1, 1)));
 
-    expectedException.expect(IllegalStateException.class);
-    expectedException.expectMessage("Expected: ARRAY<INT64> actual: ARRAY<NUMERIC>");
-    value.getInt64Array();
+    try {
+      value.getInt64Array();
+      fail("Expected exception");
+    } catch (IllegalStateException e) {
+      assertThat(e.getMessage().contains("Expected: ARRAY<INT64> actual: ARRAY<NUMERIC>"));
+    }
   }
 
   @Test