From 402cfa1e1e2994f7bb1b783cf823021b54fb175e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= <koloite@gmail.com>
Date: Mon, 16 Mar 2020 03:37:00 +0100
Subject: [PATCH] fix: ignore added interface methods for generated code (#101)

Adds generic ignore rules for added methods to interfaces in the generated code.

Fixes #99
---
 .../clirr-ignored-differences.xml             | 30 ++-----------------
 .../clirr-ignored-differences.xml             | 10 +++++++
 .../clirr-ignored-differences.xml             | 15 ++--------
 3 files changed, 16 insertions(+), 39 deletions(-)
 create mode 100644 proto-google-cloud-spanner-admin-instance-v1/clirr-ignored-differences.xml

diff --git a/proto-google-cloud-spanner-admin-database-v1/clirr-ignored-differences.xml b/proto-google-cloud-spanner-admin-database-v1/clirr-ignored-differences.xml
index e041533fa5..45f8b9d3e8 100644
--- a/proto-google-cloud-spanner-admin-database-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-spanner-admin-database-v1/clirr-ignored-differences.xml
@@ -1,34 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
 <differences>
+  <!-- Ignore all new methods in interfaces in the generated code. -->
   <difference>
     <differenceType>7012</differenceType>
-    <className>com/google/spanner/admin/database/v1/DatabaseOrBuilder</className>
-    <method>* getCreateTime()</method>
-  </difference>
-  <difference>
-    <differenceType>7012</differenceType>
-    <className>com/google/spanner/admin/database/v1/DatabaseOrBuilder</className>
-    <method>* getCreateTimeOrBuilder()</method>
-  </difference>
-  <difference>
-    <differenceType>7012</differenceType>
-    <className>com/google/spanner/admin/database/v1/DatabaseOrBuilder</className>
-    <method>* getRestoreInfo()</method>
-  </difference>
-  <difference>
-    <differenceType>7012</differenceType>
-    <className>com/google/spanner/admin/database/v1/DatabaseOrBuilder</className>
-    <method>* getRestoreInfoOrBuilder()</method>
-  </difference>
-  <difference>
-    <differenceType>7012</differenceType>
-    <className>com/google/spanner/admin/database/v1/DatabaseOrBuilder</className>
-    <method>* hasCreateTime()</method>
-  </difference>
-  <difference>
-    <differenceType>7012</differenceType>
-    <className>com/google/spanner/admin/database/v1/DatabaseOrBuilder</className>
-    <method>* hasRestoreInfo()</method>
+    <className>com/google/spanner/admin/database/v1/*</className>
+    <method>*</method>
   </difference>
 </differences>
diff --git a/proto-google-cloud-spanner-admin-instance-v1/clirr-ignored-differences.xml b/proto-google-cloud-spanner-admin-instance-v1/clirr-ignored-differences.xml
new file mode 100644
index 0000000000..5fd897311f
--- /dev/null
+++ b/proto-google-cloud-spanner-admin-instance-v1/clirr-ignored-differences.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
+<differences>
+  <!-- Ignore all new methods in interfaces in the generated code. -->
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/spanner/admin/instance/v1/*</className>
+    <method>*</method>
+  </difference>
+</differences>
diff --git a/proto-google-cloud-spanner-v1/clirr-ignored-differences.xml b/proto-google-cloud-spanner-v1/clirr-ignored-differences.xml
index c210bad73e..37898f573b 100644
--- a/proto-google-cloud-spanner-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-spanner-v1/clirr-ignored-differences.xml
@@ -1,19 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
 <differences>
+  <!-- Ignore all new methods in interfaces in the generated code. -->
   <difference>
     <differenceType>7012</differenceType>
-    <className>com/google/spanner/v1/ExecuteSqlRequestOrBuilder</className>
-    <method>* getQueryOptions()</method>
-  </difference>
-  <difference>
-    <differenceType>7012</differenceType>
-    <className>com/google/spanner/v1/ExecuteSqlRequestOrBuilder</className>
-    <method>* getQueryOptionsOrBuilder()</method>
-  </difference>
-  <difference>
-    <differenceType>7012</differenceType>
-    <className>com/google/spanner/v1/ExecuteSqlRequestOrBuilder</className>
-    <method>* hasQueryOptions()</method>
+    <className>com/google/spanner/v1/*</className>
+    <method>*</method>
   </difference>
 </differences>