You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/05/14 04:44:44 UTC
[isis] branch master updated: ISIS-3051: bit of post-processor refactoring
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 8811966a87 ISIS-3051: bit of post-processor refactoring
8811966a87 is described below
commit 8811966a8739a97c2abcbfc8ae17ebce81c3d1dc
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat May 14 06:44:37 2022 +0200
ISIS-3051: bit of post-processor refactoring
- naming, remove no-ops
---
.../CssClassFaFacetOnMemberPostProcessor.java | 24 +--------------
.../ObjectSpecificationPostProcessorAbstract.java | 31 ++++++++++---------
....java => DescribedAsFromTypePostProcessor.java} | 11 +++----
.../i18n/SynthesizeObjectNamingPostProcessor.java | 21 -------------
.../all/i18n/TranslationPostProcessor.java | 2 --
...cessor.java => AuthorizationPostProcessor.java} | 9 ++----
...ctionParamDefaultsAndChoicesPostProcessor.java} | 24 ++-------------
.../TweakDomainEventsForMixinPostProcessor.java | 12 --------
...avigationFacetFromHiddenTypePostProcessor.java} | 15 +++------
...sor.java => ProjectionFacetsPostProcessor.java} | 28 +++--------------
...ava => DisabledFromImmutablePostProcessor.java} | 22 ++-----------
...ssor.java => ChoicesFromTypePostProcessor.java} | 28 ++++++-----------
...ssor.java => DefaultFromTypePostProcessor.java} | 24 ++-------------
...ava => TypicalLengthFromTypePostProcessor.java} | 18 ++---------
.../dflt/ProgrammingModelFacetsJava11.java | 36 +++++++++++-----------
.../facets/TenantedAuthorizationPostProcessor.java | 18 +++++------
16 files changed, 77 insertions(+), 246 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberPostProcessor.java
index 4ff315682d..732a029334 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/annotprop/CssClassFaFacetOnMemberPostProcessor.java
@@ -26,9 +26,6 @@ import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProcessorAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import lombok.val;
@@ -40,10 +37,6 @@ extends ObjectSpecificationPostProcessorAbstract {
super(mmc);
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification) {
- }
-
@Override
protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction objectAction) {
@@ -51,9 +44,7 @@ extends ObjectSpecificationPostProcessorAbstract {
return; // don't process mixin main method, instead process its peer
}
- val hasExplicitFaIcon = objectAction
- .lookupNonFallbackFacet(CssClassFaFacet.class)
- .isPresent();
+ val hasExplicitFaIcon = objectAction.containsNonFallbackFacet(CssClassFaFacet.class);
if(!hasExplicitFaIcon) {
FacetUtil.addFacetIfPresent(
@@ -62,17 +53,4 @@ extends ObjectSpecificationPostProcessorAbstract {
}
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction objectAction,
- final ObjectActionParameter param) {
- }
-
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToOneAssociation prop) {
- }
-
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToManyAssociation coll) {
- }
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/ObjectSpecificationPostProcessorAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/ObjectSpecificationPostProcessorAbstract.java
index 65bc778e5d..0466b1df25 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/ObjectSpecificationPostProcessorAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/ObjectSpecificationPostProcessorAbstract.java
@@ -52,27 +52,28 @@ implements ObjectSpecificationPostProcessor {
doPostProcess(objectSpecification);
objectSpecification.streamRuntimeActions(MixedIn.INCLUDED)
- .forEach(objectAction -> {
- objectAction.streamParameters()
- .forEach(param -> doPostProcess(objectSpecification, objectAction, param));
- });
+ .forEach(act -> {
- objectSpecification.streamRuntimeActions(MixedIn.INCLUDED)
- .forEach(act -> doPostProcess(objectSpecification, act));
+ act.streamParameters()
+ .forEach(param -> doPostProcess(objectSpecification, act, param));
+
+ doPostProcess(objectSpecification, act);
+
+ });
- objectSpecification.streamProperties(MixedIn.INCLUDED).
- forEach(prop -> doPostProcess(objectSpecification, prop));
+ objectSpecification.streamProperties(MixedIn.INCLUDED)
+ .forEach(prop -> doPostProcess(objectSpecification, prop));
- objectSpecification.streamCollections(MixedIn.INCLUDED).
- forEach(coll -> doPostProcess(objectSpecification, coll));
+ objectSpecification.streamCollections(MixedIn.INCLUDED)
+ .forEach(coll -> doPostProcess(objectSpecification, coll));
}
- protected abstract void doPostProcess(ObjectSpecification objSpec);
- protected abstract void doPostProcess(ObjectSpecification objSpec, ObjectAction act);
- protected abstract void doPostProcess(ObjectSpecification objSpec, ObjectAction act, ObjectActionParameter param);
- protected abstract void doPostProcess(ObjectSpecification objSpec, OneToOneAssociation prop);
- protected abstract void doPostProcess(ObjectSpecification objSpec, OneToManyAssociation coll);
+ protected void doPostProcess(final ObjectSpecification objSpec) {};
+ protected void doPostProcess(final ObjectSpecification objSpec, final ObjectAction act) {};
+ protected void doPostProcess(final ObjectSpecification objSpec, final ObjectAction act, final ObjectActionParameter param) {};
+ protected void doPostProcess(final ObjectSpecification objSpec, final OneToOneAssociation prop) {};
+ protected void doPostProcess(final ObjectSpecification objSpec, final OneToManyAssociation coll) {};
protected static FacetedMethod facetedMethodFor(final ObjectMember objectMember) {
// TODO: hacky, need to copy facet onto underlying peer, not to the action/association itself.
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DeriveDescribedAsFromTypePostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DescribedAsFromTypePostProcessor.java
similarity index 94%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DeriveDescribedAsFromTypePostProcessor.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DescribedAsFromTypePostProcessor.java
index cc13a7984a..f28267d6f7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DeriveDescribedAsFromTypePostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/DescribedAsFromTypePostProcessor.java
@@ -35,19 +35,14 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-public class DeriveDescribedAsFromTypePostProcessor
+public class DescribedAsFromTypePostProcessor
extends ObjectSpecificationPostProcessorAbstract {
@Inject
- public DeriveDescribedAsFromTypePostProcessor(final MetaModelContext mmc) {
+ public DescribedAsFromTypePostProcessor(final MetaModelContext mmc) {
super(mmc);
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification) {
- // no-op
- }
-
@Override
protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction objectAction) {
if(objectAction.containsNonFallbackFacet(MemberDescribedFacet.class)) {
@@ -86,6 +81,8 @@ extends ObjectSpecificationPostProcessorAbstract {
handle(coll);
}
+ // -- HELPER
+
private void handle(final ObjectAssociation objectAssociation) {
if(objectAssociation.containsNonFallbackFacet(MemberDescribedFacet.class)) {
return;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/SynthesizeObjectNamingPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/SynthesizeObjectNamingPostProcessor.java
index 61761c534d..4e2a3a0614 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/SynthesizeObjectNamingPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/SynthesizeObjectNamingPostProcessor.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.core.metamodel.postprocessors.all.i18n;
-
import javax.inject.Inject;
import org.apache.isis.commons.collections.Can;
@@ -32,10 +31,6 @@ import org.apache.isis.core.metamodel.facets.all.named.ObjectNamedFacet;
import org.apache.isis.core.metamodel.facets.all.named.ObjectNamedFacetSynthesized;
import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProcessorAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import lombok.val;
@@ -89,22 +84,6 @@ extends ObjectSpecificationPostProcessorAbstract {
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction act) {
- }
-
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction objectAction, final ObjectActionParameter param) {
- }
-
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToOneAssociation prop) {
- }
-
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToManyAssociation coll) {
- }
-
// -- HELEPR
private String getSingularFallbackNoun(final ObjectSpecification spec) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/TranslationPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/TranslationPostProcessor.java
index 084e624a65..7dd4e61d53 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/TranslationPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/TranslationPostProcessor.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.core.metamodel.postprocessors.all.i18n;
-
import java.util.Optional;
import java.util.stream.Stream;
@@ -109,5 +108,4 @@ extends ObjectSpecificationPostProcessorAbstract {
.forEach(HasMemoizableTranslation::memoizeTranslations);
}
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/allbutparam/authorization/AuthorizationFacetPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/allbutparam/authorization/AuthorizationPostProcessor.java
similarity index 85%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/allbutparam/authorization/AuthorizationFacetPostProcessor.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/allbutparam/authorization/AuthorizationPostProcessor.java
index bf5d61ca8c..48d40046db 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/allbutparam/authorization/AuthorizationFacetPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/allbutparam/authorization/AuthorizationPostProcessor.java
@@ -25,15 +25,14 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProcessorAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-public class AuthorizationFacetPostProcessor
+public class AuthorizationPostProcessor
extends ObjectSpecificationPostProcessorAbstract {
@Inject
- public AuthorizationFacetPostProcessor(final MetaModelContext metaModelContext) {
+ public AuthorizationPostProcessor(final MetaModelContext metaModelContext) {
super(metaModelContext);
}
@@ -47,10 +46,6 @@ public class AuthorizationFacetPostProcessor
addFacet(act);
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction objectAction, final ObjectActionParameter param) {
- }
-
@Override
protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToOneAssociation prop) {
addFacet(prop);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/collparam/DeriveCollectionParamDefaultsAndChoicesPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/collparam/CollectionParamDefaultsAndChoicesPostProcessor.java
similarity index 87%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/collparam/DeriveCollectionParamDefaultsAndChoicesPostProcessor.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/collparam/CollectionParamDefaultsAndChoicesPostProcessor.java
index 02bd1a5a9f..70ddeff4b6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/collparam/DeriveCollectionParamDefaultsAndChoicesPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/collparam/CollectionParamDefaultsAndChoicesPostProcessor.java
@@ -32,37 +32,20 @@ import org.apache.isis.core.metamodel.spec.feature.MixedIn;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import lombok.val;
/**
* Sets up all the {@link Facet}s for an action in a single shot.
*/
-public class DeriveCollectionParamDefaultsAndChoicesPostProcessor
+public class CollectionParamDefaultsAndChoicesPostProcessor
extends ObjectSpecificationPostProcessorAbstract {
@Inject
- public DeriveCollectionParamDefaultsAndChoicesPostProcessor(final MetaModelContext metaModelContext) {
+ public CollectionParamDefaultsAndChoicesPostProcessor(final MetaModelContext metaModelContext) {
super(metaModelContext);
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification) {
- }
-
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction act) {
- }
-
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction objectAction, final ObjectActionParameter param) {
- }
-
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToOneAssociation prop) {
- }
-
@Override
protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToManyAssociation collection) {
@@ -108,6 +91,7 @@ extends ObjectSpecificationPostProcessorAbstract {
});
}
+ // -- HELPER
private static void addCollectionParamDefaultsFacetIfNoneAlready(
final ObjectActionParameter collectionParam) {
@@ -128,10 +112,8 @@ extends ObjectSpecificationPostProcessorAbstract {
scalarOrCollectionParam.containsNonFallbackFacet(ActionParameterAutoCompleteFacet.class)) {
return;
}
-
FacetUtil.addFacet(new ActionParameterChoicesFacetFromParentedCollection(
scalarOrCollectionParam, otma));
}
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/TweakDomainEventsForMixinPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/TweakDomainEventsForMixinPostProcessor.java
index e4c113826b..5d88b70251 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/TweakDomainEventsForMixinPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/TweakDomainEventsForMixinPostProcessor.java
@@ -48,7 +48,6 @@ import org.apache.isis.core.metamodel.facets.properties.property.modify.Property
import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProcessorAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionMixedIn;
@@ -63,11 +62,6 @@ extends ObjectSpecificationPostProcessorAbstract {
super(metaModelContext);
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification) {
- // no-op
- }
-
@Override
protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction objectAction) {
@@ -91,11 +85,6 @@ extends ObjectSpecificationPostProcessorAbstract {
}
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction objectAction, final ObjectActionParameter param) {
- // no-op
- }
-
@Override
protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToOneAssociation property) {
@@ -178,5 +167,4 @@ extends ObjectSpecificationPostProcessorAbstract {
}
}
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/navigation/DeriveNavigationFacetFromHiddenTypePostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/navigation/NavigationFacetFromHiddenTypePostProcessor.java
similarity index 82%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/navigation/DeriveNavigationFacetFromHiddenTypePostProcessor.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/navigation/NavigationFacetFromHiddenTypePostProcessor.java
index 9f98e1ee76..8501abc71d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/navigation/DeriveNavigationFacetFromHiddenTypePostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/members/navigation/NavigationFacetFromHiddenTypePostProcessor.java
@@ -27,7 +27,6 @@ import org.apache.isis.core.metamodel.facets.object.hidden.HiddenTypeFacet;
import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProcessorAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
@@ -36,26 +35,18 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
* Installs the {@link NavigationFacetFromHiddenType} on all of the
* {@link ObjectMember}s of the {@link ObjectSpecification}.
*/
-public class DeriveNavigationFacetFromHiddenTypePostProcessor extends ObjectSpecificationPostProcessorAbstract {
+public class NavigationFacetFromHiddenTypePostProcessor extends ObjectSpecificationPostProcessorAbstract {
@Inject
- public DeriveNavigationFacetFromHiddenTypePostProcessor(final MetaModelContext metaModelContext) {
+ public NavigationFacetFromHiddenTypePostProcessor(final MetaModelContext metaModelContext) {
super(metaModelContext);
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification) {
- }
-
@Override
protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction act) {
addFacetIfRequired(act, act.getReturnType());
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction objectAction, final ObjectActionParameter param) {
- }
-
@Override
protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToOneAssociation prop) {
addFacetIfRequired(prop, prop.getElementType());
@@ -66,6 +57,8 @@ public class DeriveNavigationFacetFromHiddenTypePostProcessor extends ObjectSpec
addFacetIfRequired(coll, coll.getElementType());
}
+ // -- HELPER
+
private static void addFacetIfRequired(final FacetHolder facetHolder, final ObjectSpecification navigatedType) {
if(navigatedType.containsNonFallbackFacet(HiddenTypeFacet.class)) {
FacetUtil.addFacet(new NavigationFacetFromHiddenType(facetHolder, navigatedType));
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/object/DeriveProjectionFacetsPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/object/ProjectionFacetsPostProcessor.java
similarity index 76%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/object/DeriveProjectionFacetsPostProcessor.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/object/ProjectionFacetsPostProcessor.java
index 3ace11190d..7f35c6609d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/object/DeriveProjectionFacetsPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/object/ProjectionFacetsPostProcessor.java
@@ -18,9 +18,10 @@
*/
package org.apache.isis.core.metamodel.postprocessors.object;
-import org.springframework.lang.Nullable;
import javax.inject.Inject;
+import org.springframework.lang.Nullable;
+
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -32,18 +33,14 @@ import org.apache.isis.core.metamodel.facets.object.projection.ident.TitleFacetF
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProcessorAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import lombok.val;
-public class DeriveProjectionFacetsPostProcessor
+public class ProjectionFacetsPostProcessor
extends ObjectSpecificationPostProcessorAbstract {
@Inject
- public DeriveProjectionFacetsPostProcessor(final MetaModelContext metaModelContext) {
+ public ProjectionFacetsPostProcessor(final MetaModelContext metaModelContext) {
super(metaModelContext);
}
@@ -68,21 +65,7 @@ extends ObjectSpecificationPostProcessorAbstract {
}
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction act) {
- }
-
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction objectAction, final ObjectActionParameter param) {
- }
-
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToOneAssociation prop) {
- }
-
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToManyAssociation coll) {
- }
+ // -- HELPER
private static boolean canOverwrite(final @Nullable Facet existingFacet) {
return existingFacet == null
@@ -90,5 +73,4 @@ extends ObjectSpecificationPostProcessorAbstract {
|| existingFacet.getPrecedence().isInferred();
}
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/properties/DeriveDisabledFromImmutablePostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/properties/DisabledFromImmutablePostProcessor.java
similarity index 83%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/properties/DeriveDisabledFromImmutablePostProcessor.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/properties/DisabledFromImmutablePostProcessor.java
index 5a8a28b45b..f6e1e39d80 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/properties/DeriveDisabledFromImmutablePostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/properties/DisabledFromImmutablePostProcessor.java
@@ -26,13 +26,11 @@ import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
import org.apache.isis.core.metamodel.facets.object.domainobject.editing.ImmutableFacetFromConfiguration;
import org.apache.isis.core.metamodel.facets.object.immutable.EditingEnabledFacet;
import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
-import org.apache.isis.core.metamodel.facets.properties.disabled.fromimmutable.DisabledFacetOnPropertyFromImmutableFactory;
import org.apache.isis.core.metamodel.facets.properties.disabled.fromimmutable.DisabledFacetOnPropertyFromImmutable;
+import org.apache.isis.core.metamodel.facets.properties.disabled.fromimmutable.DisabledFacetOnPropertyFromImmutableFactory;
import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProcessorAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import lombok.val;
@@ -41,18 +39,14 @@ import lombok.val;
/**
* Replaces {@link DisabledFacetOnPropertyFromImmutableFactory}
*/
-public class DeriveDisabledFromImmutablePostProcessor
+public class DisabledFromImmutablePostProcessor
extends ObjectSpecificationPostProcessorAbstract {
@Inject
- public DeriveDisabledFromImmutablePostProcessor(final MetaModelContext metaModelContext) {
+ public DisabledFromImmutablePostProcessor(final MetaModelContext metaModelContext) {
super(metaModelContext);
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification) {
- }
-
@Override
protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction act) {
// previously was also copying ImmutableFacet from spec onto Action (as for properties and collections ...
@@ -60,10 +54,6 @@ extends ObjectSpecificationPostProcessorAbstract {
// properties and collections, so no point in copying over.
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction objectAction, final ObjectActionParameter param) {
- }
-
@Override
protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToOneAssociation property) {
if(property.containsNonFallbackFacet(DisabledFacet.class)) {
@@ -93,10 +83,4 @@ extends ObjectSpecificationPostProcessorAbstract {
});
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToManyAssociation coll) {
-
- }
-
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveChoicesFromExistingChoicesPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/ChoicesFromTypePostProcessor.java
similarity index 77%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveChoicesFromExistingChoicesPostProcessor.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/ChoicesFromTypePostProcessor.java
index 4816fe7604..40be54df86 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveChoicesFromExistingChoicesPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/ChoicesFromTypePostProcessor.java
@@ -24,8 +24,8 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
import org.apache.isis.core.metamodel.facets.param.choices.ActionParameterChoicesFacet;
-import org.apache.isis.core.metamodel.facets.param.choices.enums.ActionParameterChoicesFacetFromChoicesFacetFactory;
import org.apache.isis.core.metamodel.facets.param.choices.enums.ActionParameterChoicesFacetFromChoicesFacet;
+import org.apache.isis.core.metamodel.facets.param.choices.enums.ActionParameterChoicesFacetFromChoicesFacetFactory;
import org.apache.isis.core.metamodel.facets.properties.choices.PropertyChoicesFacet;
import org.apache.isis.core.metamodel.facets.properties.choices.enums.PropertyChoicesFacetFromChoicesFacet;
import org.apache.isis.core.metamodel.facets.properties.choices.enums.PropertyChoicesFacetFromChoicesFacetFactory;
@@ -33,31 +33,25 @@ import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProc
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
/**
* Replaces {@link ActionParameterChoicesFacetFromChoicesFacetFactory}
* and {@link PropertyChoicesFacetFromChoicesFacetFactory}
*/
-public class DeriveChoicesFromExistingChoicesPostProcessor
+public class ChoicesFromTypePostProcessor
extends ObjectSpecificationPostProcessorAbstract {
@Inject
- public DeriveChoicesFromExistingChoicesPostProcessor(final MetaModelContext metaModelContext) {
+ public ChoicesFromTypePostProcessor(final MetaModelContext metaModelContext) {
super(metaModelContext);
}
@Override
- protected void doPostProcess(final ObjectSpecification objectSpecification) {
- }
-
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction act) {
- }
-
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction objectAction, final ObjectActionParameter parameter) {
+ protected void doPostProcess(
+ final ObjectSpecification objectSpecification,
+ final ObjectAction objectAction,
+ final ObjectActionParameter parameter) {
if(parameter.containsNonFallbackFacet(ActionParameterChoicesFacet.class)) {
return;
}
@@ -68,7 +62,9 @@ extends ObjectSpecificationPostProcessorAbstract {
}
@Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToOneAssociation property) {
+ protected void doPostProcess(
+ final ObjectSpecification objectSpecification,
+ final OneToOneAssociation property) {
if(property.containsNonFallbackFacet(PropertyChoicesFacet.class)) {
return;
}
@@ -78,8 +74,4 @@ extends ObjectSpecificationPostProcessorAbstract {
.addFacet(new PropertyChoicesFacetFromChoicesFacet(facetedMethodFor(property))));
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToManyAssociation coll) {
- }
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveDefaultFromTypePostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DefaultFromTypePostProcessor.java
similarity index 72%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveDefaultFromTypePostProcessor.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DefaultFromTypePostProcessor.java
index 4f7aa24bd4..6c6d1c4c26 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveDefaultFromTypePostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DefaultFromTypePostProcessor.java
@@ -28,31 +28,20 @@ import org.apache.isis.core.metamodel.facets.properties.defaults.fromtype.Proper
import org.apache.isis.core.metamodel.facets.properties.defaults.fromtype.PropertyDefaultFacetFromTypeFactory;
import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProcessorAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
/**
* Installs {@link PropertyDefaultFacetFromTypeFactory} as a fallback.
*/
-public class DeriveDefaultFromTypePostProcessor
+public class DefaultFromTypePostProcessor
extends ObjectSpecificationPostProcessorAbstract {
@Inject
- public DeriveDefaultFromTypePostProcessor(final MetaModelContext metaModelContext) {
+ public DefaultFromTypePostProcessor(final MetaModelContext metaModelContext) {
super(metaModelContext);
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification) {
- }
-
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction act) {
- }
-
@Override
protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToOneAssociation property) {
if(property.containsNonFallbackFacet(PropertyDefaultFacet.class)) {
@@ -64,13 +53,4 @@ extends ObjectSpecificationPostProcessorAbstract {
specFacet, facetedMethodFor(property))));
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToManyAssociation coll) {
- }
-
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction objectAction,
- final ObjectActionParameter param) {
- }
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveTypicalLengthFromTypePostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/TypicalLengthFromTypePostProcessor.java
similarity index 83%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveTypicalLengthFromTypePostProcessor.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/TypicalLengthFromTypePostProcessor.java
index 950855d3e6..28988c89c8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/DeriveTypicalLengthFromTypePostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/propparam/TypicalLengthFromTypePostProcessor.java
@@ -29,25 +29,16 @@ import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProc
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-public class DeriveTypicalLengthFromTypePostProcessor
+public class TypicalLengthFromTypePostProcessor
extends ObjectSpecificationPostProcessorAbstract {
@Inject
- public DeriveTypicalLengthFromTypePostProcessor(final MetaModelContext metaModelContext) {
+ public TypicalLengthFromTypePostProcessor(final MetaModelContext metaModelContext) {
super(metaModelContext);
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification) {
- }
-
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction act) {
- }
-
@Override
protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction objectAction, final ObjectActionParameter parameter) {
if(parameter.containsNonFallbackFacet(TypicalLengthFacet.class)) {
@@ -77,9 +68,4 @@ extends ObjectSpecificationPostProcessorAbstract {
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToManyAssociation coll) {
- }
-
-
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava11.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava11.java
index 213b2beb37..a4a2907bbf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava11.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava11.java
@@ -86,18 +86,18 @@ import org.apache.isis.core.metamodel.facets.value.semantics.ValueSemanticsAnnot
import org.apache.isis.core.metamodel.methods.DomainIncludeAnnotationEnforcesMetamodelContributionValidator;
import org.apache.isis.core.metamodel.methods.MethodByClassMap;
import org.apache.isis.core.metamodel.postprocessors.DeriveMixinMembersPostProcessor;
-import org.apache.isis.core.metamodel.postprocessors.all.DeriveDescribedAsFromTypePostProcessor;
+import org.apache.isis.core.metamodel.postprocessors.all.DescribedAsFromTypePostProcessor;
import org.apache.isis.core.metamodel.postprocessors.all.i18n.SynthesizeObjectNamingPostProcessor;
import org.apache.isis.core.metamodel.postprocessors.all.i18n.TranslationPostProcessor;
-import org.apache.isis.core.metamodel.postprocessors.allbutparam.authorization.AuthorizationFacetPostProcessor;
-import org.apache.isis.core.metamodel.postprocessors.collparam.DeriveCollectionParamDefaultsAndChoicesPostProcessor;
+import org.apache.isis.core.metamodel.postprocessors.allbutparam.authorization.AuthorizationPostProcessor;
+import org.apache.isis.core.metamodel.postprocessors.collparam.CollectionParamDefaultsAndChoicesPostProcessor;
import org.apache.isis.core.metamodel.postprocessors.members.TweakDomainEventsForMixinPostProcessor;
-import org.apache.isis.core.metamodel.postprocessors.members.navigation.DeriveNavigationFacetFromHiddenTypePostProcessor;
-import org.apache.isis.core.metamodel.postprocessors.object.DeriveProjectionFacetsPostProcessor;
-import org.apache.isis.core.metamodel.postprocessors.properties.DeriveDisabledFromImmutablePostProcessor;
-import org.apache.isis.core.metamodel.postprocessors.propparam.DeriveChoicesFromExistingChoicesPostProcessor;
-import org.apache.isis.core.metamodel.postprocessors.propparam.DeriveDefaultFromTypePostProcessor;
-import org.apache.isis.core.metamodel.postprocessors.propparam.DeriveTypicalLengthFromTypePostProcessor;
+import org.apache.isis.core.metamodel.postprocessors.members.navigation.NavigationFacetFromHiddenTypePostProcessor;
+import org.apache.isis.core.metamodel.postprocessors.object.ProjectionFacetsPostProcessor;
+import org.apache.isis.core.metamodel.postprocessors.properties.DisabledFromImmutablePostProcessor;
+import org.apache.isis.core.metamodel.postprocessors.propparam.ChoicesFromTypePostProcessor;
+import org.apache.isis.core.metamodel.postprocessors.propparam.DefaultFromTypePostProcessor;
+import org.apache.isis.core.metamodel.postprocessors.propparam.TypicalLengthFromTypePostProcessor;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModelAbstract;
import org.apache.isis.core.metamodel.services.classsubstitutor.ClassSubstitutorRegistry;
import org.apache.isis.core.metamodel.services.title.TitlesAndTranslationsValidator;
@@ -260,20 +260,20 @@ extends ProgrammingModelAbstract {
// requires member names to have settled
addPostProcessor(PostProcessingOrder.A1_BUILTIN, new CssClassFaFacetOnMemberPostProcessor(mmc));
- addPostProcessor(PostProcessingOrder.A1_BUILTIN, new DeriveDescribedAsFromTypePostProcessor(mmc));
- addPostProcessor(PostProcessingOrder.A1_BUILTIN, new DeriveTypicalLengthFromTypePostProcessor(mmc));
- addPostProcessor(PostProcessingOrder.A1_BUILTIN, new DeriveDefaultFromTypePostProcessor(mmc));
- addPostProcessor(PostProcessingOrder.A1_BUILTIN, new DeriveChoicesFromExistingChoicesPostProcessor(mmc));
- addPostProcessor(PostProcessingOrder.A1_BUILTIN, new DeriveDisabledFromImmutablePostProcessor(mmc));
- addPostProcessor(PostProcessingOrder.A1_BUILTIN, new DeriveCollectionParamDefaultsAndChoicesPostProcessor(mmc));
+ addPostProcessor(PostProcessingOrder.A1_BUILTIN, new DescribedAsFromTypePostProcessor(mmc));
+ addPostProcessor(PostProcessingOrder.A1_BUILTIN, new TypicalLengthFromTypePostProcessor(mmc));
+ addPostProcessor(PostProcessingOrder.A1_BUILTIN, new DefaultFromTypePostProcessor(mmc));
+ addPostProcessor(PostProcessingOrder.A1_BUILTIN, new ChoicesFromTypePostProcessor(mmc));
+ addPostProcessor(PostProcessingOrder.A1_BUILTIN, new DisabledFromImmutablePostProcessor(mmc));
+ addPostProcessor(PostProcessingOrder.A1_BUILTIN, new CollectionParamDefaultsAndChoicesPostProcessor(mmc));
addPostProcessor(PostProcessingOrder.A1_BUILTIN, new TweakDomainEventsForMixinPostProcessor(mmc));
- addPostProcessor(PostProcessingOrder.A1_BUILTIN, new DeriveProjectionFacetsPostProcessor(mmc));
- addPostProcessor(PostProcessingOrder.A1_BUILTIN, new DeriveNavigationFacetFromHiddenTypePostProcessor(mmc));
+ addPostProcessor(PostProcessingOrder.A1_BUILTIN, new ProjectionFacetsPostProcessor(mmc));
+ addPostProcessor(PostProcessingOrder.A1_BUILTIN, new NavigationFacetFromHiddenTypePostProcessor(mmc));
// must be after all named facets and description facets have been installed
addPostProcessor(PostProcessingOrder.A1_BUILTIN, new TranslationPostProcessor(mmc));
- addPostProcessor(PostProcessingOrder.A1_BUILTIN, new AuthorizationFacetPostProcessor(mmc));
+ addPostProcessor(PostProcessingOrder.A1_BUILTIN, new AuthorizationPostProcessor(mmc));
}
private void addValidators() {
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java
index 064bf973a8..b661d62a57 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java
@@ -38,7 +38,6 @@ import org.apache.isis.core.metamodel.postprocessors.ObjectSpecificationPostProc
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
@@ -60,6 +59,11 @@ extends ObjectSpecificationPostProcessorAbstract {
}
}
+ @Inject ServiceRegistry serviceRegistry;
+ @Inject UserService userService;
+ @Inject @Lazy ApplicationUserRepository userRepository;
+ @Inject Provider<QueryResultsCache> queryResultsCacheProvider;
+
@Inject
public TenantedAuthorizationPostProcessor(final MetaModelContext metaModelContext) {
super(metaModelContext);
@@ -75,11 +79,6 @@ extends ObjectSpecificationPostProcessorAbstract {
addFacetTo(objectSpecification, act);
}
- @Override
- protected void doPostProcess(final ObjectSpecification objectSpecification, final ObjectAction objectAction, final ObjectActionParameter param) {
- // no-op
- }
-
@Override
protected void doPostProcess(final ObjectSpecification objectSpecification, final OneToOneAssociation prop) {
addFacetTo(objectSpecification, prop);
@@ -90,6 +89,8 @@ extends ObjectSpecificationPostProcessorAbstract {
addFacetTo(objectSpecification, coll);
}
+ // -- HELPER
+
private void addFacetTo(final ObjectSpecification specification, final ObjectFeature objectFeature) {
FacetUtil.addFacetIfPresent(createFacet(specification.getCorrespondingClass(), objectFeature));
}
@@ -112,9 +113,4 @@ extends ObjectSpecificationPostProcessorAbstract {
holder));
}
- @Inject ServiceRegistry serviceRegistry;
- @Inject UserService userService;
- @Inject @Lazy ApplicationUserRepository userRepository;
- @Inject Provider<QueryResultsCache> queryResultsCacheProvider;
-
}