Merge branch 'main' into registry/fix-sonar-issues

Author: iamabhilaksh

CLAUDE.md

@@ -97,6 +97,7 @@ Conformance tests require valid cloud credentials:
 ### Dependency management
 - Never add cloud specific dependency in cloud-agnostic package.
   - for example, `docstore-client` should never depend upon `multicloud-common-gcp`, `docstore-aws` etc
+- Never put any provider specific code, documentation, keywords in client, driver packages such as anything in `docstore-client` module.
 
 ### Adding New Functionality
 
@@ -105,7 +106,7 @@ Conformance tests require valid cloud credentials:
 3. Implement functionality in each provider-specific module (aws, gcp, ali)
 4. Add unit tests to provider modules
 5. Add/update conformance tests in `-client` module
-6. Ensure checkstyle passes (Google Java Style Guide)
+6. Ensure checkstyle passes (Google Java Style Guide), the checkstyle.xml are in config/
 
 ### Working with Multiple Cloud Providers
 

blob/blob-ali/pom.xml

@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.wiremock</groupId>
             <artifactId>wiremock</artifactId>
-            <version>3.12.1</version>
+            <version>3.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

blob/blob-ali/src/main/java/com/salesforce/multicloudj/blob/ali/AliBlobClient.java

@@ -15,115 +15,120 @@
 import com.salesforce.multicloudj.common.exceptions.SubstrateSdkException;
 import com.salesforce.multicloudj.common.exceptions.UnknownException;
 import com.salesforce.multicloudj.common.provider.Provider;
-
 import java.util.stream.Collectors;
 
 /**
- * An implementation of the {@link AbstractBlobClient} for Ali OSS
- * AliBlobClient is service client for interacting with Alibaba Cloud Blob Storage.
+ * An implementation of the {@link AbstractBlobClient} for Ali OSS AliBlobClient is service client
+ * for interacting with Alibaba Cloud Blob Storage.
  *
- * <p>This class provides methods to access Ali resources using Alibaba OSS JDK to interact
- * with the OSS service.
+ * <p>This class provides methods to access Ali resources using Alibaba OSS JDK to interact with the
+ * OSS service.
  */
 public class AliBlobClient extends AbstractBlobClient<AliBlobClient> {
-    private OSS ossClient;
+  private OSS ossClient;
 
-    /**
-     * Constructs an {@link AliBlobClient} using the provided builder.
-     *
-     * @param builder the builder to use to construct the AliBlobClient
-     */
-    protected AliBlobClient(Builder builder) {
-        super(builder);
+  /**
+   * Constructs an {@link AliBlobClient} using the provided builder.
+   *
+   * @param builder the builder to use to construct the AliBlobClient
+   */
+  protected AliBlobClient(Builder builder) {
+    super(builder);
 
-        String endpoint = "https://oss-" + region + ".aliyuncs.com";
-        if (builder.getEndpoint() != null) {
-            endpoint = builder.getEndpoint().getHost();
-        }
-        OSSClientBuilder.OSSClientBuilderImpl ossClientBuilderImpl = OSSClientBuilder.create().endpoint(endpoint);
-        ClientBuilderConfiguration clientBuilderConfiguration = new ClientBuilderConfiguration();
-        clientBuilderConfiguration.setSignatureVersion(SignVersion.V4);
-        if (builder.getProxyEndpoint() != null) {
-            clientBuilderConfiguration.setProxyHost(builder.getProxyEndpoint().getHost());
-            clientBuilderConfiguration.setProxyPort(builder.getProxyEndpoint().getPort());
-        }
-        CredentialsProvider credentialsProvider = OSSCredentialsProvider.getCredentialsProvider(credentialsOverrider, region);
-        if (credentialsProvider != null) {
-            ossClientBuilderImpl.credentialsProvider(credentialsProvider);
-        }
-        ossClientBuilderImpl.clientConfiguration(clientBuilderConfiguration);
-        ossClient = ossClientBuilderImpl.build();
+    String endpoint = "https://oss-" + region + ".aliyuncs.com";
+    if (builder.getEndpoint() != null) {
+      endpoint = builder.getEndpoint().getHost();
     }
-
-    /**
-     * Lists all buckets in the Alibaba Cloud Blob Storage account associated with this client.
-     *
-     * @return a {@link ListBucketsResponse} containing a list of all buckets int the current region for this account
-     */
-    @Override
-    protected ListBucketsResponse doListBuckets() {
-        return ListBucketsResponse.builder().bucketInfoList(ossClient.listBuckets().stream().map(bucket -> BucketInfo.builder()
-                .name(bucket.getName())
-                .region(bucket.getRegion())
-                .creationDate(bucket.getCreationDate().toInstant())
-                .build()).collect(Collectors.toList())).build();
+    OSSClientBuilder.OSSClientBuilderImpl ossClientBuilderImpl =
+        OSSClientBuilder.create().endpoint(endpoint);
+    ClientBuilderConfiguration clientBuilderConfiguration = new ClientBuilderConfiguration();
+    clientBuilderConfiguration.setSignatureVersion(SignVersion.V4);
+    if (builder.getProxyEndpoint() != null) {
+      clientBuilderConfiguration.setProxyHost(builder.getProxyEndpoint().getHost());
+      clientBuilderConfiguration.setProxyPort(builder.getProxyEndpoint().getPort());
     }
-
-    /**
-     * Creates a new bucket with the specified name.
-     *
-     * @param bucketName The name of the bucket to create
-     */
-    @Override
-    protected void doCreateBucket(String bucketName) {
-        ossClient.createBucket(bucketName);
+    CredentialsProvider credentialsProvider =
+        OSSCredentialsProvider.getCredentialsProvider(credentialsOverrider, region);
+    if (credentialsProvider != null) {
+      ossClientBuilderImpl.credentialsProvider(credentialsProvider);
     }
+    ossClientBuilderImpl.clientConfiguration(clientBuilderConfiguration);
+    ossClient = ossClientBuilderImpl.build();
+  }
 
-    /**
-     * Returns a {@link Provider.Builder} for creating a Provider for this class.
-     *
-     * @return a {@link Provider.Builder} for creating a Provider for this class
-     */
-    @Override
-    public Provider.Builder builder() {
-        return new AliBlobStore.Builder();
-    }
+  /**
+   * Lists all buckets in the Alibaba Cloud Blob Storage account associated with this client.
+   *
+   * @return a {@link ListBucketsResponse} containing a list of all buckets int the current region
+   *     for this account
+   */
+  @Override
+  protected ListBucketsResponse doListBuckets() {
+    return ListBucketsResponse.builder()
+        .bucketInfoList(
+            ossClient.listBuckets().stream()
+                .map(
+                    bucket ->
+                        BucketInfo.builder()
+                            .name(bucket.getName())
+                            .region(bucket.getRegion())
+                            .creationDate(bucket.getCreationDate().toInstant())
+                            .build())
+                .collect(Collectors.toList()))
+        .build();
+  }
 
-    /**
-     * Returns the appropriate SubstrateSdkException subclass for the given Throwable.
-     */
-    @Override
-    public Class<? extends SubstrateSdkException> getException(Throwable t) {
-        if (t instanceof SubstrateSdkException) {
-            return (Class<? extends SubstrateSdkException>) t.getClass();
-        } else if (t instanceof ServiceException) {
-            String errorCode = ((ServiceException) t).getErrorCode();
-            return ErrorCodeMapping.getException(errorCode);
-        } else if (t instanceof ClientException) {
-            return InvalidArgumentException.class;
-        }
-        return UnknownException.class;
+  /**
+   * Creates a new bucket with the specified name.
+   *
+   * @param bucketName The name of the bucket to create
+   */
+  @Override
+  protected void doCreateBucket(String bucketName) {
+    ossClient.createBucket(bucketName);
+  }
+
+  /**
+   * Returns a {@link Provider.Builder} for creating a Provider for this class.
+   *
+   * @return a {@link Provider.Builder} for creating a Provider for this class
+   */
+  @Override
+  public Provider.Builder builder() {
+    return new AliBlobStore.Builder();
+  }
+
+  /** Returns the appropriate SubstrateSdkException subclass for the given Throwable. */
+  @Override
+  public Class<? extends SubstrateSdkException> getException(Throwable t) {
+    if (t instanceof SubstrateSdkException) {
+      return (Class<? extends SubstrateSdkException>) t.getClass();
+    } else if (t instanceof ServiceException) {
+      String errorCode = ((ServiceException) t).getErrorCode();
+      return ErrorCodeMapping.getException(errorCode);
+    } else if (t instanceof ClientException) {
+      return InvalidArgumentException.class;
     }
+    return UnknownException.class;
+  }
 
-    /**
-     * Closes the underlying OSS client and releases any resources.
-     */
-    @Override
-    public void close() {
-        if (ossClient != null) {
-            ossClient.shutdown();
-        }
+  /** Closes the underlying OSS client and releases any resources. */
+  @Override
+  public void close() {
+    if (ossClient != null) {
+      ossClient.shutdown();
     }
+  }
 
-    public static class Builder extends AbstractBlobClient.Builder<AliBlobClient> {
+  public static class Builder extends AbstractBlobClient.Builder<AliBlobClient> {
 
-        public Builder() {
-            providerId(AliConstants.PROVIDER_ID);
-        }
+    public Builder() {
+      providerId(AliConstants.PROVIDER_ID);
+    }
 
-        @Override
-        public AliBlobClient build() {
-            return new AliBlobClient(this);
-        }
+    @Override
+    public AliBlobClient build() {
+      return new AliBlobClient(this);
     }
+  }
 }