Using lombok builder wherever possible

Author: DaisyModi

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

@@ -11,32 +11,16 @@
  * <p>This class provides additional options that can be set during identity creation,
  * such as path specifications, session duration limits, and permission boundaries.
  *
- * <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: Control Policy name or ID (Resource Directory Control Policies)
+ * <p>Permission boundary identifiers are provider-specific and translated internally
+ * by the implementation layer. The client accepts the native format for the target
+ * cloud provider.
  *
- * <p>Usage examples by provider:
+ * <p>Usage example:
  * <pre>
- * // AWS Example
- * CreateOptions awsOptions = CreateOptions.builder()
- *     .path("/foo/")
- *     .maxSessionDuration(43200) // 12 hours
- *     .permissionBoundary("arn:aws:iam::123456789012:policy/PowerUserBoundary")
- *     .build();
- *
- * // GCP Example (using organization policy constraint)
- * CreateOptions gcpOptions = CreateOptions.builder()
- *     .path("/foo/")
- *     .maxSessionDuration(3600)  // 1 hour
- *     .permissionBoundary("constraints/compute.restrictLoadBalancerCreationForTypes")
- *     .build();
- *
- * // AliCloud Example (using Control Policy)
- * CreateOptions aliOptions = CreateOptions.builder()
- *     .path("/foo/")
- *     .maxSessionDuration(7200)  // 2 hours
- *     .permissionBoundary("cp-bp1example") // Control Policy ID
+ * CreateOptions options = CreateOptions.builder()
+ *     .path("/service-roles/")
+ *     .maxSessionDuration(3600) // 1 hour in seconds
+ *     .permissionBoundary("policy-identifier") // Provider-specific format
  *     .build();
  * </pre>
  */

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

@@ -1,9 +1,10 @@
 package com.salesforce.multicloudj.iam.model;
 
 import com.salesforce.multicloudj.common.exceptions.InvalidArgumentException;
+import lombok.Builder;
 import lombok.Getter;
+import lombok.Singular;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -17,15 +18,16 @@
  * <p>Usage example:
  * <pre>
  * PolicyDocument policy = PolicyDocument.builder()
- *     .version("2012-10-17")  // Use provider-specific version (AWS example)
- *     .statement("StorageAccess")
+ *     .version("2012-10-17")
+ *     .statement(Statement.builder()
+ *         .sid("StorageAccess")
  *         .effect("Allow")
- *         .addAction("storage:GetObject")
- *         .addAction("storage:PutObject")
- *         .addPrincipal("arn:aws:iam::123456789012:user/ExampleUser")
- *         .addResource("storage://my-bucket/*")
- *         .addCondition("StringEquals", "aws:RequestedRegion", "us-west-2")
- *     .endStatement()
+ *         .action("storage:GetObject")
+ *         .action("storage:PutObject")
+ *         .principal("arn:aws:iam::123456789012:user/ExampleUser")
+ *         .resource("storage://my-bucket/*")
+ *         .condition("StringEquals", "aws:RequestedRegion", "us-west-2")
+ *         .build())
  *     .build();
  * </pre>
  */
@@ -34,18 +36,24 @@ public class PolicyDocument {
     private final String version;
     private final List<Statement> statements;
 
-    private PolicyDocument(Builder builder) {
-        this.version = builder.version;
-        this.statements = new ArrayList<>(builder.statements);
-    }
+    @Builder
+    private PolicyDocument(String version, @Singular List<Statement> statements) {
+        // Validate version is provided
+        if (version == null) {
+            throw new InvalidArgumentException("Version is required");
+        }
+
+        // Filter out null statements and validate at least one exists
+        List<Statement> filteredStatements = statements != null
+            ? statements.stream().filter(Objects::nonNull).collect(java.util.stream.Collectors.toList())
+            : new java.util.ArrayList<>();
+
+        if (filteredStatements.isEmpty()) {
+            throw new InvalidArgumentException("At least one statement is required");
+        }
 
-    /**
-     * Creates a new builder for PolicyDocument.
-     *
-     * @return a new Builder instance
-     */
-    public static Builder builder() {
-        return new Builder();
+        this.version = version;
+        this.statements = filteredStatements;
     }
 
 
@@ -71,184 +79,4 @@ public String toString() {
                 ", statements=" + statements +
                 '}';
     }
-
-    /**
-     * Builder class for PolicyDocument.
-     */
-    public static class Builder {
-        private String version;
-        private final List<Statement> statements = new ArrayList<>();
-        private Statement.Builder currentStatementBuilder;
-
-        private Builder() {
-            this.currentStatementBuilder = Statement.builder();
-        }
-
-        /**
-         * Sets the policy version.
-         *
-         * @param version the policy version (required)
-         * @return this Builder instance
-         */
-        public Builder version(String version) {
-            this.version = version;
-            return this;
-        }
-
-        /**
-         * Starts building a new statement with the given SID.
-         *
-         * @param sid the statement ID
-         * @return this Builder instance configured for statement building
-         */
-        public Builder statement(String sid) {
-            finalizeCurrentStatement();
-            this.currentStatementBuilder = Statement.builder().sid(sid);
-            return this;
-        }
-
-        /**
-         * Sets the effect for the current statement.
-         *
-         * @param effect "Allow" or "Deny"
-         * @return this Builder instance
-         */
-        public Builder effect(String effect) {
-            this.currentStatementBuilder.effect(effect);
-            return this;
-        }
-
-        /**
-         * Adds a principal to the current statement.
-         *
-         * @param principal the principal (fully qualified principal required)
-         * @return this Builder instance
-         */
-        public Builder addPrincipal(String principal) {
-            this.currentStatementBuilder.addPrincipal(principal);
-            return this;
-        }
-
-        /**
-         * Adds multiple principals to the current statement.
-         *
-         * @param principals the list of principals
-         * @return this Builder instance
-         */
-        public Builder addPrincipals(List<String> principals) {
-            this.currentStatementBuilder.addPrincipals(principals);
-            return this;
-        }
-
-        /**
-         * Adds an action to the current statement.
-         *
-         * @param action the action in substrate-neutral format
-         * @return this Builder instance
-         */
-        public Builder addAction(String action) {
-            this.currentStatementBuilder.addAction(action);
-            return this;
-        }
-
-        /**
-         * Adds multiple actions to the current statement.
-         *
-         * @param actions the list of actions
-         * @return this Builder instance
-         */
-        public Builder addActions(List<String> actions) {
-            this.currentStatementBuilder.addActions(actions);
-            return this;
-        }
-
-        /**
-         * Adds a resource to the current statement.
-         *
-         * @param resource the resource in URI format
-         * @return this Builder instance
-         */
-        public Builder addResource(String resource) {
-            this.currentStatementBuilder.addResource(resource);
-            return this;
-        }
-
-        /**
-         * Adds multiple resources to the current statement.
-         *
-         * @param resources the list of resources
-         * @return this Builder instance
-         */
-        public Builder addResources(List<String> resources) {
-            this.currentStatementBuilder.addResources(resources);
-            return this;
-        }
-
-        /**
-         * Adds a condition to the current statement.
-         *
-         * @param operator the condition operator
-         * @param key the condition key
-         * @param value the condition value
-         * @return this Builder instance
-         */
-        public Builder addCondition(String operator, String key, Object value) {
-            this.currentStatementBuilder.addCondition(operator, key, value);
-            return this;
-        }
-
-        /**
-         * Ends the current statement and adds it to the policy.
-         *
-         * @return this Builder instance
-         */
-        public Builder endStatement() {
-            finalizeCurrentStatement();
-            return this;
-        }
-
-        /**
-         * Adds a complete statement to the policy document.
-         *
-         * @param statement the statement to add
-         * @return this Builder instance
-         */
-        public Builder addStatement(Statement statement) {
-            finalizeCurrentStatement();
-            if (statement != null) {
-                this.statements.add(statement);
-            }
-            return this;
-        }
-
-        /**
-         * Builds and returns a PolicyDocument instance.
-         *
-         * @return a new PolicyDocument instance
-         * @throws InvalidArgumentException if version or statements are missing
-         */
-        public PolicyDocument build() {
-            finalizeCurrentStatement();
-            if (version == null || version.trim().isEmpty()) {
-                throw new InvalidArgumentException("version is required");
-            }
-            if (statements.isEmpty()) {
-                throw new InvalidArgumentException("at least one statement is required");
-            }
-            return new PolicyDocument(this);
-        }
-
-
-        private void finalizeCurrentStatement() {
-            if (currentStatementBuilder != null) {
-                // Only finalize statements that have the minimum required content
-                if (currentStatementBuilder.hasMinimumContent()) {
-                    Statement statement = currentStatementBuilder.build();
-                    statements.add(statement);
-                }
-                // Always reinitialize for the next statement
-                currentStatementBuilder = Statement.builder();
-            }
-        }
-    }
 }