[isis] branch master updated: Adding mapping to inject dependencies into Pojos

[da...@apache.org]

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

danhaywood 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 d0ac014  Adding mapping to inject dependencies into Pojos
     new 178cda0  Merge pull request #669 from mwhesse/ISIS-2798
d0ac014 is described below

commit d0ac014cd566b360e630ec3bf923e13063497034
Author: Martin Hesse <mw...@gmail.com>
AuthorDate: Wed Jul 14 17:04:38 2021 +0700

    Adding mapping to inject dependencies into Pojos
---
 .../metamodel/objectmanager/query/ObjectBulkLoader_builtinHandlers.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/query/ObjectBulkLoader_builtinHandlers.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/query/ObjectBulkLoader_builtinHandlers.java
index 0dd2409..63e55a6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/query/ObjectBulkLoader_builtinHandlers.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/objectmanager/query/ObjectBulkLoader_builtinHandlers.java
@@ -95,7 +95,7 @@ final class ObjectBulkLoader_builtinHandlers {
             val serviceInjector = metaModelContext.getServiceInjector();
 
             //TODO injection should have already be done by DataNucleus
-            entities.forEach(serviceInjector::injectServicesInto);
+            entities.map(ManagedObject::getPojo).forEach(serviceInjector::injectServicesInto);
             return entities;
         }