using lombok for getters

Author: DaisyModi

iam/iam-client/pom.xml

@@ -24,6 +24,14 @@
             <artifactId>sts-client</artifactId>
         </dependency>
 
+        <!-- Lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.34</version>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- Test dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>

iam/iam-client/src/main/java/com/salesforce/multicloudj/iam/client/IamClient.java

@@ -40,8 +40,6 @@
  * // Attach policy
  * client.attachInlinePolicy(policy, "123456789012", "us-west-2", "my-bucket");
  * </pre>
- *
- * @since 0.3.0
  */
 public class IamClient {
 

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

@@ -1,5 +1,7 @@
 package com.salesforce.multicloudj.iam.model;
 
+import lombok.Getter;
+
 import java.util.Objects;
 
 /**
@@ -11,14 +13,13 @@
  * <p>Usage example:
  * <pre>
  * CreateOptions options = CreateOptions.builder()
- *     .path("/orgstore/")
+ *     .path("/foo/")
  *     .maxSessionDuration(43200) // 12 hours
  *     .permissionBoundary("arn:aws:iam::123456789012:policy/PowerUserBoundary")
  *     .build();
  * </pre>
- *
- * @since 0.3.0
  */
+@Getter
 public class CreateOptions {
     private final String path;
     private final Integer maxSessionDuration;
@@ -39,32 +40,6 @@ public static Builder builder() {
         return new Builder();
     }
 
-    /**
-     * Gets the path for the identity.
-     *
-     * @return the path, or null if not set
-     */
-    public String getPath() {
-        return path;
-    }
-
-    /**
-     * Gets the maximum session duration in seconds.
-     *
-     * @return the maximum session duration, or null if not set
-     */
-    public Integer getMaxSessionDuration() {
-        return maxSessionDuration;
-    }
-
-    /**
-     * Gets the permission boundary ARN.
-     *
-     * @return the permission boundary ARN, or null if not set
-     */
-    public String getPermissionBoundary() {
-        return permissionBoundary;
-    }
 
     @Override
     public boolean equals(Object o) {
@@ -104,7 +79,7 @@ private Builder() {
         /**
          * Sets the path for the identity.
          *
-         * @param path the path (e.g., "/orgstore/") for organizing identities
+         * @param path the path (e.g., "/foo/") for organizing identities
          * @return this Builder instance
          */
         public Builder path(String path) {

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

@@ -1,5 +1,7 @@
 package com.salesforce.multicloudj.iam.model;
 
+import lombok.Getter;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -25,9 +27,8 @@
  *     .endStatement()
  *     .build();
  * </pre>
- *
- * @since 0.3.0
  */
+@Getter
 public class PolicyDocument {
     private final String version;
     private final List<Statement> statements;
@@ -46,23 +47,7 @@ public static Builder builder() {
         return new Builder();
     }
 
-    /**
-     * Gets the policy version.
-     *
-     * @return the policy version
-     */
-    public String getVersion() {
-        return version;
-    }
 
-    /**
-     * Gets the list of statements.
-     *
-     * @return an immutable copy of the statements list
-     */
-    public List<Statement> getStatements() {
-        return new ArrayList<>(statements);
-    }
 
     @Override
     public boolean equals(Object o) {

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

@@ -1,5 +1,7 @@
 package com.salesforce.multicloudj.iam.model;
 
+import lombok.Getter;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -24,9 +26,8 @@
  *     .addCondition("StringEquals", "aws:RequestedRegion", "us-west-2")
  *     .build();
  * </pre>
- *
- * @since 0.3.0
  */
+@Getter
 public class Statement {
     private final String sid;
     private final String effect;
@@ -53,59 +54,7 @@ public static Builder builder() {
         return new Builder();
     }
 
-    /**
-     * Gets the statement ID.
-     *
-     * @return the statement ID, or null if not set
-     */
-    public String getSid() {
-        return sid;
-    }
-
-    /**
-     * Gets the effect (Allow or Deny).
-     *
-     * @return the effect
-     */
-    public String getEffect() {
-        return effect;
-    }
-
-    /**
-     * Gets the list of principals.
-     *
-     * @return an immutable copy of the principals list
-     */
-    public List<String> getPrincipals() {
-        return new ArrayList<>(principals);
-    }
-
-    /**
-     * Gets the list of actions.
-     *
-     * @return an immutable copy of the actions list
-     */
-    public List<String> getActions() {
-        return new ArrayList<>(actions);
-    }
 
-    /**
-     * Gets the list of resources.
-     *
-     * @return an immutable copy of the resources list
-     */
-    public List<String> getResources() {
-        return new ArrayList<>(resources);
-    }
-
-    /**
-     * Gets the conditions map.
-     *
-     * @return an immutable copy of the conditions map
-     */
-    public Map<String, Map<String, Object>> getConditions() {
-        return new HashMap<>(conditions);
-    }
 
     @Override
     public boolean equals(Object o) {

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

@@ -1,5 +1,7 @@
 package com.salesforce.multicloudj.iam.model;
 
+import lombok.Getter;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -20,9 +22,8 @@
  *     .addCondition("StringEquals", "aws:RequestedRegion", "us-west-2")
  *     .build();
  * </pre>
- *
- * @since 0.3.0
  */
+@Getter
 public class TrustConfiguration {
     private final List<String> trustedPrincipals;
     private final Map<String, Map<String, Object>> conditions;
@@ -41,23 +42,6 @@ public static Builder builder() {
         return new Builder();
     }
 
-    /**
-     * Gets the list of trusted principals.
-     *
-     * @return an immutable copy of the trusted principals list
-     */
-    public List<String> getTrustedPrincipals() {
-        return new ArrayList<>(trustedPrincipals);
-    }
-
-    /**
-     * Gets the trust conditions.
-     *
-     * @return an immutable copy of the conditions map
-     */
-    public Map<String, Map<String, Object>> getConditions() {
-        return new HashMap<>(conditions);
-    }
 
     @Override
     public boolean equals(Object o) {

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

@@ -303,23 +303,6 @@ public void testPolicyDocumentToString() {
         assertTrue(result.contains("PolicyDocument"));
     }
 
-    @Test
-    public void testGetStatementsReturnsImmutableCopy() {
-        PolicyDocument policy = PolicyDocument.builder()
-            .statement("TestStatement")
-                .effect("Allow")
-                .addAction("storage:GetObject")
-                .addResource("storage://test-bucket/*")
-            .endStatement()
-            .build();
-
-        List<Statement> statements = policy.getStatements();
-        statements.clear();
-
-        // Original should be unaffected
-        assertFalse(policy.getStatements().isEmpty());
-        assertEquals(1, policy.getStatements().size());
-    }
 
     @Test
     public void testEndStatementWithoutCurrentStatement() {

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

@@ -303,33 +303,4 @@ public void testStatementToString() {
         assertTrue(result.contains("StringEquals"));
     }
 
-    @Test
-    public void testGettersReturnImmutableCopies() {
-        Statement.Builder builder = Statement.builder()
-            .sid("TestStatement")
-            .effect("Allow")
-            .addAction("storage:GetObject")
-            .addResource("storage://test-bucket/*")
-            .addPrincipal("principal1")
-            .addCondition("StringEquals", "aws:RequestedRegion", "us-west-2");
-
-        Statement statement = builder.build();
-
-        // Verify that modifying returned lists doesn't affect the original
-        List<String> actions = statement.getActions();
-        actions.clear();
-        assertFalse(statement.getActions().isEmpty());
-
-        List<String> resources = statement.getResources();
-        resources.clear();
-        assertFalse(statement.getResources().isEmpty());
-
-        List<String> principals = statement.getPrincipals();
-        principals.clear();
-        assertFalse(statement.getPrincipals().isEmpty());
-
-        Map<String, Map<String, Object>> conditions = statement.getConditions();
-        conditions.clear();
-        assertFalse(statement.getConditions().isEmpty());
-    }
 }

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

@@ -230,23 +230,6 @@ public void testTrustConfigurationToString() {
         assertTrue(toString.contains("arn:aws:iam::123456789012:root"));
     }
 
-    @Test
-    public void testTrustConfigurationImmutable() {
-        TrustConfiguration trustConfig = TrustConfiguration.builder()
-            .addTrustedPrincipal("arn:aws:iam::123456789012:root")
-            .build();
-
-        List<String> principals = trustConfig.getTrustedPrincipals();
-        Map<String, Map<String, Object>> conditions = trustConfig.getConditions();
-
-        // Modifying returned lists/maps should not affect the original
-        principals.add("new-principal");
-        conditions.put("NewOperator", Map.of("key", "value"));
-
-        // Original should remain unchanged
-        assertEquals(1, trustConfig.getTrustedPrincipals().size());
-        assertEquals(0, trustConfig.getConditions().size());
-    }
 
     @Test
     public void testTrustConfigurationEqualsAndHashCodeWithNullChecks() {