Introduce additional attribute json properties option

wso2 · Jan 19, 2025 · 1943323 · 1943323
1 parent 1bba3ae
commit 1943323
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/modules/charon-core/src/main/java/org/wso2/charon3/core/attributes/AbstractAttribute.java b/modules/charon-core/src/main/java/org/wso2/charon3/core/attributes/AbstractAttribute.java
@@ -15,6 +15,7 @@
  */
 package org.wso2.charon3.core.attributes;
 
+import org.json.JSONObject;
 import org.wso2.charon3.core.schema.SCIMDefinitions;
 
 import java.util.HashMap;
@@ -48,6 +49,7 @@ public abstract class AbstractAttribute implements Attribute {
     protected SCIMDefinitions.Uniqueness uniqueness;
     //A container to hold custom attribute properties.
     protected Map<String, String> additionalAttributeProperties = new HashMap<>();
+    protected Map<String, JSONObject> additionalAttributeJSONProperties = new HashMap<>();
 
     public String getURI() {
         return uri; }
@@ -145,4 +147,19 @@ public String removeAttributeProperty(String propertyName) {
 
         return additionalAttributeProperties.remove(propertyName);
     }
+
+    public Map<String, JSONObject> getAttributeJSONProperties() {
+
+        return additionalAttributeJSONProperties;
+    }
+
+    public void addAttributeJsonProperty(String propertyName, JSONObject jsonObject) {
+
+        this.additionalAttributeJSONProperties.put(propertyName, jsonObject);
+    }
+
+    public JSONObject getAttributeJsonProperty(String propertyName) {
+
+        return additionalAttributeJSONProperties.remove(propertyName);
+    }
 }
diff --git a/modules/charon-core/src/main/java/org/wso2/charon3/core/attributes/Attribute.java b/modules/charon-core/src/main/java/org/wso2/charon3/core/attributes/Attribute.java
@@ -15,6 +15,7 @@
  */
 package org.wso2.charon3.core.attributes;
 
+import org.json.JSONObject;
 import org.wso2.charon3.core.exceptions.CharonException;
 import org.wso2.charon3.core.schema.SCIMDefinitions;
 
@@ -62,4 +63,9 @@ public default Map<String, String> getAttributeProperties() {
 
         throw new UnsupportedOperationException();
     }
+
+    public default Map<String, JSONObject> getAttributeJSONProperties() {
+
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/modules/charon-core/src/main/java/org/wso2/charon3/core/encoder/JSONEncoder.java b/modules/charon-core/src/main/java/org/wso2/charon3/core/encoder/JSONEncoder.java
@@ -233,6 +233,11 @@ public JSONObject encodeBasicAttributeSchema(Attribute attribute) throws JSONExc
             attributeSchema.put(entry.getKey(), entry.getValue());
         }
 
+        Map<String, JSONObject> customJSONProperties = attribute.getAttributeJSONProperties();
+        for (Map.Entry<String, JSONObject> entry: customJSONProperties.entrySet()) {
+            attributeSchema.put(entry.getKey(), entry.getValue());
+        }
+
         return attributeSchema;
     }