This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch ISIS-1976-rethink-object-adapters in repository https://gitbox.apache.org/repos/asf/isis.git
commit 30d9e29e779c730c6b6bfe1ae84c1d7524554cca Author: Andi Huber <ahu...@apache.org> AuthorDate: Thu Sep 6 06:36:00 2018 +0200 ISIS-1976: improve code readability Task-Url: https://issues.apache.org/jira/browse/ISIS-1976 --- .../core/metamodel/services/ServicesInjector.java | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java index d293abc..c345f38 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java @@ -146,15 +146,6 @@ public class ServicesInjector implements ApplicationScopedComponent { serviceByConcreteType.clear(); autowire(); } - - private Map<Class<?>, Object> initServiceByConcreteType(){ - final Map<Class<?>, Object> map = _Maps.newHashMap(); - for (Object service : services) { - final Class<?> concreteType = service.getClass(); - map.put(concreteType, service); - } - return map; - } public boolean isRegisteredService(final Class<?> cls) { return serviceByConcreteType.get().containsKey(cls); @@ -457,6 +448,17 @@ public class ServicesInjector implements ApplicationScopedComponent { .forEach(filteredServicesAndContainer::add); } + // -- LAZY INIT + + private Map<Class<?>, Object> initServiceByConcreteType(){ + final Map<Class<?>, Object> map = _Maps.newHashMap(); + for (Object service : services) { + final Class<?> concreteType = service.getClass(); + map.put(concreteType, service); + } + return map; + } + // -- REFLECTIVE PREDICATES private static final Predicate<Object> isOfType(final Class<?> cls) {