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 d58e5e1414 ISIS-3198: refactoring: cleaning up IResourceContext (2)
d58e5e1414 is described below
commit d58e5e14146bc1922ad123baebb170a8229ff496
Author: Andi Huber <[email protected]>
AuthorDate: Thu Sep 15 05:07:59 2022 +0200
ISIS-3198: refactoring: cleaning up IResourceContext (2)
---
.../restfulobjects/rendering/IResourceContext.java | 33 ++--------------------
.../AbstractObjectMemberReprRenderer.java | 8 +++---
.../domainobjects/DomainObjectReprRenderer.java | 12 ++++----
.../domainobjects/ObjectActionReprRenderer.java | 2 +-
.../ObjectCollectionReprRenderer.java | 6 ++--
.../domainobjects/ObjectPropertyReprRenderer.java | 6 ++--
.../domainobjects/ScalarValueReprRenderer.java | 2 +-
7 files changed, 22 insertions(+), 47 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 82d1d26689..35fcf200b6 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,6 +26,7 @@ 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.core.config.IsisConfiguration.Viewer.Restfulobjects;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.context.HasMetaModelContext;
import org.apache.isis.core.metamodel.object.ManagedObject;
@@ -73,36 +74,8 @@ public interface IResourceContext extends
HasMetaModelContext {
List<List<String>> getFollowLinks();
boolean isValidateOnly();
- default boolean honorUiHints() {
- return
getMetaModelContext().getConfiguration().getViewer().getRestfulobjects().isHonorUiHints();
- }
-
- default boolean objectPropertyValuesOnly() {
- return
getMetaModelContext().getConfiguration().getViewer().getRestfulobjects().isObjectPropertyValuesOnly();
- }
-
- default boolean suppressDescribedByLinks() {
- return
getMetaModelContext().getConfiguration().getViewer().getRestfulobjects().isSuppressDescribedByLinks();
- }
-
- default boolean suppressUpdateLink() {
- return
getMetaModelContext().getConfiguration().getViewer().getRestfulobjects().isSuppressUpdateLink();
- }
-
- default boolean suppressMemberId() {
- return
getMetaModelContext().getConfiguration().getViewer().getRestfulobjects().isSuppressMemberId();
- }
-
- default boolean suppressMemberLinks() {
- return
getMetaModelContext().getConfiguration().getViewer().getRestfulobjects().isSuppressMemberLinks();
- }
-
- default boolean suppressMemberExtensions() {
- return
getMetaModelContext().getConfiguration().getViewer().getRestfulobjects().isSuppressMemberExtensions();
- }
-
- default boolean suppressMemberDisabledReason() {
- return
getMetaModelContext().getConfiguration().getViewer().getRestfulobjects().isSuppressMemberDisabledReason();
+ default Restfulobjects config() {
+ return
getMetaModelContext().getConfiguration().getViewer().getRestfulobjects();
}
/**
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
index 4647258287..3e91758e7f 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/AbstractObjectMemberReprRenderer.java
@@ -169,7 +169,7 @@ extends ReprRendererAbstract<ManagedMember> {
*/
protected void renderMemberContent() {
- if(!resourceContext.suppressMemberId()) {
+ if(!resourceContext.config().isSuppressMemberId()) {
representation.mapPutString("id", objectMember.getId());
}
@@ -177,7 +177,7 @@ extends ReprRendererAbstract<ManagedMember> {
representation.mapPutString("memberType",
objectMemberType.getName());
}
- if (mode.isInline() && !resourceContext.suppressMemberLinks()) {
+ if (mode.isInline() &&
!resourceContext.config().isSuppressMemberLinks()) {
addDetailsLinkIfPersistent();
}
@@ -192,7 +192,7 @@ extends ReprRendererAbstract<ManagedMember> {
if (mode.isFollowed() || mode.isStandalone() || mode.isMutated()) {
addMutatorLinksIfEnabled();
- if(!mode.isInline() || !resourceContext.suppressUpdateLink()) {
+ if(!mode.isInline() ||
!resourceContext.config().isSuppressUpdateLink()) {
putExtensionsIsisProprietary();
}
addLinksToFormalDomainModel();
@@ -279,7 +279,7 @@ extends ReprRendererAbstract<ManagedMember> {
protected abstract void followDetailsLink(JsonRepresentation detailsLink);
protected final void putDisabledReasonIfDisabled() {
- if(resourceContext.suppressMemberDisabledReason()) {
+ if(resourceContext.config().isSuppressMemberDisabledReason()) {
return;
}
final String disabledReasonRep = usability().getReason();
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
index f7d5dfbd6d..8681850c83 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
@@ -207,7 +207,7 @@ extends ReprRendererAbstract<ManagedObject> {
}
// described by
- if (mode.includeDescribedBy() &&
!resourceContext.suppressDescribedByLinks()) {
+ if (mode.includeDescribedBy() &&
!resourceContext.config().isSuppressDescribedByLinks()) {
addLinkToDescribedBy();
addLinkToObjectLayout();
addLinkToObjectIcon();
@@ -216,7 +216,7 @@ extends ReprRendererAbstract<ManagedObject> {
addLinkToUp();
}
- if (!mode.isArgs() && !resourceContext.objectPropertyValuesOnly()) {
+ if (!mode.isArgs() &&
!resourceContext.config().isObjectPropertyValuesOnly()) {
// update/persist
addPersistLinkIfTransientAndPersistable();
addUpdatePropertiesLinkIfRequired();
@@ -290,7 +290,7 @@ extends ReprRendererAbstract<ManagedObject> {
addProperties(objectAdapter, appendTo, associations);
- if(!resourceContext.objectPropertyValuesOnly()) {
+ if(!resourceContext.config().isObjectPropertyValuesOnly()) {
if (!mode.isArgs() ) {
addCollections(objectAdapter, appendTo, associations);
}
@@ -336,7 +336,7 @@ extends ReprRendererAbstract<ManagedObject> {
}
final JsonRepresentation propertyValueRepresentation =
renderer.render();
- final JsonRepresentation propertyRepr =
resourceContext.objectPropertyValuesOnly()
+ final JsonRepresentation propertyRepr =
resourceContext.config().isObjectPropertyValuesOnly()
? propertyValueRepresentation.getRepresentation("value")
: propertyValueRepresentation;
members.mapPutJsonRepresentation(assoc.getId(),
propertyRepr);
@@ -446,7 +446,7 @@ extends ReprRendererAbstract<ManagedObject> {
new DomainObjectReprRenderer(getResourceContext(), null,
JsonRepresentation.newMap());
final JsonRepresentation domainObjectRepr =
renderer.with(objectAdapter).asUpdatePropertiesLinkArguments().render();
- if(!getResourceContext().suppressUpdateLink()) {
+ if(!getResourceContext().config().isSuppressUpdateLink()) {
val objectRef = ManagedObjects.stringifyElseFail(objectAdapter);
val updateLinkBuilder =
LinkBuilder.newBuilder(getResourceContext(), Rel.UPDATE.getName(),
RepresentationType.DOMAIN_OBJECT, "objects/%s",
objectRef).withHttpMethod(RestfulHttpMethod.PUT).withArguments(domainObjectRepr);
getLinks().arrayAdd(updateLinkBuilder.build());
@@ -462,7 +462,7 @@ extends ReprRendererAbstract<ManagedObject> {
val spec = domainObject.getSpecification();
if(spec.isValue()) {
- val context2 = JsonValueConverter.Context.of(objectFeature,
context.suppressMemberExtensions());
+ val context2 = JsonValueConverter.Context.of(objectFeature,
context.config().isSuppressMemberExtensions());
return jsonValueEncoder.asObject(domainObject, context2);
}
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
index 8c7cfea9e6..f063b6516b 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectActionReprRenderer.java
@@ -194,7 +194,7 @@ extends AbstractObjectMemberReprRenderer<ObjectAction> {
@Override
protected void addLinksToFormalDomainModel() {
- if(resourceContext.suppressDescribedByLinks()) {
+ if(resourceContext.config().isSuppressDescribedByLinks()) {
return;
}
final JsonRepresentation link =
ActionDescriptionReprRenderer.newLinkToBuilder(resourceContext,
Rel.DESCRIBEDBY, objectAdapter.getSpecification(), objectMember).build();
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
index a4f33488f6..57d0af6828 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectCollectionReprRenderer.java
@@ -65,7 +65,7 @@ extends
AbstractObjectMemberReprRenderer<OneToManyAssociation> {
final LinkFollowSpecs followValue =
getLinkFollowSpecs().follow("value");
final boolean eagerlyRender = !followValue.isTerminated()
- || (resourceContext.honorUiHints()
+ || (resourceContext.config().isHonorUiHints()
&& Facets.defaultViewIsTable(objectMember));
if ((mode.isInline() && eagerlyRender)
@@ -98,7 +98,7 @@ extends
AbstractObjectMemberReprRenderer<OneToManyAssociation> {
final LinkFollowSpecs followHref = linkFollower.follow("href");
final boolean eagerlyRender = !followHref.isTerminated()
- || (resourceContext.honorUiHints()
+ || (resourceContext.config().isHonorUiHints()
&& Facets.defaultViewIsTable(objectMember)
&& resourceContext.canEagerlyRender(valueAdapter));
@@ -159,7 +159,7 @@ extends
AbstractObjectMemberReprRenderer<OneToManyAssociation> {
@Override
protected void addLinksToFormalDomainModel() {
- if(resourceContext.suppressDescribedByLinks()) {
+ if(resourceContext.config().isSuppressDescribedByLinks()) {
return;
}
final JsonRepresentation link =
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
index c5e5fe7ee0..31a9fcabbd 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
@@ -94,7 +94,9 @@ extends AbstractObjectMemberReprRenderer<OneToOneAssociation>
{
.appendValueAndFormat(
valueAdapter,
representation,
- JsonValueConverter.Context.of(objectMember,
resourceContext.suppressMemberExtensions()));
+ JsonValueConverter.Context.of(
+ objectMember,
+
resourceContext.config().isSuppressMemberExtensions()));
return;
}
@@ -195,7 +197,7 @@ extends
AbstractObjectMemberReprRenderer<OneToOneAssociation> {
@Override
protected void addLinksToFormalDomainModel() {
- if(resourceContext.suppressDescribedByLinks()) {
+ if(resourceContext.config().isSuppressDescribedByLinks()) {
return;
}
final JsonRepresentation link =
PropertyDescriptionReprRenderer.newLinkToBuilder(getResourceContext(),
Rel.DESCRIBEDBY, objectAdapter.getSpecification(), objectMember).build();
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ScalarValueReprRenderer.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ScalarValueReprRenderer.java
index ef7fa55279..60ddc99391 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ScalarValueReprRenderer.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ScalarValueReprRenderer.java
@@ -71,7 +71,7 @@ implements HasObjectFeature {
val context = JsonValueConverter.Context.of(
getObjectFeature(),
- getResourceContext().suppressMemberExtensions());
+ getResourceContext().config().isSuppressMemberExtensions());
final Object value = jsonValueEncoder.asObject(objectAdapter, context);
representation.mapPut("value", value);
