Replace usage of shaded Guava Supplier with java.util.function.Suppli…

…er (apache#9693) - it is a bad practice to reference shaded classes in other modules. - in this case, it is possible to replace the usage of the shaded Guava Supplier with java.util.function.Supplier
xche · Feb 25, 2021 · f42f625 · f42f625
1 parent 666af1a
commit f42f625
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/...n/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/JCloudBlobStoreProvider.java b/...n/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/JCloudBlobStoreProvider.java
@@ -291,7 +291,7 @@ public ProviderMetadata getProviderMetadata() {
 
         if (config.getProviderCredentials() != null) {
                 return contextBuilder
-                        .credentialsSupplier(config.getCredentials())
+                        .credentialsSupplier(config.getCredentials()::get)
                         .buildView(BlobStoreContext.class)
                         .getBlobStore();
         } else {
@@ -358,7 +358,7 @@ public ProviderMetadata getProviderMetadata() {
 
         if (config.getProviderCredentials() != null) {
             return contextBuilder
-                    .credentialsSupplier(config.getCredentials())
+                    .credentialsSupplier(config.getCredentials()::get)
                     .buildView(BlobStoreContext.class)
                     .getBlobStore();
         } else {

diff --git a/...ava/org/apache/bookkeeper/mledger/offload/jcloud/provider/TieredStorageConfiguration.java b/...ava/org/apache/bookkeeper/mledger/offload/jcloud/provider/TieredStorageConfiguration.java
@@ -27,11 +27,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.pulsar.jcloud.shade.com.google.common.base.Supplier;
 import org.jclouds.Constants;
 import org.jclouds.aws.s3.AWSS3ProviderMetadata;
 import org.jclouds.blobstore.BlobStore;

diff --git a/...rg/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderBase.java b/...rg/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderBase.java
@@ -24,6 +24,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Supplier;
 import org.apache.bookkeeper.client.BookKeeper;
 import org.apache.bookkeeper.client.LedgerHandle;
 import org.apache.bookkeeper.client.PulsarMockBookKeeper;
@@ -34,7 +35,6 @@
 import org.apache.bookkeeper.mledger.offload.jcloud.provider.TieredStorageConfiguration;
 import org.apache.bookkeeper.util.ZkUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.pulsar.jcloud.shade.com.google.common.base.Supplier;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.MockZooKeeper;
 import org.apache.zookeeper.data.ACL;

diff --git a/...rg/apache/bookkeeper/mledger/offload/jcloud/provider/TieredStorageConfigurationTests.java b/...rg/apache/bookkeeper/mledger/offload/jcloud/provider/TieredStorageConfigurationTests.java
@@ -19,17 +19,14 @@
 package org.apache.bookkeeper.mledger.offload.jcloud.provider;
 
 import static org.testng.Assert.assertEquals;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.apache.pulsar.jcloud.shade.com.google.common.base.Supplier;
-
 import org.jclouds.domain.Credentials;
 import org.testng.annotations.Test;
 
 public class TieredStorageConfigurationTests {
-    
+
     /*
      * Previous property names, for backwards-compatibility.
      */