You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/02/24 15:49:58 UTC
[isis] branch 2033-IoC updated: ISIS-2033: major: simplifying the
ServiceRegistry API
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2033-IoC
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/2033-IoC by this push:
new e7c8b88 ISIS-2033: major: simplifying the ServiceRegistry API
e7c8b88 is described below
commit e7c8b889be7c46d3f7995be19eab140dc3742c7a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Feb 24 16:49:46 2019 +0100
ISIS-2033: major: simplifying the ServiceRegistry API
Task-Url: https://issues.apache.org/jira/browse/ISIS-2033
---
.../applib/services/inject/ServiceInjector.java | 7 -
.../applib/services/registry/ServiceRegistry.java | 125 ++++++-----
.../org/apache/isis/commons/internal/cdi/_CDI.java | 16 ++
.../ExceptionRecognizerTranslate.java | 10 +-
.../core/metamodel/facetapi/MetaModelRefiner.java | 6 +-
...assFacetOnActionFromConfiguredRegexFactory.java | 9 +-
.../DomainObjectAnnotationFacetFactory.java | 2 +-
.../metamodel/services/ServiceInjectorDefault.java | 40 ++--
.../services/registry/ServiceRegistryDefault.java | 239 ++++++++-------------
...d.java => ServiceRegistryDefault_validate.java} | 21 +-
.../services/title/TitleServiceDefault.java | 13 +-
.../metamodel/specloader/SpecificationLoader.java | 109 +++++-----
.../isis/progmodels/dflt/JavaReflectorHelper.java | 2 -
.../services/ServicesInjectorDefaultTest.java | 9 +-
.../jdo/persistence/PersistenceSessionBase.java | 16 +-
.../adaptermanager/ObjectAdapterContext.java | 9 +-
.../ObjectAdapterContext_ServiceLookup.java | 69 +-----
.../isis/jdo/persistence/PersistenceSession4.java | 72 +++----
.../isis/jdo/persistence/PersistenceSession5.java | 66 +++---
.../bookmarks/BookmarkServiceInternalDefault.java | 62 +++---
.../services/eventbus/EventBusServiceDefault.java | 2 +-
.../ObjectAdapterServiceDefault.java | 7 +-
.../context/managers/cdi/CDIContextManager.java | 23 +-
.../system/session/IsisSessionFactoryBuilder.java | 12 +-
.../system/session/IsisSessionFactoryDefault.java | 28 ++-
.../system/session/SpecificationLoaderFactory.java | 16 +-
.../system/transaction/IsisTransaction.java | 14 +-
.../integration/wicket/WebRequestCycleForIsis.java | 12 +-
.../viewer/wicket/model/models/ActionModel.java | 5 +-
.../CollectionContentsAsAjaxTablePanel.java | 19 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 6 +-
.../wicket/ui/panels/FormExecutorDefault.java | 28 +--
32 files changed, 494 insertions(+), 580 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/inject/ServiceInjector.java b/core/applib/src/main/java/org/apache/isis/applib/services/inject/ServiceInjector.java
index c700f98..24b05e1 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/inject/ServiceInjector.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/inject/ServiceInjector.java
@@ -17,7 +17,6 @@
package org.apache.isis.applib.services.inject;
import java.util.Optional;
-import java.util.stream.Stream;
/**
* The repository of services, also able to inject into any object.
@@ -34,12 +33,6 @@ public interface ServiceInjector {
// -- DEPRECATIONS
@Deprecated // use ServiceRegistry instead
- Stream<Object> streamServices();
-
- @Deprecated // use ServiceRegistry instead
- <T> Stream<T> streamServices(Class<T> serviceClass);
-
- @Deprecated // use ServiceRegistry instead
<T> Optional<T> lookupService(final Class<T> serviceClass);
@Deprecated // use ServiceRegistry instead
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java b/core/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
index f7f98dc..a309d3a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
@@ -27,12 +27,14 @@ import java.util.stream.Stream;
import javax.annotation.Priority;
import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.spi.Bean;
-import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
+import org.apache.isis.commons.internal._Constants;
import org.apache.isis.commons.internal.base._Reduction;
import org.apache.isis.commons.internal.cdi._CDI;
import org.apache.isis.commons.internal.reflection._Reflect;
+import lombok.Value;
import lombok.val;
/**
@@ -42,66 +44,44 @@ import lombok.val;
*/
public interface ServiceRegistry {
+
/**
- * Whether or not the given type is a application-scoped singleton, that
- * qualifies as a service to be managed by the framework.
+ * Whether or not the given type is annotated @DomainService.
* @param cls
* @return
*/
- boolean isServiceType(Class<?> cls);
+ boolean isDomainServiceType(Class<?> cls);
/**
* Obtains a child Instance for the given required type and additional required qualifiers.
* @param type
- * @param annotations
+ * @param qualifiers
* @return an optional, empty if passed two instances of the same qualifier type, or an
* instance of an annotation that is not a qualifier type
*/
- default public <T> Optional<Instance<T>> getInstance(
- final Class<T> type, Annotation[] annotations){
- return annotations!=null
- ? _CDI.getInstance(type, _CDI.filterQualifiers(annotations))
+ default public <T> Instance<T> getInstance(
+ final Class<T> type, Annotation[] qualifiers){
+
+ val optionalInstance = qualifiers!=null
+ ? _CDI.getInstance(type, _CDI.filterQualifiers(qualifiers))
: _CDI.getInstance(type);
+
+ return optionalInstance.orElse(_CDI.InstanceFactory.empty());
}
- /**
- * Obtains a managed bean for the given required type and additional required qualifiers.
- * @param type
- * @param annotations
- * @return an optional, empty if passed two instances of the same qualifier type, or an
- * instance of an annotation that is not a qualifier type
- */
- default public <T> Optional<T> getManagedBean(
- final Class<T> type, Annotation[] annotations){
- return annotations!=null
- ? _CDI.getManagedBean(type, _CDI.filterQualifiers(annotations))
- : _CDI.getManagedBean(type);
+ default public <T> Instance<T> getInstance(final Class<T> type){
+ return getInstance(type, _Constants.emptyAnnotations);
}
-
/**
- * @return Stream of all currently registered service instances.
+ * Returns all bean adapters implementing the requested type.
*/
- Stream<Object> streamServices();
-
- /**
- * Returns all domain services implementing the requested type, in the order
- * that they were registered in <tt>isis.properties</tt>.
- *
- * <p>
- * Typically there will only ever be one domain service implementing a given type,
- * (eg {@link PublishingService}), but for some services there can be more than one
- * (eg {@link ExceptionRecognizer}).
- *
- * @see #lookupService(Class)
- */
- <T> Stream<T> streamServices(Class<T> serviceClass);
-
- public default Stream<Class<?>> streamServiceTypes() {
- return streamServices().map(Object::getClass);
+ default Stream<BeanAdapter> streamRegisteredBeansOfType(Class<?> requiredType) {
+ return streamRegisteredBeans()
+ .filter(beanAdapter->beanAdapter.isCandidateFor(requiredType));
}
- public <T> Instance<T> lookupServices(Class<T> serviceClass);
+ public Stream<BeanAdapter> streamRegisteredBeans();
/**
* Returns a domain service implementing the requested type.
@@ -111,7 +91,7 @@ public interface ServiceRegistry {
*/
default public <T> Optional<T> lookupService(final Class<T> serviceClass) {
- val instance = lookupServices(serviceClass);
+ val instance = getInstance(serviceClass);
if(instance.isUnsatisfied()) {
return Optional.empty();
}
@@ -136,23 +116,68 @@ public interface ServiceRegistry {
new NoSuchElementException("Could not locate service of type '" + serviceClass + "'"));
}
+ Stream<Object> streamServices();
+
/**
* @param cls
* @return whether the exact type is registered as service
*/
- boolean isRegisteredService(Class<?> cls);
+ @Deprecated
+ boolean isRegisteredBean(Class<?> cls);
/**
- * @param pojo
- * @return whether the pojo equals one of the registered service instances
- */
- boolean isRegisteredServiceInstance(Object pojo);
-
- /**
* Verify domain service Ids are unique.
* @throws IllegalStateException - if validation fails
*/
void validateServices();
+
+ // -- BEAN ADAPTER
+
+ public static enum LifecycleContext {
+ ApplicationScoped,
+ Singleton,
+ SessionScoped,
+ RequestScoped,
+ ConversationScoped,
+ Dependent,
+ ;
+
+ public boolean isApplicationScoped() {
+ return this == ApplicationScoped;
+ }
+
+ public boolean isSingleton() {
+ return this == Singleton;
+ }
+
+ public boolean isRequestScoped() {
+ return this == RequestScoped;
+ }
+ }
+
+ @Value(staticConstructor="of")
+ public static final class BeanAdapter {
+
+ private final String id;
+ private final LifecycleContext lifecycleContext;
+ private final Bean<?> bean;
+ private final boolean domainService;
+
+ public Instance<?> getInstance() {
+ val type = bean.getBeanClass();
+ val instance = _CDI.getInstance(type, bean.getQualifiers())
+ .orElse(_CDI.InstanceFactory.empty());
+ return instance;
+ }
+
+ public boolean isCandidateFor(Class<?> requiredType) {
+ return bean.getTypes().stream()
+ .filter(type -> type instanceof Class)
+ .map(type->(Class<?>)type)
+ .anyMatch(type->requiredType.isAssignableFrom(type));
+ }
+
+ }
// -- PRIORITY ANNOTATION HANDLING
@@ -192,7 +217,5 @@ public interface ServiceRegistry {
}
-
-
}
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/cdi/_CDI.java b/core/commons/src/main/java/org/apache/isis/commons/internal/cdi/_CDI.java
index 32c8cce..085b204 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/cdi/_CDI.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/cdi/_CDI.java
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.Set;
+import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -254,6 +255,21 @@ public final class _CDI {
}
return _CDI_AmbiguousInstance.of(collection);
}
+
+ public static <T, R> Instance<R> mapElements(Instance<T> instance, Function<T, R> elementMapper) {
+
+ if(instance.isUnsatisfied()) {
+ return empty();
+ }
+ if(instance.isResolvable()) {
+ val element = instance.get();
+ return singleton(elementMapper.apply(element));
+ }
+ val elements = instance.stream()
+ .map(elementMapper)
+ .collect(Collectors.toList());
+ return _CDI_AmbiguousInstance.of(elements);
+ }
}
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/ExceptionRecognizerTranslate.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/ExceptionRecognizerTranslate.java
index 8274d08..53b0e42 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/ExceptionRecognizerTranslate.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/ExceptionRecognizerTranslate.java
@@ -24,7 +24,6 @@ import org.junit.runners.model.Statement;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
public class ExceptionRecognizerTranslate implements MethodRule {
@@ -61,15 +60,14 @@ public class ExceptionRecognizerTranslate implements MethodRule {
* Simply invokes {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer#recognize(Throwable)} for all registered {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer}s for the provided exception, so that the message will be translated.
*/
private void recognize(final Throwable ex) {
- final Stream<ExceptionRecognizer> exceptionRecognizers = getIsisSessionFactory().getServiceInjector().streamServices(ExceptionRecognizer.class);
+ final Stream<ExceptionRecognizer> exceptionRecognizers = IsisContext.getServiceRegistry()
+ .getInstance(ExceptionRecognizer.class)
+ .stream()
+ ;
exceptionRecognizers.forEach(exceptionRecognizer->{
@SuppressWarnings("unused")
final String unused = exceptionRecognizer.recognize(ex);
});
}
- IsisSessionFactory getIsisSessionFactory() {
- return IsisContext.getSessionFactory();
- }
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MetaModelRefiner.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MetaModelRefiner.java
index d0caf0b..98d56c0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MetaModelRefiner.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MetaModelRefiner.java
@@ -22,8 +22,6 @@ package org.apache.isis.core.metamodel.facetapi;
import java.util.List;
import java.util.stream.Collectors;
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.cdi._CDI;
import org.apache.isis.core.metamodel.MetaModelContext;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
@@ -47,9 +45,7 @@ public interface MetaModelRefiner extends MetaModelValidatorRefiner {
val context = MetaModelContext.current();
val serviceRegistry = context.getServiceRegistry();
- val instance = serviceRegistry.getInstance(MetaModelRefiner.class, _Constants.emptyAnnotations)
- .orElse(_CDI.InstanceFactory.empty());
-
+ val instance = serviceRegistry.getInstance(MetaModelRefiner.class);
val refiners = instance.stream()
.collect(Collectors.toList());
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
index c89c69a..7db0ea8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/annotprop/CssClassFacetOnActionFromConfiguredRegexFactory.java
@@ -55,13 +55,14 @@ public class CssClassFacetOnActionFromConfiguredRegexFactory extends FacetFactor
final Method method = processMethodContext.getMethod();
final String name = method.getName();
- // bit of a bodge... we want to ignore any service actions; any contributed actions will be picked up below
+ // bit of a bodge... we want to ignore any service actions; any contributed actions
+ // will be picked up below
// in process(final ProcessContributeeMemberContext processMemberContext)
//
- // if we don't do this, then any contributed properties or collections end up picking up the CssClass; almost
- // certainly not what is expected/required.
+ // if we don't do this, then any contributed properties or collections end up picking
+ // up the CssClass; almost certainly not what is expected/required.
final Class<?> owningType = facetHolder.getOwningType();
- if(getServiceRegistry().isServiceType(owningType)) {
+ if(!getServiceRegistry().getInstance(owningType).isUnsatisfied()) {
return;
}
CssClassFacet cssClassFacet = createFromConfiguredRegexIfPossible(name, facetHolder);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
index 479ed0e..6d2bd04 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactory.java
@@ -548,7 +548,7 @@ implements MetaModelValidatorRefiner, PostConstructMethodCache, ObjectSpecIdFace
if(autoCompleteFacet != null && !autoCompleteFacet.isNoop() && autoCompleteFacet instanceof AutoCompleteFacetAbstract) {
final AutoCompleteFacetAbstract facet = (AutoCompleteFacetForDomainObjectAnnotation) autoCompleteFacet;
final Class<?> repositoryClass = facet.getRepositoryClass();
- final boolean isRegistered = getServiceRegistry().isRegisteredService(repositoryClass);
+ final boolean isRegistered = getServiceRegistry().isRegisteredBean(repositoryClass);
if(!isRegistered) {
validationFailures.add(
"@DomainObject annotation on %s specifies unknown repository '%s'",
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
index d986219..c93ec20 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServiceInjectorDefault.java
@@ -25,10 +25,8 @@ import java.util.Collection;
import java.util.Map;
import java.util.Optional;
import java.util.function.Predicate;
-import java.util.stream.Stream;
import javax.annotation.PostConstruct;
-import javax.enterprise.inject.Instance;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -45,6 +43,8 @@ import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
import org.apache.isis.core.metamodel.spec.InjectorMethodEvaluator;
+import lombok.val;
+
@Singleton
public class ServiceInjectorDefault implements ServiceInjector {
@@ -120,8 +120,11 @@ public class ServiceInjectorDefault implements ServiceInjector {
return;
}
- serviceRegistry.getManagedBean(typeToBeInjected, field.getAnnotations())
- .ifPresent(bean->invokeInjectorField(field, targetPojo, bean));
+ val instance = serviceRegistry.getInstance(typeToBeInjected, field.getAnnotations());
+ if(instance.isResolvable()) {
+ val bean = instance.get();
+ invokeInjectorField(field, targetPojo, bean);
+ }
}
@@ -134,19 +137,14 @@ public class ServiceInjectorDefault implements ServiceInjector {
final Class<? extends Collection<Object>> collectionTypeToBeInjected =
(Class<? extends Collection<Object>>) field.getType();
- serviceRegistry.getInstance(elementType, field.getAnnotations())
-
- // explicit cast required by OpenJDK complier, not eclipse
- .map((Instance<?> instance)->((Instance<Object>)instance))
-
- .ifPresent(instance->{
+ val instance = serviceRegistry.getInstance(elementType, field.getAnnotations());
+ if(!instance.isUnsatisfied()) {
final Collection<Object> collectionOfServices = instance.stream()
.filter(isOfType(elementType))
.collect(_Collections.toUnmodifiableOfType(collectionTypeToBeInjected));
invokeInjectorField(field, targetPojo, collectionOfServices);
-
- });
+ }
}
@@ -169,8 +167,12 @@ public class ServiceInjectorDefault implements ServiceInjector {
return;
}
- serviceRegistry.getManagedBean(typeToBeInjected, setter.getAnnotations())
- .ifPresent(bean->invokeInjectorMethod(setter, targetPojo, bean));
+ val instance = serviceRegistry.getInstance(typeToBeInjected, setter.getAnnotations());
+ if(instance.isResolvable()) {
+ val bean = instance.get();
+ invokeInjectorMethod(setter, targetPojo, bean);
+ }
+
}
private static void invokeMethod(final Method method, final Object target, final Object[] parameters) {
@@ -229,16 +231,6 @@ public class ServiceInjectorDefault implements ServiceInjector {
// -- DELEGATIONS
@Override
- public Stream<Object> streamServices() {
- return serviceRegistry.streamServices();
- }
-
- @Override
- public <T> Stream<T> streamServices(Class<T> serviceClass) {
- return serviceRegistry.streamServices(serviceClass);
- }
-
- @Override
public <T> Optional<T> lookupService(Class<T> serviceClass) {
return serviceRegistry.lookupService(serviceClass);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
index 3b31b60..6656ed7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault.java
@@ -19,13 +19,7 @@
package org.apache.isis.core.metamodel.services.registry;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
import java.util.Set;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.enterprise.inject.Instance;
@@ -34,183 +28,120 @@ import javax.inject.Singleton;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._Lazy;
+import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.cdi._CDI;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.collections._Multimaps;
-import org.apache.isis.commons.internal.collections._Multimaps.SetMultimap;
import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.metamodel.services.ServiceUtil;
import lombok.val;
-import lombok.extern.slf4j.Slf4j;
/**
* @since 2.0.0-M2
*/
-@Singleton @Slf4j
+@Singleton
public final class ServiceRegistryDefault implements ServiceRegistry {
-
- /**
- * This is mutable internally, but only ever exposed (in {@link #streamRegisteredServices()}).
- */
- private final Set<Bean<?>> registeredServiceBeans = _Sets.newHashSet();
- private final Set<Object> registeredServiceInstances = _Sets.newHashSet();
-
- /**
- * If no key, not yet searched for type; otherwise the corresponding value is a {@link List} of all
- * services that are assignable to the type. It's possible that this is an empty list.
- */
- private final SetMultimap<Class<?>, Object> servicesAssignableToType = _Multimaps.newSetMultimap();
- private final _Lazy<Map<Class<?>, Object>> serviceByConcreteType = _Lazy.of(this::initServiceByConcreteType);
-
- @Override
- public <T> Instance<T> lookupServices(Class<T> serviceClass) {
- return _CDI.getInstance(serviceClass, _Lists.of(_CDI.QUALIFIER_ANY))
- .orElse(_CDI.InstanceFactory.empty());
- }
-
+ private final Set<BeanAdapter> registeredBeans = _Sets.newHashSet();
+ private final Set<Object> serviceCache = _Sets.newHashSet();
+
+ // @Override
+ // public Stream<Object> streamServices() {
+ //
+ // if(registeredServiceInstances.isEmpty()) {
+ //
+ // registeredBeans.stream()
+ // .forEach(beanAdapter->{
+ //
+ // val scope = bean.getScope().getSimpleName();
+ // val type = bean.getBeanClass();
+ // if("RequestScoped".equals(scope)) {
+ // log.info("skipping registering {}-scoped service {}", scope, type);
+ // return;
+ // }
+ //
+ // Optional<?> managedObject =
+ // _CDI.getManagedBean(type, bean.getQualifiers());
+ //
+ // if(managedObject.isPresent()) {
+ // registeredServiceInstances.add(managedObject.get());
+ //
+ // log.info("registering as a {}-scoped service {}", scope, managedObject.get());
+ //
+ // } else {
+ //
+ // log.warn("failed to register bean {}-scoped as a service {}", scope, bean);
+ //
+ // }
+ // });
+ // }
+ //
+ // return registeredServiceInstances.stream();
+ // }
-
- /**
- * @deprecated TODO [2033] don't register concrete instances, registering Beans should be sufficient!
- */
- @Override
- public Stream<Object> streamServices() {
-
- if(registeredServiceInstances.isEmpty()) {
-
- registeredServiceBeans.stream()
- .forEach(bean->{
-
- //FIXME [2033] properly filter those services we want the service registry to know about,
- // or categorize them ?
- val scope = bean.getScope().getSimpleName();
- val type = bean.getBeanClass();
- if("RequestScoped".equals(scope)) {
- log.info("skipping registering {}-scoped service {}", scope, type);
- return;
- }
-
- Optional<?> managedObject =
- _CDI.getManagedBean(type, bean.getQualifiers());
-
- if(managedObject.isPresent()) {
- registeredServiceInstances.add(managedObject.get());
-
- log.info("registering as a {}-scoped service {}", scope, managedObject.get());
-
- } else {
-
- log.warn("failed to register bean {}-scoped as a service {}", scope, bean);
-
- }
- });
- }
-
- return registeredServiceInstances.stream();
- }
-
- // --
@Override
- public <T> Stream<T> streamServices(final Class<T> serviceClass) {
- return servicesAssignableToType
- .computeIfAbsent(serviceClass, this::locateMatchingServices)
- .stream()
- .map(x->_Casts.uncheckedCast(x));
- }
-
- @Override
- public boolean isServiceType(Class<?> cls) {
- if(cls.isAnnotationPresent(Singleton.class) ||
- cls.isAnnotationPresent(DomainService.class)) {
+ public boolean isDomainServiceType(Class<?> cls) {
+ if(cls.isAnnotationPresent(DomainService.class)) {
return true;
}
return false;
}
-
+
@Override
- public boolean isRegisteredService(final Class<?> cls) {
- return serviceByConcreteType.get().containsKey(cls);
+ public Stream<BeanAdapter> streamRegisteredBeans() {
+ if(registeredBeans.isEmpty()) {
+ _CDI.streamAllBeans()
+ .map(this::beanToAdapterIfToBeAcceptedForRegistration)
+ .filter(_NullSafe::isPresent)
+ .forEach(registeredBeans::add);
+ }
+ return registeredBeans.stream();
+ }
+
+ @Override
+ @Deprecated //FIXME [2033] this is bad, we should not even need to do this; root problem are ObjectAdapters requiring pojos
+ public Stream<Object> streamServices() {
+ if(serviceCache.isEmpty()) {
+ streamRegisteredBeans()
+ .filter(BeanAdapter::isDomainService)
+ .map(BeanAdapter::getInstance)
+ .filter(Instance::isResolvable)
+ .map(Instance::get)
+ .forEach(serviceCache::add);
+ }
+ return serviceCache.stream();
}
@Override
- public boolean isRegisteredServiceInstance(final Object pojo) {
- if(pojo==null) {
- return false;
- }
- final Class<?> key = pojo.getClass();
- final Object serviceInstance = serviceByConcreteType.get().get(key);
- return Objects.equals(pojo, serviceInstance);
+ public boolean isRegisteredBean(Class<?> cls) {
+ //FIXME [2033] this is poorly implemented, should not require service objects.
+ return streamServices()
+ .anyMatch(obj->obj.getClass().equals(cls));
}
-
@Override
public void validateServices() {
- ServiceRegistryDefault_validateUniqueId.validateUniqueId(streamServiceBeans());
+ ServiceRegistryDefault_validate.validateUniqueDomainServiceId(
+ streamRegisteredBeans()
+ .filter(BeanAdapter::isDomainService)
+ );
}
-
+
// -- HELPER - FILTER
-
- private boolean isBeanToBeAcceptedForRegistration(Bean<?> bean) {
- val scope = bean.getScope().getSimpleName();
- if("Singleton".equals(scope)) { //this is to also accept producer methods, that produce singletons
- return true;
- }
- val type = bean.getBeanClass();
- if(isServiceType(type)) {
- return true;
- }
-
- //debug log.warn("not a singleton: {} {}", scope, bean);
-
- return false;
- }
-
- // -- HELPER - STREAM ALL
-
- private Stream<Bean<?>> streamServiceBeans() {
-
- if(registeredServiceBeans.isEmpty()) {
-
- _CDI.streamAllBeans()
- .filter(this::isBeanToBeAcceptedForRegistration)
- .forEach(bean->{
- registeredServiceBeans.add(bean);
- });
-
- }
-
- return registeredServiceBeans.stream();
- }
-
- // -- HELPER - LOOKUP SERVICE(S)
- private <T> Set<Object> locateMatchingServices(final Class<T> serviceClass) {
- final Set<Object> matchingServices = streamServices()
- .filter(isOfType(serviceClass))
- .collect(Collectors.toSet());
- return matchingServices;
- }
-
- // -- LAZY INIT
+ private BeanAdapter beanToAdapterIfToBeAcceptedForRegistration(Bean<?> bean) {
- private Map<Class<?>, Object> initServiceByConcreteType(){
- final Map<Class<?>, Object> map = _Maps.newHashMap();
- for (Object service : registeredServiceInstances) {
- final Class<?> concreteType = service.getClass();
- map.put(concreteType, service);
- }
- return map;
- }
-
- // -- REFLECTIVE PREDICATES
+ val scope = bean.getScope().getSimpleName(); // also works for produced beans
+ val lifecycleContext = LifecycleContext.valueOf(scope);
+
+ // getBeanClass() does not work for produced beans as intended here!
+ // (we do get the producer's class instead)
+ val type = bean.getBeanClass();
+ val isDomainService = isDomainServiceType(type);
- private static final Predicate<Object> isOfType(final Class<?> cls) {
- return obj->cls.isAssignableFrom(obj.getClass());
+ val id = ServiceUtil.idOfBean(bean);
+ val beanAdapter = BeanAdapter.of(id, lifecycleContext, bean, isDomainService);
+ return beanAdapter;
}
-
+
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault_validateUniqueId.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault_validate.java
similarity index 75%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault_validateUniqueId.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault_validate.java
index d050553..14aba87 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault_validateUniqueId.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/registry/ServiceRegistryDefault_validate.java
@@ -28,29 +28,31 @@ import java.util.stream.Stream;
import javax.enterprise.inject.spi.Bean;
+import org.apache.isis.applib.services.registry.ServiceRegistry.BeanAdapter;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Multimaps;
import org.apache.isis.commons.internal.collections._Multimaps.ListMultimap;
-import org.apache.isis.core.metamodel.services.ServiceUtil;
/**
* @since 2.0.0-M3
*/
-final class ServiceRegistryDefault_validateUniqueId {
+final class ServiceRegistryDefault_validate {
- static void validateUniqueId(final Stream<Bean<?>> serviceBeans) {
+ static void validateUniqueDomainServiceId(final Stream<BeanAdapter> domainServiceAdapters) {
- final ListMultimap<String, Bean<?>> servicesById = _Multimaps.newListMultimap();
- serviceBeans.forEach(serviceBean->{
- String id = ServiceUtil.idOfBean(serviceBean);
- servicesById.putElement(id, serviceBean);
+ final ListMultimap<String, BeanAdapter> servicesById = _Multimaps.newListMultimap();
+
+ domainServiceAdapters.forEach(serviceBeanAdapter->{
+ String id = serviceBeanAdapter.getId();
+ servicesById.putElement(id, serviceBeanAdapter);
});
+
final String errorMsg = servicesById.entrySet().stream()
.filter(entry->entry.getValue().size()>1) // filter for duplicates
.map(entry->{
String serviceId = entry.getKey();
- List<Bean<?>> duplicateServiceEntries = entry.getValue();
+ List<BeanAdapter> duplicateServiceEntries = entry.getValue();
return String.format("serviceId '%s' is declared by domain services %s",
serviceId, classNamesFor(duplicateServiceEntries));
})
@@ -63,8 +65,9 @@ final class ServiceRegistryDefault_validateUniqueId {
// -- HELPER - VALIDATE
- private static String classNamesFor(Collection<Bean<?>> serviceBeans) {
+ private static String classNamesFor(Collection<BeanAdapter> serviceBeans) {
return stream(serviceBeans)
+ .map(BeanAdapter::getBean)
.map(Bean::getBeanClass)
.map(Class::getName)
.collect(Collectors.joining(", "));
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
index 8199bd6..32620b8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
@@ -24,17 +24,18 @@ import javax.inject.Singleton;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.services.persistsession.ObjectAdapterService;
+import lombok.val;
+
@Singleton
public class TitleServiceDefault implements TitleService {
@Override
public String titleOf(final Object domainObject) {
- final ObjectAdapter objectAdapter = getObjectAdapterProvider().adapterFor(unwrapped(domainObject));
- final boolean destroyed = objectAdapter.isDestroyed();
+ val objectAdapter = getObjectAdapterProvider().adapterFor(unwrapped(domainObject));
+ val destroyed = objectAdapter.isDestroyed();
if(!destroyed) {
return objectAdapter.getSpecification().getTitle(null, objectAdapter);
} else {
@@ -44,7 +45,7 @@ public class TitleServiceDefault implements TitleService {
@Override
public String iconNameOf(final Object domainObject) {
- final ObjectAdapter objectAdapter = getObjectAdapterProvider().adapterFor(unwrapped(domainObject));
+ val objectAdapter = getObjectAdapterProvider().adapterFor(unwrapped(domainObject));
return objectAdapter.getSpecification().getIconName(objectAdapter);
}
@@ -57,10 +58,10 @@ public class TitleServiceDefault implements TitleService {
// //////////////////////////////////////
private ObjectAdapterProvider getObjectAdapterProvider() {
- return sessionServiceInternal;
+ return objectAdapterProvider;
}
- @Inject ObjectAdapterService sessionServiceInternal;
+ @Inject ObjectAdapterService objectAdapterProvider;
@Inject WrapperFactory wrapperFactory;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
index c1e812d..8d9b6ac 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
@@ -33,10 +33,11 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.applib.services.jaxb.JaxbService;
-import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.commons.internal.cdi._CDI;
+import org.apache.isis.applib.services.registry.ServiceRegistry.BeanAdapter;
+import org.apache.isis.applib.services.registry.ServiceRegistry.LifecycleContext;
+import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.commons.internal.base._Tuples.Tuple2;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.debug._Probe;
@@ -49,7 +50,6 @@ import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ClassUtil;
import org.apache.isis.core.metamodel.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
import org.apache.isis.core.metamodel.facets.object.objectspecid.ObjectSpecIdFacet;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.spec.FreeStandingList;
@@ -71,8 +71,6 @@ import org.apache.isis.core.runtime.threadpool.ThreadPoolSupport;
import org.apache.isis.progmodels.dflt.ProgrammingModelFacetsJava5;
import org.apache.isis.schema.utils.CommonDtoUtils;
-import lombok.val;
-
/**
* Builds the meta-model.
*
@@ -165,29 +163,29 @@ public class SpecificationLoader {
// AppManifest.Registry.instance().getDomainServiceTypes(), because the former also has the fallback
// services set up in IsisSessionFactoryBuilder beforehand.
final List<ObjectSpecification> domainServiceSpecs =
- loadSpecificationsFor(
- streamServiceClasses().collect(Collectors.toList()), NatureOfService.DOMAIN,
+ loadSpecificationsForBeans(
+ streamBeans(), NatureOfService.DOMAIN,
specificationsFromRegistry, IntrospectionState.NOT_INTROSPECTED
);
final List<ObjectSpecification> mixinSpecs =
loadSpecificationsFor(
- AppManifest.Registry.instance().getMixinTypes(), null,
+ AppManifest.Registry.instance().getMixinTypes().stream(), null,
specificationsFromRegistry, IntrospectionState.NOT_INTROSPECTED
);
loadSpecificationsFor(
- CommonDtoUtils.VALUE_TYPES, null,
+ CommonDtoUtils.VALUE_TYPES.stream(), null,
specificationsFromRegistry, IntrospectionState.NOT_INTROSPECTED
);
loadSpecificationsFor(
- AppManifest.Registry.instance().getDomainObjectTypes(), null,
+ AppManifest.Registry.instance().getDomainObjectTypes().stream(), null,
specificationsFromRegistry, IntrospectionState.NOT_INTROSPECTED
);
loadSpecificationsFor(
- AppManifest.Registry.instance().getViewModelTypes(), null,
+ AppManifest.Registry.instance().getViewModelTypes().stream(), null,
specificationsFromRegistry, IntrospectionState.NOT_INTROSPECTED
);
loadSpecificationsFor(
- AppManifest.Registry.instance().getXmlElementTypes(), null,
+ AppManifest.Registry.instance().getXmlElementTypes().stream(), null,
specificationsFromRegistry, IntrospectionState.NOT_INTROSPECTED
);
@@ -217,27 +215,27 @@ public class SpecificationLoader {
LOG.info("init() - done");
//FIXME [2033] remove debug code ...
- {
- streamServiceClasses()
- .forEach(service->probe.println("using service %s", service));
-
-
- val metaModelService = _CDI.getSingleton(MetaModelService.class);
- val jaxbService = _CDI.getSingleton(JaxbService.class);
-
- val metamodelDto =
- metaModelService.exportMetaModel(
- new MetaModelService.Config()
- .withIgnoreNoop()
- .withIgnoreAbstractClasses()
- .withIgnoreBuiltInValueTypes()
- .withIgnoreInterfaces()
- .withPackagePrefix("domainapp")
- );
-
- final String xml = jaxbService.toXml(metamodelDto);
- //probe.println(xml);
- }
+ //{
+// streamServiceClasses()
+// .forEach(service->probe.println("using service %s", service));
+//
+//
+// val metaModelService = _CDI.getSingleton(MetaModelService.class);
+// val jaxbService = _CDI.getSingleton(JaxbService.class);
+//
+// val metamodelDto =
+// metaModelService.exportMetaModel(
+// new MetaModelService.Config()
+// .withIgnoreNoop()
+// .withIgnoreAbstractClasses()
+// .withIgnoreBuiltInValueTypes()
+// .withIgnoreInterfaces()
+// .withPackagePrefix("domainapp")
+// );
+//
+// final String xml = jaxbService.toXml(metamodelDto);
+// //probe.println(xml);
+// }
}
private final static _Probe probe = _Probe.unlimited().label("SpecificationLoader");
@@ -315,27 +313,32 @@ public class SpecificationLoader {
}
private List<ObjectSpecification> loadSpecificationsFor(
- final Collection<Class<?>> domainTypes,
+ final Stream<Class<?>> domainTypes,
final NatureOfService natureOfServiceFallback,
final List<ObjectSpecification> appendTo,
final IntrospectionState upTo) {
- final List<ObjectSpecification> specs = _Lists.newArrayList();
- for (final Class<?> domainType : domainTypes) {
-
- ObjectSpecification objectSpecification =
- internalLoadSpecification(domainType, natureOfServiceFallback, upTo);
-
- if(objectSpecification != null) {
- specs.add(objectSpecification);
- }
- }
- appendTo.addAll(specs);
-
- return specs;
+ return domainTypes
+ .map(domainType->internalLoadSpecification(domainType, natureOfServiceFallback, upTo))
+ .filter(_NullSafe::isPresent)
+ .peek(appendTo::add)
+ .collect(Collectors.toList());
}
+ private List<ObjectSpecification> loadSpecificationsForBeans (
+ final Stream<BeanAdapter> beans,
+ final NatureOfService natureOfServiceFallback,
+ final List<ObjectSpecification> appendTo,
+ final IntrospectionState upTo) {
+ return beans
+ .filter(bean->bean.isDomainService())
+ .map(bean->bean.getBean().getBeanClass())
+ .map(domainType->internalLoadSpecification(domainType, natureOfServiceFallback, upTo))
+ .filter(_NullSafe::isPresent)
+ .peek(appendTo::add)
+ .collect(Collectors.toList());
+ }
// -- shutdown
@@ -592,15 +595,9 @@ public class SpecificationLoader {
return cache.allSpecifications();
}
-
- public Stream<Class<?>> streamServiceClasses() {
+ private Stream<BeanAdapter> streamBeans() {
final ServiceRegistry registry = MetaModelContext.current().getServiceRegistry();
- return registry.streamServiceTypes();
- }
-
- public boolean isServiceClass(Class<?> cls) {
- final ObjectSpecification objectSpecification = peekSpecification(cls);
- return objectSpecification != null && objectSpecification.containsDoOpFacet(DomainServiceFacet.class);
+ return registry.streamRegisteredBeans();
}
// -- loaded
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
index 88797bb..a5a3676 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
@@ -29,8 +29,6 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorCom
public final class JavaReflectorHelper {
- //private static final Logger LOG = LoggerFactory.getLogger(JavaReflectorHelper.class);
-
private JavaReflectorHelper(){}
public static SpecificationLoader createSpecificationLoader(
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefaultTest.java
index 3ecd870..eb86c44 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefaultTest.java
@@ -45,6 +45,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.core.metamodel.BeansForTesting;
+import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -137,9 +138,11 @@ class ServicesInjectorDefaultTest {
@Test
public void shouldStreamRegisteredServices() {
- List<Class<?>> registeredServices = registry.streamServiceTypes()
- .collect(Collectors.toList());
- Assertions.assertTrue(registeredServices.size()>=3);
+ fail("[2033] test not migrated");
+
+// List<Class<?>> registeredServices = registry.streamServiceTypes()
+// .collect(Collectors.toList());
+// Assertions.assertTrue(registeredServices.size()>=3);
}
}
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionBase.java b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionBase.java
index 863ddaf..9ce809f 100644
--- a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionBase.java
+++ b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/PersistenceSessionBase.java
@@ -18,9 +18,7 @@ package org.apache.isis.jdo.persistence;
import static org.apache.isis.commons.internal.base._With.mapIfPresentElse;
-import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
import javax.annotation.Nullable;
import javax.jdo.PersistenceManager;
@@ -259,19 +257,7 @@ abstract class PersistenceSessionBase implements PersistenceSession {
// -- HELPERS - SERVICE LOOKUP
private <T> T lookupService(Class<T> serviceType) {
- T service = lookupServiceIfAny(serviceType);
- if(service == null) {
- throw new IllegalStateException("Could not locate service of type '" + serviceType + "'");
- }
- return service;
- }
-
- private <T> T lookupServiceIfAny(final Class<T> serviceType) {
- return serviceRegistry.lookupService(serviceType).orElse(null);
- }
-
- protected <T> List<T> lookupServices(final Class<T> serviceClass) {
- return serviceRegistry.streamServices(serviceClass).collect(Collectors.toList());
+ return serviceRegistry.lookupServiceElseFail(serviceType);
}
/**
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/adaptermanager/ObjectAdapterContext.java b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/adaptermanager/ObjectAdapterContext.java
index 990d315..1c0e197 100644
--- a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/adaptermanager/ObjectAdapterContext.java
+++ b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/adaptermanager/ObjectAdapterContext.java
@@ -23,8 +23,6 @@ import java.util.Objects;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import lombok.val;
-
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.ensure.IsisAssertException;
@@ -42,12 +40,13 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.memento.Data;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.context.managers.ContextManager;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSession;
import org.apache.isis.core.security.authentication.AuthenticationSession;
+import lombok.val;
+
/**
* Encapsulate ObjectAdpater life-cycling.
*
@@ -92,10 +91,10 @@ final public class ObjectAdapterContext {
this.objectAdapterProviderMixin = new ObjectAdapterContext_ObjectAdapterProvider(this, metaModelContext, persistenceSession);
this.mementoSupportMixin = new ObjectAdapterContext_MementoSupport(this, persistenceSession);
- this.serviceLookupMixin = new ObjectAdapterContext_ServiceLookup(this, servicesInjector);
+ this.serviceLookupMixin = new ObjectAdapterContext_ServiceLookup(this, metaModelContext.getServiceRegistry());
this.newIdentifierMixin = new ObjectAdapterContext_NewIdentifier(this, metaModelContext, persistenceSession);
- this.contextManager = IsisContext.getServiceRegistry().lookupServiceElseFail(ContextManager.class);
+ this.contextManager = metaModelContext.getServiceRegistry().lookupServiceElseFail(ContextManager.class);
this.objectAdapterByIdProviderMixin = new ObjectAdapterContext_ObjectAdapterByIdProvider(this, contextManager, metaModelContext, persistenceSession, authenticationSession);
this.dependencyInjectionMixin = new ObjectAdapterContext_DependencyInjection(this, persistenceSession);
diff --git a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/adaptermanager/ObjectAdapterContext_ServiceLookup.java b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/adaptermanager/ObjectAdapterContext_ServiceLookup.java
index bc01986..aa74fe2 100644
--- a/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/adaptermanager/ObjectAdapterContext_ServiceLookup.java
+++ b/core/plugins/jdo-common/src/main/java/org/apache/isis/jdo/persistence/adaptermanager/ObjectAdapterContext_ServiceLookup.java
@@ -18,18 +18,10 @@
*/
package org.apache.isis.jdo.persistence.adaptermanager;
-import java.util.Map;
-
-import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.commons.internal.base._Timing;
-import org.apache.isis.commons.internal.base._Timing.StopWatch;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.core.commons.ensure.Assert;
+import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.isis.core.runtime.system.context.managers.UniversalObjectManager;
/**
* package private mixin for ObjectAdapterContext
@@ -41,66 +33,17 @@ import org.slf4j.LoggerFactory;
@SuppressWarnings("unused")
class ObjectAdapterContext_ServiceLookup {
-
- private static final Logger LOG = LoggerFactory.getLogger(ObjectAdapterContext_ServiceLookup.class);
private final ObjectAdapterContext objectAdapterContext;
- private final ServiceInjector servicesInjector;
+ private final ServiceRegistry serviceRegistry;
ObjectAdapterContext_ServiceLookup(ObjectAdapterContext objectAdapterContext,
- ServiceInjector servicesInjector) {
+ ServiceRegistry serviceRegistry) {
this.objectAdapterContext = objectAdapterContext;
- this.servicesInjector = servicesInjector;
+ this.serviceRegistry = serviceRegistry;
}
ObjectAdapter lookupServiceAdapterFor(RootOid rootOid) {
-
- final ServicesByIdResource servicesByIdResource =
- _Context.computeIfAbsent(ServicesByIdResource.class, this::initLookupResource);
-
- final Object serviceInstance = servicesByIdResource.lookupServiceInstance(rootOid);
- if(serviceInstance==null) {
- return null;
- }
- return objectAdapterContext.getFactories().createRootAdapter(serviceInstance, rootOid);
-
- }
-
- // -- HELPER
-
- /**
- * Application scoped resource to hold a map for looking up services by id.
- */
- private static class ServicesByIdResource implements AutoCloseable {
- private final Map<RootOid, Object> servicesById = _Maps.newHashMap();
-
- @Override
- public void close() {
- servicesById.clear();
- }
-
- public Object lookupServiceInstance(RootOid serviceRootOid) {
- return servicesById.get(serviceRootOid);
- }
- }
-
- private ServicesByIdResource initLookupResource() {
-
- objectAdapterContext.printContextInfo("INIT SERVICE ID LOOKUP RESOURCE");
-
- StopWatch watch = _Timing.now();
-
- final ServicesByIdResource lookupResource = new ServicesByIdResource();
-
- servicesInjector.streamServices()
- .map(objectAdapterContext.getObjectAdapterProvider()::adapterFor)
- .forEach(serviceAdapter->{
- Assert.assertFalse("expected to not be 'transient'", serviceAdapter.getOid().isTransient());
- lookupResource.servicesById.put((RootOid)serviceAdapter.getOid() , serviceAdapter.getPojo());
- });
-
- objectAdapterContext.printContextInfo("took (µs) "+watch.stop().getMicros());
-
- return lookupResource;
+ return UniversalObjectManager.current().resolve(rootOid);
}
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession4.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession4.java
index 3ea5957..cf29f5c 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession4.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession4.java
@@ -31,6 +31,7 @@ import java.util.Map;
import java.util.Objects;
import javax.annotation.Nullable;
+import javax.enterprise.inject.Instance;
import javax.jdo.FetchGroup;
import javax.jdo.FetchPlan;
import javax.jdo.PersistenceManager;
@@ -38,6 +39,10 @@ import javax.jdo.PersistenceManagerFactory;
import javax.jdo.identity.SingleFieldIdentity;
import javax.jdo.listener.InstanceLifecycleListener;
+import org.datanucleus.enhancement.Persistable;
+import org.datanucleus.exceptions.NucleusObjectNotFoundException;
+import org.datanucleus.identity.DatastoreIdImpl;
+
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
@@ -45,7 +50,6 @@ import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.version.Version;
@@ -76,7 +80,6 @@ import org.apache.isis.core.runtime.persistence.FixturesInstalledStateHolder;
import org.apache.isis.core.runtime.persistence.transaction.CreateObjectCommand;
import org.apache.isis.core.runtime.persistence.transaction.DestroyObjectCommand;
import org.apache.isis.core.runtime.persistence.transaction.PersistenceCommand;
-import org.apache.isis.core.runtime.services.RequestScopedService;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
@@ -85,20 +88,12 @@ import org.apache.isis.jdo.datanucleus.persistence.PersistenceQuery;
import org.apache.isis.jdo.datanucleus.persistence.commands.DataNucleusCreateObjectCommand;
import org.apache.isis.jdo.datanucleus.persistence.commands.DataNucleusDeleteObjectCommand;
import org.apache.isis.jdo.datanucleus.persistence.queries.PersistenceQueryProcessor;
-import org.apache.isis.jdo.persistence.NotPersistableException;
-import org.apache.isis.jdo.persistence.PersistenceSessionBase;
-import org.apache.isis.jdo.persistence.UnsupportedFindException;
-import org.apache.isis.jdo.persistence.PersistenceSessionBase.State;
-import org.apache.isis.jdo.persistence.adaptermanager.ObjectAdapterByIdProvider;
import org.apache.isis.jdo.persistence.adaptermanager.ObjectAdapterContext;
import org.apache.isis.jdo.persistence.query.PersistenceQueryFindAllInstances;
import org.apache.isis.jdo.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
import org.apache.isis.objectstore.jdo.datanucleus.persistence.queries.PersistenceQueryFindAllInstancesProcessor;
import org.apache.isis.objectstore.jdo.datanucleus.persistence.queries.PersistenceQueryFindUsingApplibQueryProcessor;
import org.apache.isis.objectstore.jdo.datanucleus.persistence.spi.JdoObjectIdSerializer;
-import org.datanucleus.enhancement.Persistable;
-import org.datanucleus.exceptions.NucleusObjectNotFoundException;
-import org.datanucleus.identity.DatastoreIdImpl;
import lombok.val;
import lombok.extern.slf4j.Slf4j;
@@ -192,21 +187,23 @@ implements IsisLifecycleListener.PersistenceSessionLifecycleManagement {
}
private void postConstructOnRequestScopedServices() {
- serviceInjector.streamServices()
- .forEach(service->{
- if(service instanceof RequestScopedService) {
- ((RequestScopedService)service).__isis_postConstruct();
- }
- });
+ //[2033] remove
+// serviceInjector.streamServices()
+// .forEach(service->{
+// if(service instanceof RequestScopedService) {
+// ((RequestScopedService)service).__isis_postConstruct();
+// }
+// });
}
private void startRequestOnRequestScopedServices() {
- serviceInjector.streamServices()
- .forEach(service->{
- if(service instanceof RequestScopedService) {
- ((RequestScopedService)service).__isis_startRequest(serviceInjector);
- }
- });
+ //[2033] remove
+// serviceInjector.streamServices()
+// .forEach(service->{
+// if(service instanceof RequestScopedService) {
+// ((RequestScopedService)service).__isis_startRequest(serviceInjector);
+// }
+// });
}
private Command createCommand() {
@@ -277,21 +274,23 @@ implements IsisLifecycleListener.PersistenceSessionLifecycleManagement {
}
private void endRequestOnRequestScopeServices() {
- serviceInjector.streamServices()
- .forEach(service->{
- if(service instanceof RequestScopedService) {
- ((RequestScopedService)service).__isis_endRequest();
- }
- });
+ //[2033] remove
+// serviceInjector.streamServices()
+// .forEach(service->{
+// if(service instanceof RequestScopedService) {
+// ((RequestScopedService)service).__isis_endRequest();
+// }
+// });
}
private void preDestroyOnRequestScopedServices() {
- serviceInjector.streamServices()
- .forEach(service->{
- if(service instanceof RequestScopedService) {
- ((RequestScopedService)service).__isis_preDestroy();
- }
- });
+ //[2033] remove
+// serviceInjector.streamServices()
+// .forEach(service->{
+// if(service instanceof RequestScopedService) {
+// ((RequestScopedService)service).__isis_preDestroy();
+// }
+// });
}
private void completeCommandFromInteractionAndClearDomainEvents() {
@@ -467,8 +466,9 @@ implements IsisLifecycleListener.PersistenceSessionLifecycleManagement {
result = persistenceManager.getObjectById(cls, jdoObjectId);
} catch (final RuntimeException e) {
- Class<ExceptionRecognizer> serviceClass = ExceptionRecognizer.class;
- final List<ExceptionRecognizer> exceptionRecognizers = lookupServices(serviceClass);
+ final Instance<ExceptionRecognizer> exceptionRecognizers =
+ serviceRegistry.getInstance(ExceptionRecognizer.class);
+
for (ExceptionRecognizer exceptionRecognizer : exceptionRecognizers) {
final ExceptionRecognizer.Recognition recognition =
exceptionRecognizer.recognize2(e);
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java
index f2cf1d4..e7493ec 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/jdo/persistence/PersistenceSession5.java
@@ -31,6 +31,7 @@ import java.util.Map;
import java.util.Objects;
import javax.annotation.Nullable;
+import javax.enterprise.inject.Instance;
import javax.jdo.FetchGroup;
import javax.jdo.FetchPlan;
import javax.jdo.PersistenceManager;
@@ -38,6 +39,10 @@ import javax.jdo.PersistenceManagerFactory;
import javax.jdo.identity.SingleFieldIdentity;
import javax.jdo.listener.InstanceLifecycleListener;
+import org.datanucleus.enhancement.Persistable;
+import org.datanucleus.exceptions.NucleusObjectNotFoundException;
+import org.datanucleus.identity.DatastoreIdImpl;
+
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.command.Command;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
@@ -75,7 +80,6 @@ import org.apache.isis.core.runtime.persistence.FixturesInstalledStateHolder;
import org.apache.isis.core.runtime.persistence.transaction.CreateObjectCommand;
import org.apache.isis.core.runtime.persistence.transaction.DestroyObjectCommand;
import org.apache.isis.core.runtime.persistence.transaction.PersistenceCommand;
-import org.apache.isis.core.runtime.services.RequestScopedService;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
@@ -90,9 +94,6 @@ import org.apache.isis.jdo.persistence.query.PersistenceQueryFindUsingApplibQuer
import org.apache.isis.objectstore.jdo.datanucleus.persistence.queries.PersistenceQueryFindAllInstancesProcessor;
import org.apache.isis.objectstore.jdo.datanucleus.persistence.queries.PersistenceQueryFindUsingApplibQueryProcessor;
import org.apache.isis.objectstore.jdo.datanucleus.persistence.spi.JdoObjectIdSerializer;
-import org.datanucleus.enhancement.Persistable;
-import org.datanucleus.exceptions.NucleusObjectNotFoundException;
-import org.datanucleus.identity.DatastoreIdImpl;
import lombok.val;
import lombok.extern.slf4j.Slf4j;
@@ -186,21 +187,23 @@ implements IsisLifecycleListener.PersistenceSessionLifecycleManagement {
}
private void postConstructOnRequestScopedServices() {
- serviceInjector.streamServices()
- .forEach(service->{
- if(service instanceof RequestScopedService) {
- ((RequestScopedService)service).__isis_postConstruct();
- }
- });
+//[2033] remove
+// serviceInjector.streamServices()
+// .forEach(service->{
+// if(service instanceof RequestScopedService) {
+// ((RequestScopedService)service).__isis_postConstruct();
+// }
+// });
}
private void startRequestOnRequestScopedServices() {
- serviceInjector.streamServices()
- .forEach(service->{
- if(service instanceof RequestScopedService) {
- ((RequestScopedService)service).__isis_startRequest(serviceInjector);
- }
- });
+ //[2033] remove
+// serviceInjector.streamServices()
+// .forEach(service->{
+// if(service instanceof RequestScopedService) {
+// ((RequestScopedService)service).__isis_startRequest(serviceInjector);
+// }
+// });
}
private Command createCommand() {
@@ -271,21 +274,23 @@ implements IsisLifecycleListener.PersistenceSessionLifecycleManagement {
}
private void endRequestOnRequestScopeServices() {
- serviceInjector.streamServices()
- .forEach(service->{
- if(service instanceof RequestScopedService) {
- ((RequestScopedService)service).__isis_endRequest();
- }
- });
+ //[2033] remove
+// serviceInjector.streamServices()
+// .forEach(service->{
+// if(service instanceof RequestScopedService) {
+// ((RequestScopedService)service).__isis_endRequest();
+// }
+// });
}
private void preDestroyOnRequestScopedServices() {
- serviceInjector.streamServices()
- .forEach(service->{
- if(service instanceof RequestScopedService) {
- ((RequestScopedService)service).__isis_preDestroy();
- }
- });
+ //[2033] remove
+// serviceInjector.streamServices()
+// .forEach(service->{
+// if(service instanceof RequestScopedService) {
+// ((RequestScopedService)service).__isis_preDestroy();
+// }
+// });
}
private void completeCommandFromInteractionAndClearDomainEvents() {
@@ -461,8 +466,9 @@ implements IsisLifecycleListener.PersistenceSessionLifecycleManagement {
result = persistenceManager.getObjectById(cls, jdoObjectId);
} catch (final RuntimeException e) {
- Class<ExceptionRecognizer> serviceClass = ExceptionRecognizer.class;
- final List<ExceptionRecognizer> exceptionRecognizers = lookupServices(serviceClass);
+ final Instance<ExceptionRecognizer> exceptionRecognizers =
+ serviceRegistry.getInstance(ExceptionRecognizer.class);
+
for (ExceptionRecognizer exceptionRecognizer : exceptionRecognizers) {
final ExceptionRecognizer.Recognition recognition =
exceptionRecognizer.recognize2(e);
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/bookmarks/BookmarkServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
index 838d8da..0fa0e20 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
@@ -25,9 +25,7 @@ import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.List;
-import java.util.Map;
import java.util.Set;
-import java.util.stream.Stream;
import javax.annotation.Priority;
import javax.inject.Inject;
@@ -41,11 +39,10 @@ import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.tree.TreeState;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.memento._Mementos.SerializingAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.concurrency.ConcurrencyChecking;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
@@ -56,6 +53,8 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import lombok.val;
+
/**
* This service enables a serializable 'bookmark' to be created for an entity.
*
@@ -96,11 +95,24 @@ public class BookmarkServiceInternalDefault implements BookmarkService, Serializ
if(bookmark == null) {
return null;
}
- final String objectType = bookmark.getObjectType();
- final Object service = lookupService(objectType);
- if(service != null) {
- return service;
+ final String objectClassName = bookmark.getObjectType();
+
+ try {
+ val objectClass = _Context.loadClass(objectClassName);
+ val serviceObject = serviceRegistry.lookupService(objectClass);
+ if(serviceObject.isPresent()) {
+ return serviceObject.get();
+ }
+ } catch (Exception e) {
+ // ignore, fall through
}
+
+
+// final Object service = lookupService(objectClassName);
+// if(service != null) {
+// return service;
+// }
+
return lookupInternal(bookmark, fieldResetPolicy);
}
@@ -144,23 +156,23 @@ public class BookmarkServiceInternalDefault implements BookmarkService, Serializ
return new Bookmark(objectType, identifier);
}
- private Map<String,Object> servicesByClassName;
- private Object lookupService(final String className) {
- cacheServicesByClassNameIfNecessary();
- return servicesByClassName.get(className);
- }
-
- private void cacheServicesByClassNameIfNecessary() {
- if (servicesByClassName == null) {
- final Map<String,Object> servicesByClassName = _Maps.newHashMap();
- final Stream<Object> registeredServices = serviceRegistry.streamServices();
- registeredServices.forEach(registeredService->{
- final String serviceClassName = registeredService.getClass().getName();
- servicesByClassName.put(serviceClassName, registeredService);
- });
- this.servicesByClassName = servicesByClassName;
- }
- }
+// private Map<String,Object> servicesByClassName;
+// private Object lookupService(final String className) {
+// cacheServicesByClassNameIfNecessary();
+// return servicesByClassName.get(className);
+// }
+//
+// private void cacheServicesByClassNameIfNecessary() {
+// if (servicesByClassName == null) {
+// final Map<String,Object> servicesByClassName = _Maps.newHashMap();
+// final Stream<Object> registeredServices = serviceRegistry.streamServices();
+// registeredServices.forEach(registeredService->{
+// final String serviceClassName = registeredService.getClass().getName();
+// servicesByClassName.put(serviceClassName, registeredService);
+// });
+// this.servicesByClassName = servicesByClassName;
+// }
+// }
// -- SERIALIZING ADAPTER IMPLEMENTATION
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
index aaf69970..beca2d8 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
@@ -60,7 +60,7 @@ public abstract class EventBusServiceDefault extends EventBusService {
*/
@Override
public void register(final Object domainService) {
- if(domainService instanceof RequestScopedService) {
+ if(false/*domainService instanceof RequestScopedService*/) {
// ok; allow to be registered multiple times (each xactn) since stored in a set.
} else {
if (Annotations.getAnnotation(domainService.getClass(), RequestScoped.class) != null) {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/ObjectAdapterServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/ObjectAdapterServiceDefault.java
index 780d105..12f4c5a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/ObjectAdapterServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/ObjectAdapterServiceDefault.java
@@ -26,6 +26,7 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import org.apache.isis.applib.services.inject.ServiceInjector;
+import org.apache.isis.commons.internal.debug._Probe;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
@@ -77,7 +78,11 @@ public class ObjectAdapterServiceDefault implements ObjectAdapterService {
break;
}
- throw _Exceptions.unexpectedCodeReach();
+
+ _Probe.errOut("UNKNOWN ManagedObject type: '%s'", pojo.getClass());
+
+ return null;
+ //throw _Exceptions.unmatchedCase("UNKNOWN ManagedObject type: " + pojo.getClass());
}
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/managers/cdi/CDIContextManager.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/managers/cdi/CDIContextManager.java
index 50c8ae1..3957b18 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/managers/cdi/CDIContextManager.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/managers/cdi/CDIContextManager.java
@@ -67,33 +67,22 @@ public class CDIContextManager implements ContextHandler {
val spec = specLoader.lookupBySpecId(specId);
val id = objectUri.getQuery();
- //TODO [2033] future extension ... to refine, convert id to array of Annotations
+ //TODO [2033] future extension ... to refine, convert id to qualifiers
val qualifiers = _Constants.emptyAnnotations;
- val beanOptional = serviceRegistry.getManagedBean(spec.getCorrespondingClass(), qualifiers);
+ val instance = serviceRegistry.getInstance(spec.getCorrespondingClass(), qualifiers);
probe.println("resolve spec='%s' -> '%s'",
spec.getSpecId().asString(),
- beanOptional);
-
- if(beanOptional.isPresent()) {
-
- val beanPojo = beanOptional.get();
- val managedObject = SimpleManagedObject.of(spec, beanPojo);
-
- return _CDI.InstanceFactory.singleton(managedObject);
-
- }
-
- // empty result
-
- return _CDI.InstanceFactory.empty();
+ instance);
+ return _CDI.InstanceFactory.mapElements(instance,
+ beanPojo->SimpleManagedObject.of(spec, beanPojo));
}
@Override
public boolean recognizes(ObjectSpecification spec) {
- return serviceRegistry.isRegisteredService(spec.getCorrespondingClass());
+ return serviceRegistry.isRegisteredBean(spec.getCorrespondingClass());
}
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
index e54b0ae..411db13 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
@@ -94,17 +94,9 @@ class IsisSessionFactoryBuilder {
final AuthorizationManager authorizationManager = IsisContext.getAuthorizationManager();
final RuntimeEventService runtimeEventService = serviceRegistry.lookupServiceElseFail(RuntimeEventService.class);
-// // specificationLoader
-// final Collection<MetaModelRefiner> metaModelRefiners = refiners(
-// authenticationManager,
-// authorizationManager,
-// new PersistenceSessionFactoryMetamodelRefiner());
-
- val metaModelRefiners = MetaModelRefiner.getAll();
-
final SpecificationLoader specificationLoader =
- componentProvider.createSpecificationLoader(metaModelRefiners);
-
+ componentProvider.createSpecificationLoader();
+
serviceRegistry.validateServices();
// instantiate the IsisSessionFactory
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java
index cd41d1f..f3da2e3 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java
@@ -19,17 +19,21 @@
package org.apache.isis.core.runtime.system.session;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import javax.annotation.PreDestroy;
+import javax.enterprise.inject.Instance;
import javax.enterprise.inject.Vetoed;
import javax.inject.Inject;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
+import org.apache.isis.applib.services.registry.ServiceRegistry.BeanAdapter;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.commons.internal.base._Blackhole;
import org.apache.isis.commons.internal.context._Context;
@@ -118,7 +122,11 @@ public class IsisSessionFactoryDefault implements IsisSessionFactory {
// do postConstruct. We store the initializer to do preDestroy on shutdown
serviceInitializer = new ServiceInitializer(configuration,
- serviceRegistry.streamServices().collect(Collectors.toList()));
+ Collections.emptyList()
+//TODO [2033] remove initializer, CDI takes over
+// serviceRegistry.streamServices().collect(Collectors.toList())
+ );
+
serviceInitializer.validate();
openSession(new InitialisationSession());
@@ -142,12 +150,20 @@ public class IsisSessionFactoryDefault implements IsisSessionFactory {
// translateServicesAndEnumConstants
//
- final List<Object> services = serviceRegistry.streamServices().collect(Collectors.toList());
- final TitleService titleService = serviceRegistry.lookupServiceElseFail(TitleService.class);
- for (Object service : services) {
- final String unused = titleService.titleOf(service);
+ val titleService = serviceRegistry.lookupServiceElseFail(TitleService.class);
+
+ final Stream<Object> domainServices = serviceRegistry.streamRegisteredBeans()
+ .filter(BeanAdapter::isDomainService)
+ .map(BeanAdapter::getInstance)
+ .filter(Instance::isResolvable)
+ .map(Instance::get)
+ ;
+
+ domainServices.forEach(domainService->{
+ final String unused = titleService.titleOf(domainService);
_Blackhole.consume(unused);
- }
+ });
+
// (previously we took a protective copy to avoid a concurrent modification exception,
// but this is now done by SpecificationLoader itself)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/SpecificationLoaderFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/SpecificationLoaderFactory.java
index 2df7bf5..ef7ff36 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/SpecificationLoaderFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/SpecificationLoaderFactory.java
@@ -21,8 +21,6 @@ package org.apache.isis.core.runtime.system.session;
import static org.apache.isis.config.internal._Config.getConfiguration;
-import java.util.Collection;
-
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
@@ -35,6 +33,8 @@ import org.apache.isis.core.runtime.system.IsisSystemException;
import org.apache.isis.progmodels.dflt.JavaReflectorHelper;
import org.apache.isis.progmodels.dflt.ProgrammingModelFacetsJava5;
+import lombok.val;
+
/**
*
*/
@@ -42,13 +42,13 @@ final class SpecificationLoaderFactory {
// -- CREATE SPECIFICATION LOADER
- public SpecificationLoader createSpecificationLoader(
- final Collection<MetaModelRefiner> metaModelRefiners) throws IsisSystemException {
+ public SpecificationLoader createSpecificationLoader()
+ throws IsisSystemException {
- final IsisConfiguration configuration = getConfiguration();
-
- final ProgrammingModel programmingModel = createProgrammingModel(configuration);
- final MetaModelValidator mmValidator = createMetaModelValidator(configuration);
+ val metaModelRefiners = MetaModelRefiner.getAll();
+ val configuration = getConfiguration();
+ val programmingModel = createProgrammingModel(configuration);
+ val mmValidator = createMetaModelValidator(configuration);
return JavaReflectorHelper.createSpecificationLoader(
programmingModel, metaModelRefiners, mmValidator);
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
index 45a2df4..022ff7d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
@@ -22,7 +22,11 @@ package org.apache.isis.core.runtime.system.transaction;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.CountDownLatch;
-import java.util.stream.Collectors;
+
+import javax.enterprise.inject.Instance;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.WithTransactionScope;
@@ -39,8 +43,6 @@ import org.apache.isis.core.runtime.persistence.transaction.CreateObjectCommand;
import org.apache.isis.core.runtime.persistence.transaction.DestroyObjectCommand;
import org.apache.isis.core.runtime.persistence.transaction.PersistenceCommand;
import org.apache.isis.core.runtime.services.auditing.AuditingServiceInternal;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import lombok.val;
@@ -169,7 +171,7 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
private final PublishingServiceInternal publishingServiceInternal;
private final AuditingServiceInternal auditingServiceInternal;
- private final List<WithTransactionScope> withTransactionScopes;
+ private final Instance<WithTransactionScope> withTransactionScopes;
private IsisException abortCause;
@@ -190,8 +192,8 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
this.publishingServiceInternal = serviceRegistry.lookupServiceElseFail(PublishingServiceInternal.class);
this.auditingServiceInternal = serviceRegistry.lookupServiceElseFail(AuditingServiceInternal.class);
- withTransactionScopes = serviceRegistry.streamServices(WithTransactionScope.class)
- .collect(Collectors.toList());
+ withTransactionScopes = serviceRegistry
+ .getInstance(WithTransactionScope.class);
this.state = State.IN_PROGRESS;
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
index fff2b5c..6d984b2 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
@@ -241,8 +241,10 @@ public class WebRequestCycleForIsis implements IRequestCycleListener {
// handle recognized exceptions gracefully also
- final Stream<ExceptionRecognizer> exceptionRecognizers =
- getServiceRegistry().streamServices(ExceptionRecognizer.class);
+ final Stream<ExceptionRecognizer> exceptionRecognizers = getServiceRegistry()
+ .getInstance(ExceptionRecognizer.class)
+ .stream();
+
String recognizedMessageIfAny = new ExceptionRecognizerComposite(exceptionRecognizers).recognize(ex);
if(recognizedMessageIfAny != null) {
return respondGracefully(cycle);
@@ -321,8 +323,10 @@ public class WebRequestCycleForIsis implements IRequestCycleListener {
exceptionRecognizers.add(pageExpiredExceptionRecognizer);
if(inIsisSession()) {
- getServiceRegistry().streamServices(ExceptionRecognizer.class)
- .forEach(exceptionRecognizers::add);
+ getServiceRegistry()
+ .getInstance(ExceptionRecognizer.class)
+ .stream()
+ .forEach(exceptionRecognizers::add);
} else {
val metaModelDeficiencies = IsisContext.getMetaModelDeficienciesIfAny();
if(metaModelDeficiencies != null) {
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index 03a00dc..9e2ae6f 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -470,7 +470,10 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> implements For
PersistableTypeGuard2.instate(resultAdapter);
- final Stream<RoutingService> routingServices = getServiceRegistry().streamServices(RoutingService.class);
+ final Stream<RoutingService> routingServices = getServiceRegistry()
+ .getInstance(RoutingService.class)
+ .stream();
+
final Object resultPojo = resultAdapter != null ? resultAdapter.getPojo() : null;
val pojoToAdapter = IsisContext.pojoToAdapter();
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index e995da4..d669b2d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -26,9 +26,16 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Predicate;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
+import javax.enterprise.inject.Instance;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.model.Model;
+
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.grid.Grid;
import org.apache.isis.applib.services.tablecol.TableColumnOrderService;
@@ -56,11 +63,6 @@ import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterTitleColumn;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterToggleboxColumn;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.model.Model;
/**
* {@link PanelAbstract Panel} that represents a {@link EntityCollectionModel
@@ -242,9 +244,8 @@ extends PanelAbstract<EntityCollectionModel> implements CollectionCountProvider
}
// optional SPI to reorder
- final List<TableColumnOrderService> tableColumnOrderServices =
- getServiceInjector().streamServices(TableColumnOrderService.class)
- .collect(Collectors.toList());
+ final Instance<TableColumnOrderService> tableColumnOrderServices =
+ getServiceRegistry().getInstance(TableColumnOrderService.class);
for (final TableColumnOrderService tableColumnOrderService : tableColumnOrderServices) {
final List<String> propertyReorderedIds = reordered(tableColumnOrderService, propertyIds);
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index a5928f2..5f4a5ed 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -208,8 +208,10 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
LOG.error("Failed to construct page, going back to sign in page", ex);
// REVIEW: similar code in WebRequestCycleForIsis
- final Stream<ExceptionRecognizer> exceptionRecognizers = getServiceInjector()
- .streamServices(ExceptionRecognizer.class);
+ final Stream<ExceptionRecognizer> exceptionRecognizers = getServiceRegistry()
+ .getInstance(ExceptionRecognizer.class)
+ .stream();
+
final String recognizedMessageIfAny = new ExceptionRecognizerComposite(exceptionRecognizers).recognize(ex);
final ExceptionModel exceptionModel = ExceptionModel.create(recognizedMessageIfAny, ex);
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
index bc5d052..cc4408e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -21,6 +21,19 @@ import java.util.Objects;
import java.util.concurrent.Callable;
import java.util.stream.Stream;
+import com.google.common.base.Throwables;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.Page;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.util.visit.IVisit;
+import org.apache.wicket.util.visit.IVisitor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.command.Command;
@@ -56,18 +69,6 @@ import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisBlobOrClobPanelAbstract;
import org.apache.isis.viewer.wicket.ui.errors.JGrowlUtil;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
-import org.apache.wicket.Component;
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.Page;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.util.visit.IVisit;
-import org.apache.wicket.util.visit.IVisitor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Throwables;
import lombok.val;
@@ -484,7 +485,8 @@ implements FormExecutor {
// see if the exception is recognized as being a non-serious error
// (nb: similar code in WebRequestCycleForIsis, as a fallback)
final Stream<ExceptionRecognizer> exceptionRecognizers = getServiceRegistry()
- .streamServices(ExceptionRecognizer.class);
+ .getInstance(ExceptionRecognizer.class)
+ .stream();
String recognizedErrorIfAny = new ExceptionRecognizerComposite(exceptionRecognizers).recognize(ex);
if (recognizedErrorIfAny != null) {