This is an automated email from the ASF dual-hosted git repository. ahuber pushed a commit to branch spring6 in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/spring6 by this push: new 2a6e4c155e ISIS-3275: cleanup prev. commit (resteasy provisioning) 2a6e4c155e is described below commit 2a6e4c155ef4d30b98fe762422d69e89d4d79a25 Author: Andi Huber <ahu...@apache.org> AuthorDate: Sun Nov 27 09:33:25 2022 +0100 ISIS-3275: cleanup prev. commit (resteasy provisioning) --- .../resources/DomainObjectResourceServerside.java | 13 ++----- .../resources/DomainServiceResourceServerside.java | 13 ++----- .../resources/DomainTypeResourceServerside.java | 13 ++----- .../resources/HomePageResourceServerside.java | 13 ++----- .../viewer/resources/ImageResourceServerside.java | 13 ++----- .../resources/MenuBarsResourceServerside.java | 13 ++----- .../viewer/resources/ResourceAbstract.java | 41 +++++++++------------- .../viewer/resources/UserResourceServerside.java | 16 +++------ .../resources/VersionResourceServerside.java | 11 ++---- 9 files changed, 35 insertions(+), 111 deletions(-) diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java index 0575b560a4..03f69af6eb 100644 --- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java +++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainObjectResourceServerside.java @@ -21,7 +21,6 @@ package org.apache.causeway.viewer.restfulobjects.viewer.resources; import java.io.InputStream; import java.util.Optional; -import jakarta.inject.Inject; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; @@ -32,7 +31,6 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; @@ -45,12 +43,9 @@ import org.apache.causeway.applib.layout.component.DomainObjectLayoutData; import org.apache.causeway.applib.layout.component.PropertyLayoutData; import org.apache.causeway.applib.layout.grid.Grid; import org.apache.causeway.applib.layout.links.Link; -import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker; import org.apache.causeway.commons.internal.codec._UrlDecoderUtil; -import org.apache.causeway.core.config.CausewayConfiguration; import org.apache.causeway.core.metamodel.consent.Consent; import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy; -import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facets.object.icon.ObjectIcon; import org.apache.causeway.core.metamodel.interactions.managed.ManagedMember; import org.apache.causeway.core.metamodel.interactions.managed.MemberInteraction.AccessIntent; @@ -82,12 +77,8 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements DomainObjectResource { - @Inject - public DomainObjectResourceServerside( - final @Context MetaModelContext metaModelContext, - final @Context CausewayConfiguration causewayConfiguration, - final @Context InteractionLayerTracker iInteractionLayerTracker) { - super(metaModelContext, causewayConfiguration, iInteractionLayerTracker); + public DomainObjectResourceServerside() { + super(); log.debug("<init>"); } diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java index 94f9118af8..991ba19039 100644 --- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java +++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java @@ -22,7 +22,6 @@ import java.io.InputStream; import java.util.function.Predicate; import java.util.stream.Stream; -import jakarta.inject.Inject; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; @@ -32,17 +31,13 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.Where; -import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker; import org.apache.causeway.commons.internal.codec._UrlDecoderUtil; -import org.apache.causeway.core.config.CausewayConfiguration; -import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.facets.object.domainservice.DomainServiceFacet; import org.apache.causeway.core.metamodel.object.ManagedObject; import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation; @@ -71,12 +66,8 @@ implements DomainServiceResource { return DomainServiceFacet.isContributing(input.getSpecification()); }; - @Inject - public DomainServiceResourceServerside( - final @Context MetaModelContext metaModelContext, - final @Context CausewayConfiguration causewayConfiguration, - final @Context InteractionLayerTracker iInteractionLayerTracker) { - super(metaModelContext, causewayConfiguration, iInteractionLayerTracker); + public DomainServiceResourceServerside() { + super(); log.debug("<init>"); } diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java index aafd8cc65e..519b54ed4a 100644 --- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java +++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/DomainTypeResourceServerside.java @@ -20,23 +20,18 @@ package org.apache.causeway.viewer.restfulobjects.viewer.resources; import java.util.function.UnaryOperator; -import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.Where; -import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker; import org.apache.causeway.commons.internal.base._Strings; -import org.apache.causeway.core.config.CausewayConfiguration; -import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.spec.feature.ObjectActionParameter; import org.apache.causeway.core.metamodel.spec.feature.OneToManyAssociation; import org.apache.causeway.core.metamodel.spec.feature.OneToOneAssociation; @@ -83,12 +78,8 @@ public class DomainTypeResourceServerside extends ResourceAbstract implements DomainTypeResource { - @Inject - public DomainTypeResourceServerside( - final @Context MetaModelContext metaModelContext, - final @Context CausewayConfiguration causewayConfiguration, - final @Context InteractionLayerTracker iInteractionLayerTracker) { - super(metaModelContext, causewayConfiguration, iInteractionLayerTracker); + public DomainTypeResourceServerside() { + super(); log.debug("<init>"); } diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java index 10aa4ea9e7..cc4753dcd6 100644 --- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java +++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/HomePageResourceServerside.java @@ -18,20 +18,15 @@ */ package org.apache.causeway.viewer.restfulobjects.viewer.resources; -import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.Where; -import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker; -import org.apache.causeway.core.config.CausewayConfiguration; -import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation; import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType; import org.apache.causeway.viewer.restfulobjects.applib.RestfulMediaType; @@ -52,12 +47,8 @@ public class HomePageResourceServerside extends ResourceAbstract implements HomePageResource { - @Inject - public HomePageResourceServerside( - final @Context MetaModelContext metaModelContext, - final @Context CausewayConfiguration causewayConfiguration, - final @Context InteractionLayerTracker iInteractionLayerTracker) { - super(metaModelContext, causewayConfiguration, iInteractionLayerTracker); + public HomePageResourceServerside() { + super(); log.debug("<init>"); } diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java index 4d479b7bbc..caa6c6d741 100644 --- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java +++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ImageResourceServerside.java @@ -21,20 +21,15 @@ package org.apache.causeway.viewer.restfulobjects.viewer.resources; import java.io.IOException; import java.io.InputStream; -import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.Response; import org.springframework.stereotype.Component; -import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker; import org.apache.causeway.commons.internal.base._Bytes; import org.apache.causeway.commons.internal.resources._Resources; -import org.apache.causeway.core.config.CausewayConfiguration; -import org.apache.causeway.core.metamodel.context.MetaModelContext; import lombok.extern.log4j.Log4j2; @@ -43,12 +38,8 @@ import lombok.extern.log4j.Log4j2; @Log4j2 public class ImageResourceServerside extends ResourceAbstract { - @Inject - public ImageResourceServerside( - final @Context MetaModelContext metaModelContext, - final @Context CausewayConfiguration causewayConfiguration, - final @Context InteractionLayerTracker iInteractionLayerTracker) { - super(metaModelContext, causewayConfiguration, iInteractionLayerTracker); + public ImageResourceServerside() { + super(); log.debug("<init>"); } diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java index 06881c3466..673ccac783 100644 --- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java +++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/MenuBarsResourceServerside.java @@ -20,10 +20,8 @@ package org.apache.causeway.viewer.restfulobjects.viewer.resources; import java.util.function.Consumer; -import jakarta.inject.Inject; import jakarta.ws.rs.HttpMethod; import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; @@ -33,10 +31,7 @@ import org.apache.causeway.applib.annotation.Where; import org.apache.causeway.applib.layout.component.ServiceActionLayoutData; import org.apache.causeway.applib.layout.links.Link; import org.apache.causeway.applib.layout.menubars.MenuBars; -import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker; import org.apache.causeway.applib.services.menu.MenuBarsService; -import org.apache.causeway.core.config.CausewayConfiguration; -import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.viewer.restfulobjects.applib.Rel; import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType; import org.apache.causeway.viewer.restfulobjects.applib.RestfulMediaType; @@ -53,12 +48,8 @@ public class MenuBarsResourceServerside extends ResourceAbstract implements Menu public static final String SERVICE_IDENTIFIER = "1"; - @Inject - public MenuBarsResourceServerside( - final @Context MetaModelContext metaModelContext, - final @Context CausewayConfiguration causewayConfiguration, - final @Context InteractionLayerTracker iInteractionLayerTracker) { - super(metaModelContext, causewayConfiguration, iInteractionLayerTracker); + public MenuBarsResourceServerside() { + super(); } @Override diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java index 904a8689b8..0d04776bd9 100644 --- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java +++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/ResourceAbstract.java @@ -22,7 +22,6 @@ import java.io.InputStream; import java.util.Map; import java.util.function.UnaryOperator; -import jakarta.inject.Inject; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.ws.rs.core.Context; @@ -32,18 +31,19 @@ import jakarta.ws.rs.core.SecurityContext; import jakarta.ws.rs.core.UriInfo; import jakarta.ws.rs.ext.Providers; +import org.springframework.beans.factory.annotation.Autowired; + import org.apache.causeway.applib.annotation.Where; import org.apache.causeway.applib.services.bookmark.Bookmark; -import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker; +import org.apache.causeway.commons.internal.assertions._Assert; import org.apache.causeway.commons.internal.base._Refs; import org.apache.causeway.commons.internal.base._Strings; import org.apache.causeway.commons.internal.codec._UrlDecoderUtil; -import org.apache.causeway.core.config.CausewayConfiguration; import org.apache.causeway.core.config.viewer.web.WebAppContextPath; import org.apache.causeway.core.metamodel.consent.InteractionInitiatedBy; +import org.apache.causeway.core.metamodel.context.HasMetaModelContext; import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.core.metamodel.object.ManagedObject; -import org.apache.causeway.core.metamodel.specloader.SpecificationLoader; import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType; import org.apache.causeway.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode; import org.apache.causeway.viewer.restfulobjects.rendering.RestfulObjectsApplicationException; @@ -52,14 +52,16 @@ import org.apache.causeway.viewer.restfulobjects.rendering.service.Representatio import org.apache.causeway.viewer.restfulobjects.rendering.util.Util; import org.apache.causeway.viewer.restfulobjects.viewer.context.ResourceContext; +import lombok.Getter; import lombok.NonNull; import lombok.val; -public abstract class ResourceAbstract { +public abstract class ResourceAbstract +implements HasMetaModelContext { - protected final MetaModelContext metaModelContext; - protected final CausewayConfiguration causewayConfiguration; - protected final InteractionLayerTracker iInteractionLayerTracker; + @Getter(onMethod_={@Override}) + @Autowired protected MetaModelContext metaModelContext; + @Autowired protected WebAppContextPath webAppContextPath; @Context HttpHeaders httpHeaders; @Context UriInfo uriInfo; @@ -69,17 +71,8 @@ public abstract class ResourceAbstract { @Context SecurityContext securityContext; @Context Providers providers; - @Inject WebAppContextPath webAppContextPath; - - @Inject - protected ResourceAbstract( - final MetaModelContext metaModelContext, - final CausewayConfiguration causewayConfiguration, - final InteractionLayerTracker iInteractionLayerTracker) { - - this.metaModelContext = metaModelContext; - this.causewayConfiguration = causewayConfiguration; - this.iInteractionLayerTracker = iInteractionLayerTracker; + protected ResourceAbstract() { + System.err.printf("before inject %s%n", this.getClass()); } // -- FACTORIES @@ -109,12 +102,14 @@ public abstract class ResourceAbstract { final ResourceDescriptor resourceDescriptor, final String urlUnencodedQueryString) { - if (!iInteractionLayerTracker.isInInteraction()) { + _Assert.assertNotNull(metaModelContext, ()->"injection points not resolved for " + this.getClass()); + + if (!metaModelContext.getInteractionService().isInInteraction()) { throw RestfulObjectsApplicationException.create(HttpStatusCode.UNAUTHORIZED); } // eg. http://localhost:8080/ctx/restful/ - final String restfulAbsoluteBase = causewayConfiguration.getViewer().getRestfulobjects().getBaseUri() + final String restfulAbsoluteBase = getConfiguration().getViewer().getRestfulobjects().getBaseUri() .orElseGet(()->uriInfo.getBaseUri().toString()); // eg. /ctx/restful/ @@ -165,10 +160,6 @@ public abstract class ResourceAbstract { bookmark))); } - protected SpecificationLoader getSpecificationLoader() { - return metaModelContext.getSpecificationLoader(); - } - // -- HELPER private String getUrlDecodedQueryStringIfAny() { diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/UserResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/UserResourceServerside.java index c49f9f85e2..34b4bd3251 100644 --- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/UserResourceServerside.java +++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/UserResourceServerside.java @@ -21,18 +21,13 @@ package org.apache.causeway.viewer.restfulobjects.viewer.resources; import java.net.URI; import java.net.URISyntaxException; -import jakarta.inject.Inject; import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.Where; -import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker; -import org.apache.causeway.core.config.CausewayConfiguration; -import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation; import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType; import org.apache.causeway.viewer.restfulobjects.applib.RestfulMediaType; @@ -46,16 +41,15 @@ import org.apache.causeway.viewer.restfulobjects.viewer.context.ResourceContext; import org.apache.causeway.viewer.restfulobjects.viewer.webmodule.CausewayRestfulObjectsInteractionFilter; import lombok.val; +import lombok.extern.log4j.Log4j2; @Component +@Log4j2 public class UserResourceServerside extends ResourceAbstract implements UserResource { - @Inject - public UserResourceServerside( - final @Context MetaModelContext metaModelContext, - final @Context CausewayConfiguration causewayConfiguration, - final @Context InteractionLayerTracker iInteractionLayerTracker) { - super(metaModelContext, causewayConfiguration, iInteractionLayerTracker); + public UserResourceServerside() { + super(); + log.debug("<init>"); } @Override diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java index 53c20066ed..2c768167dd 100644 --- a/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java +++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/causeway/viewer/restfulobjects/viewer/resources/VersionResourceServerside.java @@ -24,7 +24,6 @@ import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; @@ -32,9 +31,6 @@ import jakarta.ws.rs.core.Response; import org.springframework.stereotype.Component; import org.apache.causeway.applib.annotation.Where; -import org.apache.causeway.applib.services.iactnlayer.InteractionLayerTracker; -import org.apache.causeway.core.config.CausewayConfiguration; -import org.apache.causeway.core.metamodel.context.MetaModelContext; import org.apache.causeway.viewer.restfulobjects.applib.JsonRepresentation; import org.apache.causeway.viewer.restfulobjects.applib.RepresentationType; import org.apache.causeway.viewer.restfulobjects.applib.RestfulMediaType; @@ -63,11 +59,8 @@ extends ResourceAbstract implements VersionResource { @Inject - public VersionResourceServerside( - final @Context MetaModelContext metaModelContext, - final @Context CausewayConfiguration causewayConfiguration, - final @Context InteractionLayerTracker iInteractionLayerTracker) { - super(metaModelContext, causewayConfiguration, iInteractionLayerTracker); + public VersionResourceServerside() { + super(); log.debug("<init>"); }