From 2348b27c14a931d725ff8960f650fbeb5e1ebce4 Mon Sep 17 00:00:00 2001 From: Michele Sinicco Date: Wed, 30 Dec 2020 16:43:08 +0000 Subject: [PATCH 1/3] Fix #23, fix #33: close uploadStub when closing PhotosLibraryClient --- .../google/photos/library/v1/PhotosLibraryClient.java | 11 +++++++++++ .../v1/internal/InternalPhotosLibraryClient.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibraryClient.java b/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibraryClient.java index 447bf08..9cb0768 100644 --- a/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibraryClient.java +++ b/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibraryClient.java @@ -319,4 +319,15 @@ public final ListMediaItemsPagedResponse listMediaItems() { public final ListSharedAlbumsPagedResponse listSharedAlbums() { return super.listSharedAlbums(false); } + + @Override + public void close() { + super.close(); + try { + uploadStub.close(); + } catch (Exception e) { + // Currently no exceptions are thrown and BackgroundResource.close() is going to be + // redefined not to thrown Exception anyway + } + } } diff --git a/photoslibraryapi/src/main/java/com/google/photos/library/v1/internal/InternalPhotosLibraryClient.java b/photoslibraryapi/src/main/java/com/google/photos/library/v1/internal/InternalPhotosLibraryClient.java index 3ddbae6..79a4156 100644 --- a/photoslibraryapi/src/main/java/com/google/photos/library/v1/internal/InternalPhotosLibraryClient.java +++ b/photoslibraryapi/src/main/java/com/google/photos/library/v1/internal/InternalPhotosLibraryClient.java @@ -1884,7 +1884,7 @@ public final UnaryCallable updateMediaItemCal } @Override - public final void close() { + public void close() { stub.close(); } From b6c8cf25e623ed43bfeab43383f6608c51d1dffe Mon Sep 17 00:00:00 2001 From: Michele Sinicco Date: Sun, 7 Feb 2021 19:05:21 +0000 Subject: [PATCH 2/3] Not ignoring exceptions in PhotosLibraryClient.close() --- .../com/google/photos/library/v1/PhotosLibraryClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibraryClient.java b/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibraryClient.java index 9cb0768..5b5b198 100644 --- a/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibraryClient.java +++ b/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibraryClient.java @@ -326,8 +326,8 @@ public void close() { try { uploadStub.close(); } catch (Exception e) { - // Currently no exceptions are thrown and BackgroundResource.close() is going to be - // redefined not to thrown Exception anyway + // workaround to avoid to modify parent's signature. Should not be needed starting from gax 2.0.0 + throw new RuntimeException(e); } } } From 352caf14ae7ce82760b95f9922d34662c9b24a66 Mon Sep 17 00:00:00 2001 From: Michele Sinicco Date: Wed, 10 Feb 2021 08:24:39 +0000 Subject: [PATCH 3/3] Fixed comment length --- .../java/com/google/photos/library/v1/PhotosLibraryClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibraryClient.java b/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibraryClient.java index 5b5b198..4a761a5 100644 --- a/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibraryClient.java +++ b/photoslibraryapi/src/main/java/com/google/photos/library/v1/PhotosLibraryClient.java @@ -326,7 +326,7 @@ public void close() { try { uploadStub.close(); } catch (Exception e) { - // workaround to avoid to modify parent's signature. Should not be needed starting from gax 2.0.0 + // workaround to avoid to modify parent's signature. Should not be needed starting from gax v2 throw new RuntimeException(e); } }