From 5c4c8c58674490ba524b678b409b8b19184af02f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Knut=20Olav=20L=C3=B8ite?= <koloite@gmail.com>
Date: Thu, 22 Oct 2020 02:42:51 +0200
Subject: [PATCH] fix!: initialize should be protected (#536)

* fix!: iniialize should be protected

* fix: fix clirr build error
---
 .../clirr-ignored-differences.xml               | 17 +++++++++++++++++
 .../cloud/spanner/AbstractLazyInitializer.java  |  2 +-
 .../cloud/spanner/LazySpannerInitializer.java   |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/google-cloud-spanner/clirr-ignored-differences.xml b/google-cloud-spanner/clirr-ignored-differences.xml
index 1f7beb76e9..b68f50d78e 100644
--- a/google-cloud-spanner/clirr-ignored-differences.xml
+++ b/google-cloud-spanner/clirr-ignored-differences.xml
@@ -377,4 +377,21 @@
     <className>com/google/cloud/spanner/AsyncTransactionManager</className>
     <method>com.google.api.core.ApiFuture closeAsync()</method>
   </difference>
+
+  <!-- Note: The following change for the LazySpannerInitializer.initialize() method must be specified twice, both with return type java.lang.Object and with com.google.cloud.spanner.Spanner. -->
+  <difference>
+    <differenceType>7009</differenceType>
+    <className>com/google/cloud/spanner/LazySpannerInitializer</className>
+    <method>com.google.cloud.spanner.Spanner initialize()</method>
+  </difference>
+  <difference>
+    <differenceType>7009</differenceType>
+    <className>com/google/cloud/spanner/LazySpannerInitializer</className>
+    <method>java.lang.Object initialize()</method>
+  </difference>
+  <difference>
+    <differenceType>7009</differenceType>
+    <className>com/google/cloud/spanner/AbstractLazyInitializer</className>
+    <method>java.lang.Object initialize()</method>
+  </difference>
 </differences>
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractLazyInitializer.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractLazyInitializer.java
index 0b1a4b3fc2..bc595b1466 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractLazyInitializer.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractLazyInitializer.java
@@ -51,5 +51,5 @@ public T get() throws Exception {
    * Initializes the actual object that should be returned. Is called once the first time an
    * instance of T is required.
    */
-  public abstract T initialize() throws Exception;
+  protected abstract T initialize() throws Exception;
 }
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/LazySpannerInitializer.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/LazySpannerInitializer.java
index a157a5ac3f..009c276751 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/LazySpannerInitializer.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/LazySpannerInitializer.java
@@ -23,7 +23,7 @@ public class LazySpannerInitializer extends AbstractLazyInitializer<Spanner> {
    * custom configuration.
    */
   @Override
-  public Spanner initialize() throws Exception {
+  protected Spanner initialize() throws Exception {
     return SpannerOptions.newBuilder().build().getService();
   }
 }