Fixed tests

Author: oharsta

server/src/main/java/access/manipulation/AttributeScriptContext.java

@@ -1,21 +1,10 @@
 package access.manipulation;
 
 
-import lombok.Getter;
-
 import java.util.*;
 import java.util.stream.Collectors;
 
-@Getter
-public class AttributeScriptContext {
-
-    private final Map<String, List<String>> attributes;
-    private final String subjectId;
-
-    public AttributeScriptContext(Map<String, List<String>> attributes, String subjectId) {
-        this.attributes = attributes;
-        this.subjectId = subjectId;
-    }
+public record AttributeScriptContext(Map<String, List<String>> attributes, String subjectId) {
 
     public List<String> get(String name) {
         return attributes.getOrDefault(name, List.of());

server/src/main/java/access/manipulation/SpelAttributeManipulationService.java

@@ -20,11 +20,9 @@ public void apply(AttributeManipulation policy,
         if (expression == null) {
             return;
         }
-        if (!(attributes instanceof HashMap<String, List<String>>)) {
-            attributes = new HashMap<>(attributes);
-        }
         AttributeScriptContext ctx = new AttributeScriptContext(attributes, subjectId);
 
+
         StandardEvaluationContext context = new StandardEvaluationContext(ctx);
 
         context.setTypeLocator(typeName -> {

…ion/AttributePolicyManipulationTest.java …n/AttributeManipulationCompilerTest.javaserver/src/test/java/access/manipulation/AttributePolicyManipulationTest.java renamed to server/src/test/java/access/manipulation/AttributeManipulationCompilerTest.java server/src/test/java/access/manipulation/AttributePolicyManipulationTest.java renamed to server/src/test/java/access/manipulation/AttributeManipulationCompilerTest.java

@@ -9,7 +9,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-class AttributePolicyManipulationTest {
+class AttributeManipulationCompilerTest {
 
     private final AttributeManipulationCompiler compiler = new AttributeManipulationCompiler();
 
@@ -81,7 +81,7 @@ void shouldFailOnJvmTypeAccess() {
     @Test
     void shouldAllowSubjectIdUsage() {
         String script = """
-                set('subject', {getSubjectId()})
+                set('subject', {subjectId()})
                 """;
 
         compiler.compile(script);

server/src/test/java/access/manipulation/SpelAttributeManipulationServiceTest.java

@@ -67,7 +67,7 @@ void shouldExposeSubjectId() {
         Map<String, List<String>> attributes = new HashMap<>();
 
         String script = """
-                set('subject', {getSubjectId()})
+                set('subject', {subjectId()})
                 """;
 
         service.apply(compilePolicy(script), attributes, "the-user");
@@ -128,19 +128,7 @@ void shouldRemoveAttribute() {
     void shouldSetAttribute() {
         Map<String, List<String>> attributes = new HashMap<>();
 
-        String script = "set('uid', {getSubjectId()})";
-
-        service.apply(compilePolicy(script), attributes, "user");
-
-        assertEquals(1, attributes.size());
-        assertEquals(List.of("user"), attributes.get("uid"));
-    }
-
-    @Test
-    void worksForImmutableMaps() {
-        Map<String, List<String>> attributes = Map.of();
-
-        String script = "set('uid', {getSubjectId()})";
+        String script = "set('uid', {subjectId()})";
 
         service.apply(compilePolicy(script), attributes, "user");