[isis] branch master updated: ISIS-2651: don't allow JdoEntityDiscoveryListeners to modify settings or the set of discovered entity types

[ahuber]

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

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 3d84f3b1d7 ISIS-2651: don't allow JdoEntityDiscoveryListeners to 
modify settings or the set of discovered entity types
3d84f3b1d7 is described below

commit 3d84f3b1d718b7a3ac7e9b848d7b69808869c4aa
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Fri May 20 15:29:48 2022 +0200

    ISIS-2651: don't allow JdoEntityDiscoveryListeners to modify settings or
    the set of discovered entity types
---
 .../jdo/datanucleus/IsisModulePersistenceJdoDatanucleus.java        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/IsisModulePersistenceJdoDatanucleus.java
 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/IsisModulePersistenceJdoDatanucleus.java
index 38c46758d1..e2cf1e8e17 100644
--- 
a/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/IsisModulePersistenceJdoDatanucleus.java
+++ 
b/persistence/jdo/datanucleus/src/main/java/org/apache/isis/persistence/jdo/datanucleus/IsisModulePersistenceJdoDatanucleus.java
@@ -18,6 +18,7 @@
  */
 package org.apache.isis.persistence.jdo.datanucleus;
 
+import java.util.Collections;
 import java.util.List;
 
 import javax.inject.Provider;
@@ -221,10 +222,11 @@ public class IsisModulePersistenceJdoDatanucleus {
         if(_NullSafe.isEmpty(jdoEntityTypes)) {
             return;
         }
-        val dnProps = dnSettings.getAsProperties();
+        val jdoEntityTypesView = Collections.unmodifiableSet(jdoEntityTypes);
+        val dnProps = 
Collections.unmodifiableMap(dnSettings.getAsProperties());
         _NullSafe.stream(jdoEntityDiscoveryListeners)
                 .forEach(listener->
-                    listener.onEntitiesDiscovered(pmf, jdoEntityTypes, 
dnProps));
+                    listener.onEntitiesDiscovered(pmf, jdoEntityTypesView, 
dnProps));
     }
 
     /**