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/05/09 12:05:25 UTC
[isis] branch 2112_SpringBoot updated: ISIS-2112: replace uses of
_CDI by _Spring
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2112_SpringBoot
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/2112_SpringBoot by this push:
new 331a56d ISIS-2112: replace uses of _CDI by _Spring
331a56d is described below
commit 331a56d392c253d1da0f1590891288c2cd56fbaa
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu May 9 14:05:19 2019 +0200
ISIS-2112: replace uses of _CDI by _Spring
Task-Url: https://issues.apache.org/jira/browse/ISIS-2112
---
.../applib/services/registry/ServiceRegistry.java | 63 +++++++++++-----------
.../isis/commons/internal/spring/_Spring.java | 29 ++++++++++
.../org/apache/isis/config/AppConfigLocator.java | 60 ++++++++++++---------
.../isis/core/metamodel/MetaModelContexts.java | 26 ++++-----
.../metamodel/MetaModelServiceDefault.java | 5 +-
.../integration/wicket/WebRequestCycleForIsis.java | 3 +-
6 files changed, 115 insertions(+), 71 deletions(-)
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 5336dad..43fe694 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
@@ -29,8 +29,8 @@ import javax.annotation.Priority;
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 org.apache.isis.commons.internal.spring._Spring;
import org.apache.isis.commons.ioc.BeanAdapter;
import org.apache.isis.core.commons.collections.Bin;
@@ -50,7 +50,7 @@ public interface ServiceRegistry {
* @return
*/
boolean isDomainServiceType(Class<?> cls);
-
+
/**
* Obtains a child Instance for the given required type and additional required qualifiers.
* @param type
@@ -60,31 +60,29 @@ public interface ServiceRegistry {
*/
default public <T> Bin<T> select(
final Class<T> type, Annotation[] qualifiers){
-
- val bin = qualifiers!=null
- ? _CDI.select(type, _CDI.filterQualifiers(qualifiers))
- : _CDI.select(type);
-
- return bin;
+
+ //CDI variant, just keep comment as a reference
+ //return _CDI.select(type, _CDI.filterQualifiers(qualifiers));
+ return _Spring.select(type, qualifiers);
}
-
+
default public <T> Bin<T> select(final Class<T> type){
return select(type, _Constants.emptyAnnotations);
}
-
+
/**
* Returns all bean adapters implementing the requested type.
*/
default Stream<BeanAdapter> streamRegisteredBeansOfType(Class<?> requiredType) {
return streamRegisteredBeans()
- .filter(beanAdapter->beanAdapter.isCandidateFor(requiredType));
+ .filter(beanAdapter->beanAdapter.isCandidateFor(requiredType));
}
-
+
/**
* Returns all bean adapters that have been registered.
*/
public Stream<BeanAdapter> streamRegisteredBeans();
-
+
/**
* Returns a domain service implementing the requested type.
* <p>
@@ -92,7 +90,7 @@ public interface ServiceRegistry {
* see {@link Priority}
*/
default public <T> Optional<T> lookupService(final Class<T> serviceClass) {
-
+
val bin = select(serviceClass);
if(bin.isEmpty()) {
return Optional.empty();
@@ -101,14 +99,14 @@ public interface ServiceRegistry {
return bin.getSingleton();
}
// dealing with ambiguity, get the one, with highest priority annotated
-
+
val prioComparator = InstanceByPriorityComparator.instance();
val toMaxPrioReduction =
//TODO [2033] not tested yet, whether the 'direction' is correct < vs >
_Reduction.<T>of((max, next)-> prioComparator.leftIsHigherThanRight(next, max) ? next : max);
-
+
bin.forEach(toMaxPrioReduction);
-
+
return toMaxPrioReduction.getResult();
}
@@ -117,11 +115,16 @@ public interface ServiceRegistry {
.orElseThrow(()->
new NoSuchElementException("Could not locate service of type '" + serviceClass + "'"));
}
-
+
+ /**
+ *
+ * @deprecated use streamRegisteredBeans() instead, then on call-site
+ * don't keep service instances, instead keep BeanAdpaters
+ */
@Deprecated //TODO [2033] as long as services are wrapped into ObjectAdapters that require a
// pojo, this is still required
Stream<Object> streamServices();
-
+
/**
* @param cls
* @return whether the exact type is registered as service
@@ -129,7 +132,7 @@ public interface ServiceRegistry {
@Deprecated //TODO [2033] marked deprecated, because this should not be required by the
// framework at all, its also hard to implement correctly
boolean isRegisteredBean(Class<?> cls);
-
+
/**
* synonym for isRegisteredBean
* @param cls
@@ -139,28 +142,28 @@ public interface ServiceRegistry {
default boolean isService(Class<?> cls) {
return isRegisteredBean(cls);
}
-
+
/**
* Verify domain service Ids are unique.
* @throws IllegalStateException - if validation fails
*/
void validateServices();
-
+
// -- PRIORITY ANNOTATION HANDLING
-
+
static class InstanceByPriorityComparator implements Comparator<Object> {
-
+
private final static InstanceByPriorityComparator INSTANCE =
new InstanceByPriorityComparator();
-
+
public static InstanceByPriorityComparator instance() {
return INSTANCE;
}
@Override
public int compare(Object o1, Object o2) {
-
+
if(o1==null) {
if(o2==null) {
return 0;
@@ -171,19 +174,19 @@ public interface ServiceRegistry {
if(o2==null) {
return 1; // o1 > o2
}
-
+
val prioAnnot1 = _Reflect.getAnnotation(o1.getClass(), Priority.class);
val prioAnnot2 = _Reflect.getAnnotation(o2.getClass(), Priority.class);
val prio1 = prioAnnot1!=null ? prioAnnot1.value() : 0;
val prio2 = prioAnnot2!=null ? prioAnnot2.value() : 0;
return Integer.compare(prio1, prio2);
}
-
+
public boolean leftIsHigherThanRight(Object left, Object right) {
return compare(left, right) > 0;
}
-
+
}
-
+
}
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/spring/_Spring.java b/core/commons/src/main/java/org/apache/isis/commons/internal/spring/_Spring.java
index 0ab6cb7..d6cf0fe 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/spring/_Spring.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/spring/_Spring.java
@@ -18,6 +18,7 @@
*/
package org.apache.isis.commons.internal.spring;
+import java.lang.annotation.Annotation;
import java.util.NoSuchElementException;
import java.util.Optional;
import java.util.function.Predicate;
@@ -29,12 +30,16 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.ResolvableType;
+import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.commons.ioc.BeanAdapter;
import org.apache.isis.commons.ioc.LifecycleContext;
import org.apache.isis.core.commons.collections.Bin;
+import static org.apache.isis.commons.internal.base._With.requires;
+
import lombok.val;
/**
@@ -58,10 +63,34 @@ public class _Spring {
}
public static <T> Bin<T> select(final Class<T> requiredType) {
+ requires(requiredType, "requiredType");
+
val allMatchingBeans = context().getBeanProvider(requiredType).orderedStream();
return Bin.ofStream(allMatchingBeans);
}
+ public static <T> Bin<T> select(final Class<T> requiredType, @Nullable Annotation[] qualifiers) {
+
+ requires(requiredType, "requiredType");
+
+ val allMatchingBeans = context().getBeanProvider(requiredType)
+ .orderedStream();
+
+ if(_NullSafe.isEmpty(qualifiers)) {
+ return Bin.ofStream(allMatchingBeans);
+ }
+
+ val qualifiersRequired = _Sets.of(qualifiers);
+
+ final Predicate<T> hasAllQualifiers = t -> {
+ val qualifiersPresent = _Sets.of(t.getClass().getAnnotations());
+ return qualifiersPresent.containsAll(qualifiersRequired);
+ };
+
+ return Bin.ofStream(allMatchingBeans
+ .filter(hasAllQualifiers));
+ }
+
/**
*
* @param filterDomainService - usually ServiceRegistry::isDomainServiceType
diff --git a/core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java b/core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java
index 17136d4..29e56a5 100644
--- a/core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java
+++ b/core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java
@@ -26,72 +26,84 @@ import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.cdi._CDI;
import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.context._Plugin;
+import org.apache.isis.commons.internal.spring._Spring;
import org.apache.isis.config.builder.IsisConfigurationBuilder;
import org.apache.isis.core.commons.exceptions.IsisException;
public final class AppConfigLocator {
-
+
private static final Logger LOG = LoggerFactory.getLogger(AppConfigLocator.class);
-
+
private AppConfigLocator() { }
-
+
public static AppConfig getAppConfig() {
return _Context.computeIfAbsent(AppConfig.class, ()->lookupAppConfig());
}
-
+
// -- HELPER
-
+
private static AppConfig lookupAppConfig() {
-
+
AppConfig appConfig;
-
- appConfig = lookupAppConfig_UsingCDI();
+
+ // appConfig = lookupAppConfig_UsingCDI();
+ // if(appConfig!=null) {
+ // LOG.info(String.format("Located AppConfig '%s' via CDI.", appConfig.getClass().getName()));
+ // return appConfig;
+ // }
+
+ appConfig = lookupAppConfig_UsingSpring();
if(appConfig!=null) {
- LOG.info(String.format("Located AppConfig '%s' via CDI.", appConfig.getClass().getName()));
+ LOG.info(String.format("Located AppConfig '%s' via Spring.", appConfig.getClass().getName()));
return appConfig;
}
-
+
appConfig = lookupAppConfig_UsingServiceLoader();
if(appConfig!=null) {
LOG.info(String.format("Located AppConfig '%s' via ServiceLoader.", appConfig.getClass().getName()));
return appConfig;
}
-
+
appConfig = lookupAppConfig_UsingConfigProperties();
if(appConfig!=null) {
LOG.info(String.format("Located AppConfig '%s' using config properties.", appConfig.getClass().getName()));
return appConfig;
}
-
+
throw new IsisException("Failed to locate the AppManifest");
}
-
+
+ @SuppressWarnings("unused")
private static AppConfig lookupAppConfig_UsingCDI() {
return _CDI.getSingletonElseFail(AppConfig.class);
}
-
+
+ private static AppConfig lookupAppConfig_UsingSpring() {
+ return _Spring.getSingletonElseFail(AppConfig.class);
+ }
+
private static AppConfig lookupAppConfig_UsingServiceLoader() {
-
+
return _Plugin.getOrElse(AppConfig.class,
ambiguousPlugins->{
throw _Plugin.ambiguityNonRecoverable(AppConfig.class, ambiguousPlugins);
},
()->null);
}
-
+
// to support pre 2.0.0-M2 behavior
private static AppConfig lookupAppConfig_UsingConfigProperties() {
-
+
IsisConfigurationBuilder builder = IsisConfigurationBuilder.getDefault();
String appManifestClassName = builder.peekAtString("isis.appManifest");
-
+
final Class<AppManifest> appManifestClass;
try {
appManifestClass = _Casts.uncheckedCast(_Context.loadClassAndInitialize(appManifestClassName));
} catch (ClassNotFoundException e) {
throw new IsisException("Failed to locate the AppManifest using config properties.", e);
}
-
+
final AppManifest appManifest;
try {
appManifest = appManifestClass.newInstance();
@@ -99,13 +111,13 @@ public final class AppConfigLocator {
throw new IsisException(
String.format("Failed to create instance of AppManifest '%s'.", appManifestClass), e);
}
-
+
// Note: AppConfig is a FunctionalInterface
return ()->IsisConfiguration.buildFromAppManifest(appManifest);
-
+
}
-
-
-
+
+
+
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContexts.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContexts.java
index 3fce760..50acf0d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContexts.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/MetaModelContexts.java
@@ -31,8 +31,8 @@ import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.commons.internal.cdi._CDI;
import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.commons.internal.spring._Spring;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.internal._Config;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -60,43 +60,43 @@ public final class MetaModelContexts {
@Getter(lazy=true)
private final IsisConfiguration configuration =
- _Config.getConfiguration();
+ _Config.getConfiguration();
@Getter(lazy=true)
private final ObjectAdapterProvider objectAdapterProvider =
- _CDI.getSingletonElseFail(ObjectAdapterProvider.class);
+ _Spring.getSingletonElseFail(ObjectAdapterProvider.class);
@Getter(lazy=true)
private final ServiceInjector serviceInjector =
- _CDI.getSingletonElseFail(ServiceInjector.class);
+ _Spring.getSingletonElseFail(ServiceInjector.class);
@Getter(lazy=true)
private final ServiceRegistry serviceRegistry =
- _CDI.getSingletonElseFail(ServiceRegistry.class);
+ _Spring.getSingletonElseFail(ServiceRegistry.class);
@Getter(lazy=true)
private final SpecificationLoader specificationLoader =
- _CDI.getSingletonElseFail(SpecificationLoader.class);
+ _Spring.getSingletonElseFail(SpecificationLoader.class);
@Getter(lazy=true)
private final AuthenticationSessionProvider authenticationSessionProvider =
- _CDI.getSingletonElseFail(AuthenticationSessionProvider.class);
+ _Spring.getSingletonElseFail(AuthenticationSessionProvider.class);
@Getter(lazy=true)
private final TranslationService translationService =
- _CDI.getSingletonElseFail(TranslationService.class);
+ _Spring.getSingletonElseFail(TranslationService.class);
@Getter(lazy=true)
private final AuthorizationManager authorizationManager =
- _CDI.getSingletonElseFail(AuthorizationManager.class);
+ _Spring.getSingletonElseFail(AuthorizationManager.class);
@Getter(lazy=true)
private final AuthenticationManager authenticationManager =
- _CDI.getSingletonElseFail(AuthenticationManager.class);
+ _Spring.getSingletonElseFail(AuthenticationManager.class);
@Getter(lazy=true)
private final TitleService titleService =
- _CDI.getSingletonElseFail(TitleService.class);
+ _Spring.getSingletonElseFail(TitleService.class);
// @Getter(lazy=true)
// private final ObjectAdapterService objectAdapterService =
@@ -104,11 +104,11 @@ public final class MetaModelContexts {
@Getter(lazy=true)
private final RepositoryService repositoryService =
- _CDI.getSingletonElseFail(RepositoryService.class);
+ _Spring.getSingletonElseFail(RepositoryService.class);
@Getter(lazy=true)
private final TransactionService transactionService =
- _CDI.getSingletonElseFail(TransactionService.class);
+ _Spring.getSingletonElseFail(TransactionService.class);
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index bfdb765..8ddc824 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.services.grid.GridService;
import org.apache.isis.applib.services.metamodel.DomainMember;
import org.apache.isis.applib.services.metamodel.DomainModel;
import org.apache.isis.applib.services.metamodel.MetaModelService;
-import org.apache.isis.commons.internal.cdi._CDI;
+import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.config.internal._Config;
import org.apache.isis.core.metamodel.facets.actions.command.CommandFacet;
@@ -88,7 +88,7 @@ public class MetaModelServiceDefault implements MetaModelService {
@Override
public void rebuild(final Class<?> domainType) {
- GridService gridService = _CDI.getSingletonElseFail(GridService.class);
+ GridService gridService = serviceRegistry.lookupServiceElseFail(GridService.class);
gridService.remove(domainType);
specificationLoader.reloadSpecification(domainType);
@@ -272,6 +272,7 @@ public class MetaModelServiceDefault implements MetaModelService {
return metaModelExporter.exportMetaModel(config);
}
+ @Inject ServiceRegistry serviceRegistry;
@Inject SpecificationLoader specificationLoader;
//@Inject GridService gridService; // to break circular dependency
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 ef6573f..805349b 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
@@ -54,7 +54,6 @@ import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerForType;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.commons.internal.cdi._CDI;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.debug._Probe;
import org.apache.isis.core.metamodel.adapter.concurrency.ConcurrencyChecking;
@@ -93,7 +92,7 @@ public class WebRequestCycleForIsis implements IRequestCycleListener {
private final static _Probe probe = _Probe.unlimited().label("WebRequestCycleForIsis");
private _Lazy<RequestContextService> requestContextService = _Lazy.of(()->
- _CDI.getSingletonElseFail(RequestContextService.class));
+ IsisContext.getServiceRegistry().lookupServiceElseFail(RequestContextService.class));
public final static MetaDataKey<RequestContextHandle> REQUEST_CONTEXT_HANDLE_KEY
= new MetaDataKey<RequestContextHandle>() {