Using lombok builder and control policy

Author: DaisyModi

iam/iam-client/src/main/java/com/salesforce/multicloudj/iam/model/CreateOptions.java

@@ -1,5 +1,6 @@
 package com.salesforce.multicloudj.iam.model;
 
+import lombok.Builder;
 import lombok.Getter;
 
 import java.util.Objects;
@@ -13,7 +14,7 @@
  * <p>Permission boundary identifiers are provider-specific and translated internally:
  * - AWS: IAM Policy ARN format (arn:aws:iam::account:policy/name)
  * - GCP: Organization Policy constraint name or IAM Condition expression
- * - AliCloud: Not supported (AliCloud RAM does not have permission boundaries)
+ * - AliCloud: Control Policy name or ID (Resource Directory Control Policies)
  *
  * <p>Usage examples by provider:
  * <pre>
@@ -31,35 +32,21 @@
  *     .permissionBoundary("constraints/compute.restrictLoadBalancerCreationForTypes")
  *     .build();
  *
- * // AliCloud Example (permission boundaries not supported)
+ * // AliCloud Example (using Control Policy)
  * CreateOptions aliOptions = CreateOptions.builder()
  *     .path("/foo/")
  *     .maxSessionDuration(7200)  // 2 hours
- *     // .permissionBoundary() - Not supported in AliCloud RAM
+ *     .permissionBoundary("cp-bp1example") // Control Policy ID
  *     .build();
  * </pre>
  */
 @Getter
+@Builder
 public class CreateOptions {
     private final String path;
     private final Integer maxSessionDuration;
     private final String permissionBoundary;
 
-    private CreateOptions(Builder builder) {
-        this.path = builder.path;
-        this.maxSessionDuration = builder.maxSessionDuration;
-        this.permissionBoundary = builder.permissionBoundary;
-    }
-
-    /**
-     * Creates a new builder for CreateOptions.
-     *
-     * @return a new Builder instance
-     */
-    public static Builder builder() {
-        return new Builder();
-    }
-
 
     @Override
     public boolean equals(Object o) {
@@ -84,59 +71,4 @@ public String toString() {
                 ", permissionBoundary='" + permissionBoundary + '\'' +
                 '}';
     }
-
-    /**
-     * Builder class for CreateOptions.
-     */
-    public static class Builder {
-        private String path;
-        private Integer maxSessionDuration;
-        private String permissionBoundary;
-
-        private Builder() {
-        }
-
-        /**
-         * Sets the path for the identity.
-         *
-         * @param path the path (e.g., "/foo/") for organizing identities
-         * @return this Builder instance
-         */
-        public Builder path(String path) {
-            this.path = path;
-            return this;
-        }
-
-        /**
-         * Sets the maximum session duration in seconds.
-         *
-         * @param maxSessionDuration the maximum session duration (typically up to 12 hours = 43200 seconds)
-         * @return this Builder instance
-         */
-        public Builder maxSessionDuration(Integer maxSessionDuration) {
-            this.maxSessionDuration = maxSessionDuration;
-            return this;
-        }
-
-        /**
-         * Sets the permission boundary policy identifier.
-         *
-         * @param permissionBoundary the cloud-native identifier of the policy that acts as a permission boundary
-         *                          (AWS: policy ARN, GCP: constraint name, AliCloud: not supported)
-         * @return this Builder instance
-         */
-        public Builder permissionBoundary(String permissionBoundary) {
-            this.permissionBoundary = permissionBoundary;
-            return this;
-        }
-
-        /**
-         * Builds and returns a CreateOptions instance.
-         *
-         * @return a new CreateOptions instance
-         */
-        public CreateOptions build() {
-            return new CreateOptions(this);
-        }
-    }
 }

iam/iam-client/src/test/java/com/salesforce/multicloudj/iam/model/CreateOptionsTest.java

@@ -182,7 +182,7 @@ public void testCreateOptionsToString() {
 
     @Test
     public void testCreateOptionsBuilderMethodChaining() {
-        CreateOptions.Builder builder = CreateOptions.builder();
+        CreateOptions.CreateOptionsBuilder builder = CreateOptions.builder();
 
         // Test that each method returns the same builder instance
         assertSame(builder, builder.path("/test/"));
@@ -244,15 +244,15 @@ public void testCreateOptionsBuilderProviderSpecificExamples() {
         assertEquals(Integer.valueOf(3600), gcpOptions.getMaxSessionDuration());
         assertEquals("constraints/compute.restrictLoadBalancerCreationForTypes", gcpOptions.getPermissionBoundary());
 
-        // AliCloud Example (permission boundaries not supported)
+        // AliCloud Example (using Control Policy)
         CreateOptions aliOptions = CreateOptions.builder()
             .path("/foo/")
             .maxSessionDuration(7200) // 2 hours
-            // Permission boundaries not supported in AliCloud RAM
+            .permissionBoundary("cp-bp1example") // Control Policy ID
             .build();
 
         assertEquals("/foo/", aliOptions.getPath());
         assertEquals(Integer.valueOf(7200), aliOptions.getMaxSessionDuration());
-        assertNull(aliOptions.getPermissionBoundary()); // AliCloud doesn't support permission boundaries
+        assertEquals("cp-bp1example", aliOptions.getPermissionBoundary()); // AliCloud Control Policy
     }
 }