Initializing statement during builder initialization

Author: DaisyModi

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

@@ -81,6 +81,7 @@ public static class Builder {
         private Statement.Builder currentStatementBuilder;
 
         private Builder() {
+            this.currentStatementBuilder = Statement.builder();
         }
 
         /**
@@ -113,7 +114,6 @@ public Builder statement(String sid) {
          * @return this Builder instance
          */
         public Builder effect(String effect) {
-            validateCurrentStatement();
             this.currentStatementBuilder.effect(effect);
             return this;
         }
@@ -125,7 +125,6 @@ public Builder effect(String effect) {
          * @return this Builder instance
          */
         public Builder addPrincipal(String principal) {
-            validateCurrentStatement();
             this.currentStatementBuilder.addPrincipal(principal);
             return this;
         }
@@ -137,7 +136,6 @@ public Builder addPrincipal(String principal) {
          * @return this Builder instance
          */
         public Builder addPrincipals(List<String> principals) {
-            validateCurrentStatement();
             this.currentStatementBuilder.addPrincipals(principals);
             return this;
         }
@@ -149,7 +147,6 @@ public Builder addPrincipals(List<String> principals) {
          * @return this Builder instance
          */
         public Builder addAction(String action) {
-            validateCurrentStatement();
             this.currentStatementBuilder.addAction(action);
             return this;
         }
@@ -161,7 +158,6 @@ public Builder addAction(String action) {
          * @return this Builder instance
          */
         public Builder addActions(List<String> actions) {
-            validateCurrentStatement();
             this.currentStatementBuilder.addActions(actions);
             return this;
         }
@@ -173,7 +169,6 @@ public Builder addActions(List<String> actions) {
          * @return this Builder instance
          */
         public Builder addResource(String resource) {
-            validateCurrentStatement();
             this.currentStatementBuilder.addResource(resource);
             return this;
         }
@@ -185,7 +180,6 @@ public Builder addResource(String resource) {
          * @return this Builder instance
          */
         public Builder addResources(List<String> resources) {
-            validateCurrentStatement();
             this.currentStatementBuilder.addResources(resources);
             return this;
         }
@@ -199,7 +193,6 @@ public Builder addResources(List<String> resources) {
          * @return this Builder instance
          */
         public Builder addCondition(String operator, String key, Object value) {
-            validateCurrentStatement();
             this.currentStatementBuilder.addCondition(operator, key, value);
             return this;
         }
@@ -245,16 +238,16 @@ public PolicyDocument build() {
             return new PolicyDocument(this);
         }
 
-        private void validateCurrentStatement() {
-            if (currentStatementBuilder == null) {
-                throw new InvalidArgumentException("No statement is currently being built. Call statement(sid) first.");
-            }
-        }
 
         private void finalizeCurrentStatement() {
             if (currentStatementBuilder != null) {
-                statements.add(currentStatementBuilder.build());
-                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();
             }
         }
     }

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

@@ -222,6 +222,15 @@ public Builder addCondition(String operator, String key, Object value) {
             return this;
         }
 
+        /**
+         * Checks if the statement has the minimum required content to be built.
+         *
+         * @return true if the statement has both effect and at least one action
+         */
+        public boolean hasMinimumContent() {
+            return effect != null && !effect.trim().isEmpty() && !actions.isEmpty();
+        }
+
         /**
          * Builds and returns a Statement instance.
          *

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

@@ -204,31 +204,34 @@ public void testBuilderMethodsWithMultipleValues() {
     }
 
     @Test
-    public void testBuilderStateValidation() {
-        // Test that trying to use statement methods without calling statement() throws exception
-        assertThrows(InvalidArgumentException.class, () ->
-            PolicyDocument.builder().addAction("storage:GetObject").build());
-
-        assertThrows(InvalidArgumentException.class, () ->
-            PolicyDocument.builder().effect("Allow").build());
-
-        assertThrows(InvalidArgumentException.class, () ->
-            PolicyDocument.builder().addResource("storage://test-bucket/*").build());
-
-        assertThrows(InvalidArgumentException.class, () ->
-            PolicyDocument.builder().addPrincipal("principal1").build());
-
-        assertThrows(InvalidArgumentException.class, () ->
-            PolicyDocument.builder().addCondition("StringEquals", "key", "value").build());
+    public void testBuilderAutoInitialization() {
+        // Test that statement methods work without calling statement() first due to auto-initialization
+        PolicyDocument policy1 = PolicyDocument.builder()
+            .version("2024-01-01")
+            .addAction("storage:GetObject")
+            .effect("Allow")
+            .addResource("storage://test-bucket/*")
+            .build();
 
-        assertThrows(InvalidArgumentException.class, () ->
-            PolicyDocument.builder().addActions(Arrays.asList("storage:GetObject")).build());
+        assertEquals(1, policy1.getStatements().size());
+        assertEquals("Allow", policy1.getStatements().get(0).getEffect());
 
-        assertThrows(InvalidArgumentException.class, () ->
-            PolicyDocument.builder().addResources(Arrays.asList("storage://test-bucket/*")).build());
+        PolicyDocument policy2 = PolicyDocument.builder()
+            .version("2024-01-01")
+            .addPrincipal("principal1")
+            .addCondition("StringEquals", "key", "value")
+            .addActions(Arrays.asList("storage:GetObject"))
+            .addResources(Arrays.asList("storage://test-bucket/*"))
+            .addPrincipals(Arrays.asList("principal2"))
+            .effect("Allow")
+            .build();
 
-        assertThrows(InvalidArgumentException.class, () ->
-            PolicyDocument.builder().addPrincipals(Arrays.asList("principal1")).build());
+        assertEquals(1, policy2.getStatements().size());
+        Statement statement = policy2.getStatements().get(0);
+        assertEquals("Allow", statement.getEffect());
+        assertEquals(1, statement.getActions().size());
+        assertEquals(1, statement.getResources().size());
+        assertEquals(2, statement.getPrincipals().size());
     }
 
     @Test