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/05/21 15:14:24 UTC
[isis] branch master updated: ISIS-2253: remove MM validation
hotfix; provide regr. tests
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 7e46a62 ISIS-2253: remove MM validation hotfix; provide regr. tests
7e46a62 is described below
commit 7e46a6201f55144aff5a17abb46a00bfe5ad8bb6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri May 21 17:14:10 2021 +0200
ISIS-2253: remove MM validation hotfix; provide regr. tests
---
...nChoicesForCollectionParameterFacetFactory.java | 17 ++------
.../DomainModelTest_usingGoodDomain.java | 38 +++++++++++++---
.../model/good/ProperChoicesWhenChoicesFrom.java | 50 ++++++++++++++++++++++
...entoProviderForReferenceObjectAutoComplete.java | 2 +-
4 files changed, 88 insertions(+), 19 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java
index 9e7f584..900b631 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionChoicesForCollectionParameterFacetFactory.java
@@ -22,7 +22,6 @@ package org.apache.isis.core.metamodel.facets.actions.action;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.actions.action.associateWith.ChoicesFromFacet;
import org.apache.isis.core.metamodel.facets.collparam.semantics.CollectionSemanticsFacet;
import org.apache.isis.core.metamodel.facets.object.autocomplete.AutoCompleteFacet;
import org.apache.isis.core.metamodel.facets.param.autocomplete.ActionParameterAutoCompleteFacet;
@@ -115,19 +114,11 @@ implements MetaModelRefiner {
}
}
- val actionParameterChoicesFacet = parameter.getFacet(ActionParameterChoicesFacet.class);
- val actionParameterAutoCompleteFacet = parameter.getFacet(ActionParameterAutoCompleteFacet.class);
- if (actionParameterChoicesFacet != null || actionParameterAutoCompleteFacet != null) {
- return;
- }
-
- val parameterSpec = parameter.getSpecification();
- if(parameterSpec.containsNonFallbackFacet(AutoCompleteFacet.class)) {
- return;
- }
+ val parameterTypeSpec = parameter.getSpecification();
- //TODO[2253] remove this hotfix once ISIS-2253 is fixed
- if(paramNum==0 && objectAction.containsNonFallbackFacet(ChoicesFromFacet.class)) {
+ if (parameter.containsFacet(ActionParameterChoicesFacet.class)
+ || parameter.containsFacet(ActionParameterAutoCompleteFacet.class)
+ || parameterTypeSpec.containsNonFallbackFacet(AutoCompleteFacet.class)) {
return;
}
diff --git a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index 71f5d18..7890a93 100644
--- a/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/regressiontests/stable-domainmodel/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -29,6 +29,11 @@ import org.junit.jupiter.params.provider.MethodSource;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.metamodel.BeanSort;
import org.apache.isis.applib.services.metamodel.Config;
@@ -40,6 +45,10 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.members.publish.execution.ExecutionPublishingFacet;
import org.apache.isis.core.metamodel.facets.object.icon.IconFacet;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
+import org.apache.isis.core.metamodel.facets.param.choices.ActionParameterChoicesFacet;
+import org.apache.isis.core.metamodel.facets.param.defaults.ActionParameterDefaultsFacet;
+import org.apache.isis.core.metamodel.postprocessors.collparam.ActionParameterChoicesFacetFromParentedCollection;
+import org.apache.isis.core.metamodel.postprocessors.collparam.ActionParameterDefaultsFacetFromAssociatedCollection;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.MixedIn;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
@@ -50,6 +59,7 @@ import org.apache.isis.testdomain.model.good.Configuration_usingValidDomain;
import org.apache.isis.testdomain.model.good.ElementTypeAbstract;
import org.apache.isis.testdomain.model.good.ElementTypeConcrete;
import org.apache.isis.testdomain.model.good.ElementTypeInterface;
+import org.apache.isis.testdomain.model.good.ProperChoicesWhenChoicesFrom;
import org.apache.isis.testdomain.model.good.ProperElementTypeVm;
import org.apache.isis.testdomain.model.good.ProperInterface2;
import org.apache.isis.testdomain.model.good.ProperMemberInheritanceInterface;
@@ -58,11 +68,6 @@ import org.apache.isis.testdomain.model.good.ProperMemberInheritance_usingInterf
import org.apache.isis.testdomain.model.good.ProperMemberSupport;
import org.apache.isis.testing.integtestsupport.applib.validate.DomainModelValidator;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
import lombok.val;
@SpringBootTest(
@@ -367,6 +372,29 @@ class DomainModelTest_usingGoodDomain {
assertHasProperty(i2Spec, "f");
}
+ @Test
+ void actionParamChoices_shouldBeAllowed_toBeDerivedFromChoicesFrom() {
+
+ val spec = specificationLoader.loadSpecification(ProperChoicesWhenChoicesFrom.class,
+ IntrospectionState.FULLY_INTROSPECTED);
+
+ val action = spec.getActionElseFail("appendACharacterToCandidates");
+ val param0 = action.getParameters().getFirstOrFail();
+
+ assertEquals(
+ ActionParameterChoicesFacetFromParentedCollection.class,
+ param0.lookupFacet(ActionParameterChoicesFacet.class)
+ .map(Object::getClass)
+ .orElse(null));
+
+ assertEquals(
+ ActionParameterDefaultsFacetFromAssociatedCollection.class,
+ param0.lookupFacet(ActionParameterDefaultsFacet.class)
+ .map(Object::getClass)
+ .orElse(null));
+
+ }
+
// -- HELPER
private void assertHasProperty(ObjectSpecification spec, String propertyId) {
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperChoicesWhenChoicesFrom.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperChoicesWhenChoicesFrom.java
new file mode 100644
index 0000000..58e3a24
--- /dev/null
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/good/ProperChoicesWhenChoicesFrom.java
@@ -0,0 +1,50 @@
+/*
+ * 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.testdomain.model.good;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.commons.internal.collections._Lists;
+
+@DomainObject(nature = Nature.VIEW_MODEL)
+public class ProperChoicesWhenChoicesFrom {
+
+ @Collection
+ public List<String> getCandidates() {
+ return _Lists.of("a", "b", "c");
+ }
+
+ // expected to pass MM validation, even though there are no member-support methods
+ // that would provide parameter choices (for 'input'), instead @Action(choicesFrom = "candidates")
+ // should be sufficient to derive both
+ // 1. ActionParameterChoicesFacetFromParentedCollection
+ // 2. ActionParameterDefaultsFacetFromAssociatedCollection
+ @Action(choicesFrom = "candidates")
+ public List<String> appendACharacterToCandidates(List<String> input) {
+ return input.stream()
+ .map(candidate->candidate + "!")
+ .collect(Collectors.toList());
+ }
+
+}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
index 209c878..d19d348 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
@@ -39,7 +39,7 @@ extends ObjectAdapterMementoProviderAbstract {
protected Can<ObjectMemento> obtainMementos(String term) {
val typeOfSpecification = getScalarModel().getTypeOfSpecification();
val autoCompleteFacet = typeOfSpecification.getFacet(AutoCompleteFacet.class);
- val autoCompleteAdapters = autoCompleteFacet.execute(term,InteractionInitiatedBy.USER);
+ val autoCompleteAdapters = autoCompleteFacet.execute(term, InteractionInitiatedBy.USER);
val commonContext = super.getCommonContext();
return autoCompleteAdapters.map(commonContext::mementoFor);