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/28 07:46:58 UTC
[isis] branch master updated: ISIS-1720: support translation,
when column naming is inferred from member (property) name
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 328b9fb ISIS-1720: support translation, when column naming is inferred from member (property) name
328b9fb is described below
commit 328b9fb7bad1275d3501bf0399aa3fc267d26b34
Author: andi-huber <ah...@apache.org>
AuthorDate: Mon Jun 28 09:46:48 2021 +0200
ISIS-1720: support translation, when column naming is inferred from
member (property) name
---
...nNamedFacetInferredFromPropertyNaturalName.java | 30 ++++++++++
.../all/i18n/InferColumnNamingPostProcessor.java | 70 ++++++++++++++++++++++
.../dflt/ProgrammingModelFacetsJava8.java | 3 +
.../specimpl/OneToOneAssociationDefault.java | 3 +-
4 files changed, 105 insertions(+), 1 deletion(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/named/ColumnNamedFacetInferredFromPropertyNaturalName.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/named/ColumnNamedFacetInferredFromPropertyNaturalName.java
new file mode 100644
index 0000000..c431444
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/all/named/ColumnNamedFacetInferredFromPropertyNaturalName.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.core.metamodel.facets.all.named;
+
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+
+public class ColumnNamedFacetInferredFromPropertyNaturalName
+extends ColumnNamedFacetAbstract {
+
+ public ColumnNamedFacetInferredFromPropertyNaturalName(OneToOneAssociation property) {
+ super(property.getFeatureIdentifier().getMemberNaturalName(), property, Precedence.INFERRED);
+ }
+
+}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/InferColumnNamingPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/InferColumnNamingPostProcessor.java
new file mode 100644
index 0000000..d65c8ba
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/all/i18n/InferColumnNamingPostProcessor.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.core.metamodel.postprocessors.all.i18n;
+
+
+import javax.inject.Inject;
+
+import org.apache.isis.core.metamodel.context.MetaModelContext;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facets.all.named.ColumnNamedFacet;
+import org.apache.isis.core.metamodel.facets.all.named.ColumnNamedFacetInferredFromPropertyNaturalName;
+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 ColumnNamedFacet}(s) on members of type PROPERTY, if not already present.
+ */
+public class InferColumnNamingPostProcessor
+extends ObjectSpecificationPostProcessorAbstract {
+
+ @Inject
+ public InferColumnNamingPostProcessor(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) {
+ if(!prop.lookupFacet(ColumnNamedFacet.class).isPresent()) {
+ FacetUtil.addFacet(
+ new ColumnNamedFacetInferredFromPropertyNaturalName(prop));
+ }
+ }
+
+ @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/ProgrammingModelFacetsJava8.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodels/dflt/ProgrammingModelFacetsJava8.java
index 0d2d064..5627e21 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,6 +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.InferColumnNamingPostProcessor;
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;
@@ -387,6 +388,8 @@ extends ProgrammingModelAbstract {
// must run before Object nouns are used
addPostProcessor(PostProcessingOrder.A1_BUILTIN, new SynthesizeObjectNamingPostProcessor(mmc));
+ addPostProcessor(PostProcessingOrder.A1_BUILTIN, new InferColumnNamingPostProcessor(mmc));
+
addPostProcessor(PostProcessingOrder.A1_BUILTIN, new DeriveDescribedAsFromTypePostProcessor(mmc));
addPostProcessor(PostProcessingOrder.A1_BUILTIN, new DeriveTypicalLengthFromTypePostProcessor(mmc));
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
index 9697d6c..f8214b4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/OneToOneAssociationDefault.java
@@ -83,7 +83,8 @@ implements OneToOneAssociation {
public String getColumnFriendlyName() {
return lookupFacet(ColumnNamedFacet.class)
.map(ColumnNamedFacet::translated)
- //TODO[ISIS-1720] this fallback does not support translation, instead eg. install a synthetic facet that does
+ //we have a facet-post-processor to ensure following code path is unreachable,
+ // however, we keep it in support of JUnit testing
.orElseGet(()->getFeatureIdentifier().getMemberNaturalName());
}