From b0cf525ac98a2103d251b16cd7b75aed0a4a817e Mon Sep 17 00:00:00 2001
From: Sagar Agarwal <sagarwaal@google.com>
Date: Tue, 1 Apr 2025 12:44:21 +0530
Subject: [PATCH 1/2] fix: Provide default implementations for Interval methods
 in AbstractStructReader

---
 .../com/google/cloud/spanner/AbstractStructReader.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractStructReader.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractStructReader.java
index 10287544e96..e5b9fa00123 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractStructReader.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractStructReader.java
@@ -67,7 +67,9 @@ protected String getPgJsonbInternal(int columnIndex) {
 
   protected abstract Date getDateInternal(int columnIndex);
 
-  protected abstract Interval getIntervalInternal(int columnIndex);
+  protected Interval getIntervalInternal(int columnIndex) {
+    throw new UnsupportedOperationException("Not implemented");
+  }
 
   protected <T extends AbstractMessage> T getProtoMessageInternal(int columnIndex, T message) {
     throw new UnsupportedOperationException("Not implemented");
@@ -130,7 +132,9 @@ protected List<String> getPgJsonbListInternal(int columnIndex) {
 
   protected abstract List<Date> getDateListInternal(int columnIndex);
 
-  protected abstract List<Interval> getIntervalListInternal(int columnIndex);
+  protected List<Interval> getIntervalListInternal(int columnIndex) {
+    throw new UnsupportedOperationException("Not implemented");
+  }
 
   protected abstract List<Struct> getStructListInternal(int columnIndex);
 

From 588ab30f60df08af1edbc553488cfa19cfdd8842 Mon Sep 17 00:00:00 2001
From: Sagar Agarwal <sagarwaal@google.com>
Date: Wed, 2 Apr 2025 17:07:32 +0530
Subject: [PATCH 2/2] addressed PR comments

---
 google-cloud-spanner/clirr-ignored-differences.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/google-cloud-spanner/clirr-ignored-differences.xml b/google-cloud-spanner/clirr-ignored-differences.xml
index 735b28dae2a..14ccf81c057 100644
--- a/google-cloud-spanner/clirr-ignored-differences.xml
+++ b/google-cloud-spanner/clirr-ignored-differences.xml
@@ -597,16 +597,6 @@
     <className>com/google/cloud/spanner/StructReader</className>
     <method>java.util.List getIntervalList(java.lang.String)</method>
   </difference>
-  <difference>
-    <differenceType>7013</differenceType>
-    <className>com/google/cloud/spanner/AbstractStructReader</className>
-    <method>com.google.cloud.spanner.Interval getIntervalInternal(int)</method>
-  </difference>
-  <difference>
-    <differenceType>7013</differenceType>
-    <className>com/google/cloud/spanner/AbstractStructReader</className>
-    <method>java.util.List getIntervalListInternal(int)</method>
-  </difference>
   <difference>
     <differenceType>7013</differenceType>
     <className>com/google/cloud/spanner/Value</className>