[isis] branch master updated: ISIS-3198: refactoring: cleaning up IResourceContext

[ahuber]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4c7faef47b ISIS-3198: refactoring: cleaning up IResourceContext
4c7faef47b is described below

commit 4c7faef47b88f44384135de19a2fec0ee3808dbb
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Wed Sep 14 17:14:47 2022 +0200

    ISIS-3198: refactoring: cleaning up IResourceContext
---
 .../isis/viewer/restfulobjects/rendering/IResourceContext.java   | 9 ---------
 .../restfulobjects/viewer/resources/HomePageReprRenderer.java    | 2 +-
 .../viewer/restfulobjects/viewer/resources/UserReprRenderer.java | 2 +-
 .../restfulobjects/viewer/resources/UserResourceServerside.java  | 2 +-
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git 
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
 
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
index 735ff059ce..82d1d26689 100644
--- 
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
+++ 
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
@@ -26,10 +26,8 @@ import javax.ws.rs.core.MediaType;
 
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.services.bookmark.Bookmark;
-import org.apache.isis.applib.services.iactn.InteractionProvider;
 import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
 import org.apache.isis.core.metamodel.context.HasMetaModelContext;
-import org.apache.isis.core.metamodel.context.MetaModelContext;
 import org.apache.isis.core.metamodel.object.ManagedObject;
 import 
org.apache.isis.viewer.restfulobjects.rendering.domainobjects.DomainObjectReprRenderer;
 import 
org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAdapterLinkTo;
@@ -122,13 +120,6 @@ public interface IResourceContext extends 
HasMetaModelContext {
      */
     RepresentationService.Intent getIntent();
 
-    @Deprecated // use directly
-    default InteractionProvider getInteractionProvider() {
-        return getInteractionService();
-    }
-
-    MetaModelContext getMetaModelContext();
-
     // -- UTILITY
 
     default Optional<ManagedObject> getObjectAdapterForOidFromHref(final 
String oidFromHref) {
diff --git 
a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
 
b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
index 9f632da409..5858f47916 100644
--- 
a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
+++ 
b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
@@ -69,7 +69,7 @@ extends ReprRendererAbstract<Void> {
 
         val metaModelContext = 
super.getResourceContext().getMetaModelContext();
 
-        
addLinkToUser(getResourceContext().getInteractionProvider().currentInteractionContextElseFail());
+        
addLinkToUser(getResourceContext().getInteractionService().currentInteractionContextElseFail());
         addLinksToApplicationLogos();
         addLinkToMenuBars();
         addLinkToServices(metaModelContext.streamServiceAdapters());
diff --git 
a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
 
b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
index 457dc0d9d6..6ab7eca556 100644
--- 
a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
+++ 
b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
@@ -63,7 +63,7 @@ extends ReprRendererAbstract<InteractionContext> {
         final LinkFollowSpecs linkFollower = 
getLinkFollowSpecs().follow("links");
         if (linkFollower.matches(link)) {
             final UserReprRenderer renderer = new 
UserReprRenderer(getResourceContext(), linkFollower, 
JsonRepresentation.newMap());
-            
renderer.with(getResourceContext().getInteractionProvider().currentInteractionContextElseFail());
+            
renderer.with(getResourceContext().getInteractionService().currentInteractionContextElseFail());
             link.mapPutJsonRepresentation("value", renderer.render());
         }
 
diff --git 
a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
 
b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
index be36841fb5..63356ff278 100644
--- 
a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
+++ 
b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserResourceServerside.java
@@ -65,7 +65,7 @@ public class UserResourceServerside extends ResourceAbstract 
implements UserReso
                 RepresentationType.USER, Where.NOWHERE, 
RepresentationService.Intent.NOT_APPLICABLE);
 
         final UserReprRenderer renderer = new 
UserReprRenderer(resourceContext, null, JsonRepresentation.newMap());
-        
renderer.includesSelf().with(resourceContext.getInteractionProvider().currentInteractionContextElseFail());
+        
renderer.includesSelf().with(resourceContext.getInteractionService().currentInteractionContextElseFail());
 
         return Responses.ofOk(renderer, Caching.ONE_HOUR).build();
     }