fix: Make tenant attributes optional

Signed-off-by: Thomas Vitale <ThomasVitale@users.noreply.github.com>
arconia-io · Mar 24, 2024 · c2c6e56 · c2c6e56
1 parent e004c7a
commit c2c6e56
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/arconia-core/src/main/java/io/arconia/core/multitenancy/tenantdetails/Tenant.java b/arconia-core/src/main/java/io/arconia/core/multitenancy/tenantdetails/Tenant.java
@@ -2,7 +2,9 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
+import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -14,15 +16,14 @@ public class Tenant implements TenantDetails {
 
     private final boolean enabled;
 
-    private final Map<String, Object> attributes = new HashMap<>();
+    private final Map<String, Object> attributes;
 
-    public Tenant(String identifier, boolean enabled, Map<String, Object> attributes) {
+    public Tenant(String identifier, boolean enabled, @Nullable Map<String, Object> attributes) {
         Assert.hasText(identifier, "identifier cannot be null or empty");
-        Assert.notNull(attributes, "attributes cannot be null");
 
         this.identifier = identifier;
         this.enabled = enabled;
-        this.attributes = attributes;
+        this.attributes = Objects.requireNonNullElse(attributes, new HashMap<>());
     }
 
     @Override

diff --git a/arconia-core/src/test/java/io/arconia/core/multitenancy/tenantdetails/TenantTests.java b/arconia-core/src/test/java/io/arconia/core/multitenancy/tenantdetails/TenantTests.java
@@ -2,6 +2,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /**
@@ -22,10 +23,10 @@ void whenIdentifierIsEmptyThenThrow() {
     }
 
     @Test
-    void whenAttributesIsNullThenThrow() {
-        assertThatThrownBy(() -> Tenant.create().identifier("acme").attributes(null).build())
-            .isInstanceOf(IllegalArgumentException.class)
-            .hasMessageContaining("attributes cannot be null");
+    void whenAttributesIsNullThenUseEmptymap() {
+        var tenant = Tenant.create().identifier("acme").attributes(null).build();
+        assertThat(tenant.getAttributes()).isNotNull();
+        assertThat(tenant.getAttributes()).isEmpty();
     }
 
 }