[isis] branch v2 updated: ISIS-2158: fixes stereotypes on services that failed MM validation

[ah...@apache.org]

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

ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/v2 by this push:
     new 8247f3b  ISIS-2158: fixes stereotypes on services that failed MM validation
8247f3b is described below

commit 8247f3b857234e202617e33c67e370f21f6f24d3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Sep 20 20:32:45 2019 +0200

    ISIS-2158: fixes stereotypes on services that failed MM validation
    
    - we have still failing services, those that contribute to menus
---
 .../org/apache/isis/applib/services/command/CommandContext.java  | 6 ++----
 .../apache/isis/applib/services/iactn/InteractionContext.java    | 6 +++---
 .../system/transaction/ChangedObjectsServiceInternal.java        | 9 +++------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java b/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java
index 66ca2fe..25878b0 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/command/CommandContext.java
@@ -20,8 +20,7 @@ package org.apache.isis.applib.services.command;
 
 import javax.enterprise.context.RequestScoped;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import org.springframework.stereotype.Service;
 
 /**
  * This service (API and implementation) provides access to context information about any {@link Command}.
@@ -30,8 +29,7 @@ import org.apache.isis.applib.annotation.NatureOfService;
  * {@link org.apache.isis.applib.annotation.DomainService}.  This means that it is automatically registered and
  * available for use; no further configuration is required.
  */
-@DomainService(nature = NatureOfService.DOMAIN)
-@RequestScoped 
+@RequestScoped @Service 
 public class CommandContext {
 
     private Command command;
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
index 04a49bb..9e2eace 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/InteractionContext.java
@@ -20,8 +20,9 @@ package org.apache.isis.applib.services.iactn;
 
 import javax.enterprise.context.RequestScoped;
 
+import org.springframework.stereotype.Service;
+
 import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
 
 /**
  * This service (API and implementation) provides access to context information about any {@link Interaction}.
@@ -30,8 +31,7 @@ import org.apache.isis.applib.annotation.NatureOfService;
  * {@link DomainService}.  This means that it is automatically registered and
  * available for use; no further configuration is required.
  */
-@DomainService(nature = NatureOfService.DOMAIN)
-@RequestScoped
+@RequestScoped @Service
 public class InteractionContext {
 
     private Interaction interaction;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/ChangedObjectsServiceInternal.java b/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/ChangedObjectsServiceInternal.java
index 36d162b..d302a20 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/ChangedObjectsServiceInternal.java
+++ b/core/runtime/src/main/java/org/apache/isis/runtime/system/transaction/ChangedObjectsServiceInternal.java
@@ -27,8 +27,8 @@ import java.util.stream.Stream;
 
 import javax.enterprise.context.RequestScoped;
 
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
+import org.springframework.stereotype.Service;
+
 import org.apache.isis.applib.annotation.PublishingChangeKind;
 import org.apache.isis.applib.services.HasUniqueId;
 import org.apache.isis.applib.services.WithTransactionScope;
@@ -39,10 +39,7 @@ import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.spec.feature.Contributed;
 import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
 
-@DomainService(
-        nature = NatureOfService.DOMAIN
-        )
-@RequestScoped
+@RequestScoped @Service 
 public class ChangedObjectsServiceInternal implements WithTransactionScope {
 
     /**