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 2019/12/11 18:03:58 UTC
[isis] branch master updated: ISIS-2158: disable method prefix
validation when @Action is mandatory
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 f6f9da9 ISIS-2158: disable method prefix validation when @Action is mandatory
f6f9da9 is described below
commit f6f9da99849c98daa9af41b2996f8b18207db234
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Dec 11 19:03:49 2019 +0100
ISIS-2158: disable method prefix validation when @Action is mandatory
fixes smoketest DomainModelTest_usingGoodDomain
---
.../facets/MethodPrefixBasedFacetFactoryAbstract.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
index 5652795..555e6f7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/facets/MethodPrefixBasedFacetFactoryAbstract.java
@@ -16,11 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.isis.metamodel.facets;
-import lombok.val;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -28,11 +25,9 @@ import java.util.Objects;
import org.apache.isis.metamodel.facetapi.FeatureType;
import org.apache.isis.metamodel.progmodel.ProgrammingModel;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.Contributed;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidator;
-import org.apache.isis.metamodel.specloader.validator.MetaModelValidatorVisiting;
-import org.apache.isis.metamodel.specloader.validator.ValidationFailures;
+
+import lombok.val;
public abstract class MethodPrefixBasedFacetFactoryAbstract
extends FacetFactoryAbstract
@@ -62,6 +57,11 @@ implements MethodPrefixBasedFacetFactory {
@Override
public void refineProgrammingModel(ProgrammingModel programmingModel) {
+ // we can safely skip this validation if the @Action annoation is mandatory
+ if(getConfiguration().getReflector().getExplicitAnnotations().isAction()) {
+ return;
+ }
+
if(orphanValidation == OrphanValidation.DONT_VALIDATE) {
return;
}