[MNT-24807] Additional config to disable property mapper entirely

Alfresco · Jan 16, 2025 · 01e2b18 · 01e2b18
1 parent a228bb4
commit 01e2b18
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/repository/src/main/java/org/alfresco/repo/event2/mapper/PropertyMapper.java b/repository/src/main/java/org/alfresco/repo/event2/mapper/PropertyMapper.java
@@ -32,4 +32,6 @@
 public interface PropertyMapper
 {
     Serializable map(QName propertyQName, Serializable value);
+
+    PropertyMapper NO_OP = (propertyQName, value) -> value;
 }
diff --git a/repository/src/main/java/org/alfresco/repo/event2/mapper/PropertyMapperFactory.java b/repository/src/main/java/org/alfresco/repo/event2/mapper/PropertyMapperFactory.java
@@ -42,8 +42,12 @@ public PropertyMapperFactory(TypeDefExpander typeDefExpander)
         this.typeDefExpander = typeDefExpander;
     }
 
-    public PropertyMapper createReplaceSensitivePropertyWithTextMapper(String userConfiguredSensitiveProperties, String userConfiguredReplacementText)
+    public PropertyMapper createPropertyMapper(String enabled, String userConfiguredSensitiveProperties, String userConfiguredReplacementText)
     {
+        if ("false".equalsIgnoreCase(enabled))
+        {
+            return PropertyMapper.NO_OP;
+        }
         Set<QName> sensitiveProperties = Optional.ofNullable(userConfiguredSensitiveProperties)
                 .filter(Predicate.not(String::isEmpty))
                 .map(CSVStringToListParser::parse)

diff --git a/repository/src/main/resources/alfresco/events2-context.xml b/repository/src/main/resources/alfresco/events2-context.xml
@@ -42,7 +42,8 @@
         <constructor-arg ref="event2TypeDefExpander"/>
     </bean>
 
-    <bean id="event2PropertyMapper" factory-bean="event2PropertyMapperFactory" factory-method="createReplaceSensitivePropertyWithTextMapper">
+    <bean id="event2PropertyMapper" factory-bean="event2PropertyMapperFactory" factory-method="createPropertyMapper">
+        <constructor-arg value="${repo.event2.mapper.enabled}"/>
         <constructor-arg value="${repo.event2.mapper.overrideDefaultProperties}"/>
         <constructor-arg value="${repo.event2.mapper.overrideReplacementText}"/>
     </bean>

diff --git a/repository/src/main/resources/alfresco/repository.properties b/repository/src/main/resources/alfresco/repository.properties
@@ -1235,6 +1235,7 @@ repo.event2.filter.childAssocTypes=rn:rendition
 # Note: username's case-sensitivity depends on the {user.name.caseSensitive} setting
 repo.event2.filter.users=
 repo.event2.filter.nodeProperties=
+repo.event2.mapper.enabled=true
 repo.event2.mapper.overrideDefaultProperties=
 repo.event2.mapper.overrideReplacementText=
 # Topic name