(syncope) branch 4_0_X updated: Including all serializable JPA properties to the info Actuator's output

[ilgrosso]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 4_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/4_0_X by this push:
     new b921402328 Including all serializable JPA properties to the info 
Actuator's output
b921402328 is described below

commit b92140232899e415f93a0415915dfcf010c446f0
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Tue May 19 11:31:04 2026 +0200

    Including all serializable JPA properties to the info Actuator's output
---
 .../persistence/jpa/dao/JPAPersistenceInfoDAO.java | 49 ++++++++++++++++++++--
 pom.xml                                            |  2 +-
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAPersistenceInfoDAO.java
 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAPersistenceInfoDAO.java
index 6d818de016..e039cb13ad 100644
--- 
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAPersistenceInfoDAO.java
+++ 
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAPersistenceInfoDAO.java
@@ -19,12 +19,15 @@
 package org.apache.syncope.core.persistence.jpa.dao;
 
 import jakarta.persistence.EntityManagerFactory;
+import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.net.InetAddress;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import org.apache.commons.lang3.tuple.Triple;
 import org.apache.openjpa.conf.OpenJPAConfiguration;
 import org.apache.openjpa.event.RemoteCommitEventManager;
@@ -41,6 +44,42 @@ public class JPAPersistenceInfoDAO implements 
PersistenceInfoDAO {
 
     protected static final Logger LOG = 
LoggerFactory.getLogger(PersistenceInfoDAO.class);
 
+    protected static final Set<String> UNSAFE_PROPERTIES = Set.of(
+            "openjpa.MetaDataFactory", "openjpa.EntityManagerFactory");
+
+    protected static boolean isJsonSafe(final String key, final Object value) {
+        if (UNSAFE_PROPERTIES.contains(key)) {
+            return false;
+        }
+
+        if (value == null) {
+            return true;
+        }
+        if (ClassUtils.isPrimitiveOrWrapper(value.getClass())) {
+            return true;
+        }
+        if (value instanceof Collection<?> collection) {
+            for (Object e : collection) {
+                if (!isJsonSafe(key, e)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        if (value instanceof Map<?, ?> map) {
+            for (Map.Entry<?, ?> e : map.entrySet()) {
+                if (!(e.getKey() instanceof String)) {
+                    return false; // JSON object keys must be strings
+                }
+                if (!isJsonSafe(key, e.getValue())) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        return value instanceof Serializable;
+    }
+
     protected final EntityManagerFactory entityManagerFactory;
 
     public JPAPersistenceInfoDAO(final EntityManagerFactory 
entityManagerFactory) {
@@ -55,9 +94,13 @@ public class JPAPersistenceInfoDAO implements 
PersistenceInfoDAO {
         OpenJPAConfiguration conf = emfspi.getConfiguration();
 
         Map<String, Object> properties = emfspi.getProperties();
-        result.put("vendor", properties.get("VendorName"));
-        result.put("version", properties.get("VersionNumber"));
-        result.put("platform", properties.get("Platform"));
+        properties.forEach((k, v) -> {
+            if (isJsonSafe(k, v)) {
+                result.put(k, v);
+            } else {
+                LOG.debug("Value for {} not JSON safe", k);
+            }
+        });
 
         Map<String, Object> remoteCommitProvider = new LinkedHashMap<>();
         result.put("remoteCommitProvider", remoteCommitProvider);
diff --git a/pom.xml b/pom.xml
index 5d65b8db9a..4aab22531c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1907,7 +1907,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.6.2</version>
+        <version>3.6.3</version>
         <executions>
           <execution>
             <id>default-cli</id>