[isis] 02/03: ISIS-2033: move @ApplicationScoped from interfaces to implementations

[ah...@apache.org]

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

commit a73fcec2d7172d82533bae4c02055bc142adabf1
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jan 8 13:21:40 2019 +0100

    ISIS-2033: move @ApplicationScoped from interfaces to implementations
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-2033
---
 .../org/apache/isis/applib/services/email/EmailService.java |  2 --
 .../org/apache/isis/applib/services/grid/GridService.java   |  3 ---
 .../isis/applib/services/i18n/TranslationService.java       |  3 ---
 .../apache/isis/applib/services/inject/ServiceInjector.java |  3 ---
 .../apache/isis/applib/services/message/MessageService.java |  3 ---
 .../isis/applib/services/registry/ServiceRegistry.java      |  2 --
 .../main/java/org/apache/isis/config/IsisConfiguration.java | 13 +++++--------
 .../core/metamodel/services/ServiceInjectorDefault.java     |  3 ++-
 .../core/metamodel/services/grid/GridServiceDefault.java    |  3 ++-
 .../metamodel/services/registry/ServiceRegistryDefault.java |  7 ++++---
 .../core/runtime/services/email/EmailServiceDefault.java    |  3 ++-
 .../core/runtime/services/i18n/po/TranslationServicePo.java |  3 ++-
 .../runtime/services/message/MessageServiceDefault.java     |  3 ++-
 13 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailService.java b/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailService.java
index 5f4cfe1..d2ca299 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/email/EmailService.java
@@ -23,7 +23,6 @@ import java.util.List;
 
 import javax.activation.DataSource;
 import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
 
 import org.apache.isis.applib.annotation.Programmatic;
 
@@ -35,7 +34,6 @@ import org.apache.isis.applib.annotation.Programmatic;
  * HTML message, using an external SMTP provider.  See the Isis website for further details.
  * </p>
  */
-@ApplicationScoped
 public interface EmailService extends Serializable {
 
     /**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/grid/GridService.java b/core/applib/src/main/java/org/apache/isis/applib/services/grid/GridService.java
index 158cccc..249a5bb 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/grid/GridService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/grid/GridService.java
@@ -16,8 +16,6 @@
  */
 package org.apache.isis.applib.services.grid;
 
-import javax.enterprise.context.ApplicationScoped;
-
 import org.apache.isis.applib.annotation.ActionLayout;
 import org.apache.isis.applib.annotation.CollectionLayout;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
@@ -26,7 +24,6 @@ import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.annotation.PropertyLayout;
 import org.apache.isis.applib.layout.grid.Grid;
 
-@ApplicationScoped
 public interface GridService {
 
     /**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslationService.java b/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslationService.java
index 9e26c46..f3b04b8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslationService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslationService.java
@@ -21,11 +21,8 @@ package org.apache.isis.applib.services.i18n;
 import java.util.Objects;
 import java.util.function.Predicate;
 
-import javax.enterprise.context.ApplicationScoped;
-
 import org.apache.isis.applib.annotation.Programmatic;
 
-@ApplicationScoped
 public interface TranslationService {
 
     /**
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 dd5d3d0..352c5d1 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
@@ -19,8 +19,6 @@ package org.apache.isis.applib.services.inject;
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import javax.enterprise.context.ApplicationScoped;
-
 /**
  * The repository of services, also able to inject into any object.
  *
@@ -29,7 +27,6 @@ import javax.enterprise.context.ApplicationScoped;
  * </p>
  *
  */
-@ApplicationScoped
 public interface ServiceInjector {
 
     <T> T injectServicesInto(final T domainObject);
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/message/MessageService.java b/core/applib/src/main/java/org/apache/isis/applib/services/message/MessageService.java
index 56d7575..2bb8963 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/message/MessageService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/message/MessageService.java
@@ -19,12 +19,9 @@
 
 package org.apache.isis.applib.services.message;
 
-import javax.enterprise.context.ApplicationScoped;
-
 import org.apache.isis.applib.annotation.Programmatic;
 import org.apache.isis.applib.services.i18n.TranslatableString;
 
-@ApplicationScoped
 public interface MessageService {
 
     /**
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 164b27d..42628cc 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
@@ -24,7 +24,6 @@ import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Instance;
 
 import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
@@ -35,7 +34,6 @@ import org.apache.isis.commons.internal.cdi._CDI;
  * @since 2.0.0-M2
  *
  */
-@ApplicationScoped
 public interface ServiceRegistry {
 
     /**
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index e9980be..974e80c 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -19,25 +19,23 @@
 
 package org.apache.isis.config;
 
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+import static org.apache.isis.config.internal._Config.acceptBuilder;
+import static org.apache.isis.config.internal._Config.clear;
+import static org.apache.isis.config.internal._Config.getConfiguration;
+
 import java.awt.Color;
 import java.awt.Font;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.stream.Stream;
 
-import javax.enterprise.context.ApplicationScoped;
-
 import org.apache.isis.applib.AppManifest;
 import org.apache.isis.applib.Module;
 import org.apache.isis.applib.PropertyResource;
 import org.apache.isis.config.builder.IsisConfigurationBuilder;
 import org.apache.isis.config.resource.ResourceStreamSource;
 
-import static org.apache.isis.commons.internal.base._NullSafe.stream;
-import static org.apache.isis.config.internal._Config.acceptBuilder;
-import static org.apache.isis.config.internal._Config.clear;
-import static org.apache.isis.config.internal._Config.getConfiguration;
-
 /**
  * Immutable set of properties representing the configuration of the running
  * system.
@@ -52,7 +50,6 @@ import static org.apache.isis.config.internal._Config.getConfiguration;
  * Thus the {@link IsisConfiguration} held by different components may vary, but
  * with each being a possible superset of the previous.
  */
-@ApplicationScoped
 public interface IsisConfiguration {
     
     /**
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 2de8324..4afbdc4 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
@@ -29,6 +29,7 @@ import java.util.stream.Stream;
 
 import javax.annotation.PostConstruct;
 import javax.ejb.Singleton;
+import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 
@@ -45,7 +46,7 @@ import org.apache.isis.core.commons.util.ToString;
 import org.apache.isis.core.metamodel.exceptions.MetaModelException;
 import org.apache.isis.core.metamodel.spec.InjectorMethodEvaluator;
 
-@Singleton
+@Singleton @ApplicationScoped
 public class ServiceInjectorDefault implements ServiceInjector {
     
     private static final Logger LOG = LoggerFactory.getLogger(ServiceInjectorDefault.class);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
index 44dbf9d..d73597d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
@@ -20,6 +20,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import javax.ejb.Singleton;
+import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
@@ -33,7 +34,7 @@ import org.apache.isis.commons.internal.base._Casts;
 import org.apache.isis.commons.internal.base._NullSafe;
 import org.apache.isis.commons.internal.collections._Lists;
 
-@Singleton
+@Singleton @ApplicationScoped
 public class GridServiceDefault implements GridService {
 
     //private static final Logger LOG = LoggerFactory.getLogger(GridServiceDefault.class);
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 68f5181..ac171a1 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,6 +19,8 @@
 
 package org.apache.isis.core.metamodel.services.registry;
 
+import static org.apache.isis.commons.internal.base._NullSafe.stream;
+
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -30,6 +32,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import javax.ejb.Singleton;
+import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Instance;
 import javax.enterprise.inject.spi.Bean;
@@ -50,15 +53,13 @@ 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 static org.apache.isis.commons.internal.base._NullSafe.stream;
-
 import lombok.val;
 import lombok.extern.slf4j.Slf4j;
 
 /**
  * @since 2.0.0-M2
  */
-@Singleton @Slf4j
+@Singleton @ApplicationScoped @Slf4j
 public final class ServiceRegistryDefault implements ServiceRegistry {
     
     /**
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
index d39b2d0..437626a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
@@ -25,6 +25,7 @@ import java.util.Properties;
 import javax.activation.DataSource;
 import javax.annotation.PostConstruct;
 import javax.ejb.Singleton;
+import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
 import org.apache.commons.mail.DefaultAuthenticator;
@@ -42,7 +43,7 @@ import org.apache.isis.config.IsisConfiguration;
 /**
  * A service that sends email notifications when specific events occur
  */
-@Singleton
+@Singleton @ApplicationScoped
 public class EmailServiceDefault implements EmailService {
 
     private static final long serialVersionUID = 1L;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
index ae0f215..07f05dc 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
@@ -21,6 +21,7 @@ package org.apache.isis.core.runtime.services.i18n.po;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.ejb.Singleton;
+import javax.enterprise.context.ApplicationScoped;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,7 +34,7 @@ import org.apache.isis.commons.internal.context._Context;
 
 import static org.apache.isis.config.internal._Config.getConfiguration;
 
-@Singleton
+@Singleton @ApplicationScoped
 public class TranslationServicePo implements TranslationService {
 
     public static Logger LOG = LoggerFactory.getLogger(TranslationServicePo.class);
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/message/MessageServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/message/MessageServiceDefault.java
index f2b2989..f7bd4e9 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/message/MessageServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/message/MessageServiceDefault.java
@@ -19,6 +19,7 @@
 package org.apache.isis.core.runtime.services.message;
 
 import javax.ejb.Singleton;
+import javax.enterprise.context.ApplicationScoped;
 
 import org.apache.isis.applib.RecoverableException;
 import org.apache.isis.applib.services.i18n.TranslatableString;
@@ -27,7 +28,7 @@ import org.apache.isis.applib.services.message.MessageService;
 import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
 import org.apache.isis.core.security.authentication.MessageBroker;
 
-@Singleton
+@Singleton @ApplicationScoped
 public class MessageServiceDefault implements MessageService {
 
     @Override