From 8d63ab51cdfe6f81ced2a2d1dbe472980012132b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 11 Aug 2021 16:11:31 +0000 Subject: [PATCH 1/7] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 909431ad..8e0c9584 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ com.google.cloud google-cloud-shared-dependencies - 1.4.0 + 2.0.0 pom import From 4fe82925b37d2243fe649e251406721f6ebb4c0a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 11 Aug 2021 20:48:05 +0000 Subject: [PATCH 2/7] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 909431ad..73a1fa38 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ com.google.cloud google-cloud-shared-dependencies - 1.4.0 + 2.0.1 pom import From 06a4eefd11d2017c10d085534248c7216463e04a Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Wed, 11 Aug 2021 14:03:03 -0700 Subject: [PATCH 3/7] chore: update ExecutorProvider for BackgroundExecutorProvider deprecated ExecutorProvider for BackgroundExecutorProvider --- .../cloud/devtools/containeranalysis/v1/GrafeasUtils.java | 2 +- .../devtools/containeranalysis/v1/ITGrafeasInteropTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/GrafeasUtils.java b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/GrafeasUtils.java index d21869d5..6c0cd976 100644 --- a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/GrafeasUtils.java +++ b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/GrafeasUtils.java @@ -31,7 +31,7 @@ static GrafeasSettings transformSettings(ContainerAnalysisSettings settings) thr .setClock(settings.getClock()) .setCredentialsProvider(settings.getCredentialsProvider()) .setEndpoint(settings.getEndpoint()) - .setExecutorProvider(settings.getExecutorProvider()) + .setBackgroundExecutorProvider(settings.getBackgroundExecutorProvider()) .setHeaderProvider(settings.getHeaderProvider()) .setTransportChannelProvider(settings.getTransportChannelProvider()) .setWatchdogCheckInterval(settings.getWatchdogCheckInterval()) diff --git a/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ITGrafeasInteropTest.java b/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ITGrafeasInteropTest.java index 53bc9630..ca5a2584 100644 --- a/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ITGrafeasInteropTest.java +++ b/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ITGrafeasInteropTest.java @@ -39,9 +39,9 @@ public void createsGrafeasClient() throws IOException { GrafeasSettings grafeasSettings = grafeasClient.getSettings(); assertEquals(settings.getClock(), grafeasSettings.getClock()); - assertEquals(settings.getExecutorProvider(), grafeasSettings.getExecutorProvider()); + assertEquals(settings.getBackgroundExecutorProvider(), grafeasSettings.getBackgroundExecutorProvider()); assertEquals(settings.getEndpoint(), grafeasSettings.getEndpoint()); - assertEquals(settings.getExecutorProvider(), grafeasSettings.getExecutorProvider()); + assertEquals(settings.getBackgroundExecutorProvider(), grafeasSettings.getBackgroundExecutorProvider()); assertEquals(settings.getHeaderProvider(), grafeasSettings.getHeaderProvider()); assertEquals( settings.getTransportChannelProvider(), grafeasSettings.getTransportChannelProvider()); From 6b2e099f136602edfeeac09d9b5a8f4730b27757 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Wed, 11 Aug 2021 14:14:01 -0700 Subject: [PATCH 4/7] chore: format --- .../devtools/containeranalysis/v1/ITGrafeasInteropTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ITGrafeasInteropTest.java b/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ITGrafeasInteropTest.java index ca5a2584..3a3438c1 100644 --- a/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ITGrafeasInteropTest.java +++ b/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ITGrafeasInteropTest.java @@ -39,9 +39,11 @@ public void createsGrafeasClient() throws IOException { GrafeasSettings grafeasSettings = grafeasClient.getSettings(); assertEquals(settings.getClock(), grafeasSettings.getClock()); - assertEquals(settings.getBackgroundExecutorProvider(), grafeasSettings.getBackgroundExecutorProvider()); + assertEquals( + settings.getBackgroundExecutorProvider(), grafeasSettings.getBackgroundExecutorProvider()); assertEquals(settings.getEndpoint(), grafeasSettings.getEndpoint()); - assertEquals(settings.getBackgroundExecutorProvider(), grafeasSettings.getBackgroundExecutorProvider()); + assertEquals( + settings.getBackgroundExecutorProvider(), grafeasSettings.getBackgroundExecutorProvider()); assertEquals(settings.getHeaderProvider(), grafeasSettings.getHeaderProvider()); assertEquals( settings.getTransportChannelProvider(), grafeasSettings.getTransportChannelProvider()); From 8ec4e324da6d26a21b1ff3a079fd200e3f4c6003 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Wed, 11 Aug 2021 15:35:51 -0700 Subject: [PATCH 5/7] chore: update GrafeasSettings --- .../cloud/devtools/containeranalysis/v1/GrafeasUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/GrafeasUtils.java b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/GrafeasUtils.java index 6c0cd976..1e1416d5 100644 --- a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/GrafeasUtils.java +++ b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/GrafeasUtils.java @@ -31,7 +31,7 @@ static GrafeasSettings transformSettings(ContainerAnalysisSettings settings) thr .setClock(settings.getClock()) .setCredentialsProvider(settings.getCredentialsProvider()) .setEndpoint(settings.getEndpoint()) - .setBackgroundExecutorProvider(settings.getBackgroundExecutorProvider()) + .setExecutorProvider(settings.getBackgroundExecutorProvider()) .setHeaderProvider(settings.getHeaderProvider()) .setTransportChannelProvider(settings.getTransportChannelProvider()) .setWatchdogCheckInterval(settings.getWatchdogCheckInterval()) From 5450a5bf58b86ce01c116897bb6ea89ee64bacc5 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Wed, 11 Aug 2021 15:38:44 -0700 Subject: [PATCH 6/7] chore: update GrafeasSettings --- .../devtools/containeranalysis/v1/ITGrafeasInteropTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ITGrafeasInteropTest.java b/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ITGrafeasInteropTest.java index 3a3438c1..2a23f386 100644 --- a/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ITGrafeasInteropTest.java +++ b/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ITGrafeasInteropTest.java @@ -40,10 +40,10 @@ public void createsGrafeasClient() throws IOException { assertEquals(settings.getClock(), grafeasSettings.getClock()); assertEquals( - settings.getBackgroundExecutorProvider(), grafeasSettings.getBackgroundExecutorProvider()); + settings.getBackgroundExecutorProvider(), grafeasSettings.getExecutorProvider()); assertEquals(settings.getEndpoint(), grafeasSettings.getEndpoint()); assertEquals( - settings.getBackgroundExecutorProvider(), grafeasSettings.getBackgroundExecutorProvider()); + settings.getBackgroundExecutorProvider(), grafeasSettings.getExecutorProvider()); assertEquals(settings.getHeaderProvider(), grafeasSettings.getHeaderProvider()); assertEquals( settings.getTransportChannelProvider(), grafeasSettings.getTransportChannelProvider()); From 6f03c8d80f65cc4a949b032fb2c9967b7606a4a3 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Wed, 11 Aug 2021 15:39:28 -0700 Subject: [PATCH 7/7] chore: format --- .../devtools/containeranalysis/v1/ITGrafeasInteropTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ITGrafeasInteropTest.java b/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ITGrafeasInteropTest.java index 2a23f386..5440cd24 100644 --- a/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ITGrafeasInteropTest.java +++ b/google-cloud-containeranalysis/src/test/java/com/google/cloud/devtools/containeranalysis/v1/ITGrafeasInteropTest.java @@ -39,11 +39,9 @@ public void createsGrafeasClient() throws IOException { GrafeasSettings grafeasSettings = grafeasClient.getSettings(); assertEquals(settings.getClock(), grafeasSettings.getClock()); - assertEquals( - settings.getBackgroundExecutorProvider(), grafeasSettings.getExecutorProvider()); + assertEquals(settings.getBackgroundExecutorProvider(), grafeasSettings.getExecutorProvider()); assertEquals(settings.getEndpoint(), grafeasSettings.getEndpoint()); - assertEquals( - settings.getBackgroundExecutorProvider(), grafeasSettings.getExecutorProvider()); + assertEquals(settings.getBackgroundExecutorProvider(), grafeasSettings.getExecutorProvider()); assertEquals(settings.getHeaderProvider(), grafeasSettings.getHeaderProvider()); assertEquals( settings.getTransportChannelProvider(), grafeasSettings.getTransportChannelProvider());