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 2021/06/26 06:30:35 UTC
[isis] branch master updated: ISIS-1720: stick to post-processor
naming conventions
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 a1e9d7d ISIS-1720: stick to post-processor naming conventions
a1e9d7d is described below
commit a1e9d7d5647f012199956c3b9e94dbaa1fcfe204
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Jun 26 08:30:22 2021 +0200
ISIS-1720: stick to post-processor naming conventions
also disable the post-processor from prev. commit, as it breaks the MM
---
.../all/named/ObjectNamedFacetSynthesized.java | 3 +++
...va => SynthesizeObjectNamingPostProcessor.java} | 23 ++++++++++------------
.../dflt/ProgrammingModelFacetsJava8.java | 4 ++--
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/named/ObjectNamedFacetSynthesized.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/named/ObjectNamedFacetSynthesized.java
index d50fff9..50b1df7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/named/ObjectNamedFacetSynthesized.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/named/ObjectNamedFacetSynthesized.java
@@ -1,5 +1,6 @@
package org.apache.isis.core.metamodel.facets.all.named;
+import org.apache.isis.commons.internal.assertions._Assert;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.all.i8n.noun.NounForms;
@@ -16,6 +17,8 @@ extends ObjectNamedFacetAbstract {
final NounForms nounForms,
final FacetHolder holder) {
super(nounForms, holder, Precedence.SYNTHESIZED);
+ // assert that both noun-forms are populated
+ _Assert.assertTrue(nounForms.getSupportedNounForms().stream().count() == 2L);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/SynthesizeObjectNaming.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/SynthesizeObjectNamingPostProcessor.java
similarity index 86%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/SynthesizeObjectNaming.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/SynthesizeObjectNamingPostProcessor.java
index 6c18cd6..cdbf10a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/SynthesizeObjectNaming.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/SynthesizeObjectNamingPostProcessor.java
@@ -26,11 +26,8 @@ import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.commons.StringExtensions;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facets.all.i8n.noun.NounForm;
-import org.apache.isis.core.metamodel.facets.all.i8n.noun.NounForms;
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;
@@ -40,11 +37,11 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import lombok.val;
-public class SynthesizeObjectNaming
+public class SynthesizeObjectNamingPostProcessor
extends ObjectSpecificationPostProcessorAbstract {
@Inject
- public SynthesizeObjectNaming(final MetaModelContext metaModelContext) {
+ public SynthesizeObjectNamingPostProcessor(final MetaModelContext metaModelContext) {
super(metaModelContext);
}
@@ -74,14 +71,14 @@ extends ObjectSpecificationPostProcessorAbstract {
.filter(_Strings::isNotEmpty)
.orElseGet(()->getPluralFallbackNoun(singular));
- FacetUtil.addFacet(
- new ObjectNamedFacetSynthesized(
- NounForms.builder()
- .singular(singular)
- .plural(plural)
- .build(),
- objectSpecification)
- );
+// FacetUtil.addFacet(
+// new ObjectNamedFacetSynthesized(
+// NounForms.builder()
+// .singular(singular)
+// .plural(plural)
+// .build(),
+// objectSpecification)
+// );
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
index 6df91c9..0d2d064 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
@@ -145,7 +145,7 @@ import org.apache.isis.core.metamodel.methods.MethodByClassMap;
import org.apache.isis.core.metamodel.methods.OrphanedSupportingMethodValidator;
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.i18n.SynthesizeObjectNaming;
+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;
@@ -386,7 +386,7 @@ extends ProgrammingModelAbstract {
// only after this point have any mixin members been resolved and are available on the ObjectSpecification.
// must run before Object nouns are used
- addPostProcessor(PostProcessingOrder.A1_BUILTIN, new SynthesizeObjectNaming(mmc));
+ addPostProcessor(PostProcessingOrder.A1_BUILTIN, new SynthesizeObjectNamingPostProcessor(mmc));
addPostProcessor(PostProcessingOrder.A1_BUILTIN, new DeriveDescribedAsFromTypePostProcessor(mmc));
addPostProcessor(PostProcessingOrder.A1_BUILTIN, new DeriveTypicalLengthFromTypePostProcessor(mmc));