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 2020/11/26 21:42:13 UTC
[isis] branch master updated: ISIS-2469: remove the Contributed
enum from applib (its no longer part of the programming model)
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 ea30f63 ISIS-2469: remove the Contributed enum from applib (its no longer part of the programming model)
ea30f63 is described below
commit ea30f639a8b5309d1e6b63a654ef9bece5191101
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Nov 26 22:41:57 2020 +0100
ISIS-2469: remove the Contributed enum from applib (its no longer part
of the programming model)
also renames and simplifies the NotContributedFactet ->
ContributingFacet
---
.../apache/isis/applib/annotation/Contributed.java | 73 ------
.../ContributingFacet.java} | 41 ++--
.../ContributingFacetAbstract.java} | 29 ++-
...ributingFacetDerivedFromMixinFacetFactory.java} | 17 +-
.../actions/layout/ActionLayoutFacetFactory.java | 28 +--
...tributedFacetDerivedFromDomainServiceFacet.java | 47 ----
...dFacetDerivedFromDomainServiceFacetFactory.java | 58 -----
.../NotContributedFacetDerivedFromMixinFacet.java | 37 ---
.../CollectionAnnotationFacetFactory.java | 6 +-
.../object/domainservice/DomainServiceFacet.java | 4 +-
.../mixin/MixinFacetForDomainObjectAnnotation.java | 32 +--
.../property/PropertyAnnotationFacetFactory.java | 6 +-
.../dflt/ProgrammingModelFacetsJava8.java | 6 +-
.../metamodel/specloader/specimpl/Predicates.java | 6 +-
...tionLayoutAnnotationFacetFactoryJunit4Test.java | 258 ---------------------
...etDerivedFromDomainServiceFacetFactoryTest.java | 220 ------------------
.../facets/param/name/ParameterNameFacetTest.java | 2 +-
17 files changed, 89 insertions(+), 781 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Contributed.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Contributed.java
deleted file mode 100644
index 8859a28..0000000
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Contributed.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.applib.annotation;
-
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * The means by which a domain service action will be contributed to a domain object.
- */
-// tag::refguide[]
-@XmlType(
- namespace = "http://isis.apache.org/applib/layout/component"
- )
-public enum Contributed {
-
- // end::refguide[]
- /**
- * Default: contributed as both an action and also (if takes a single argument and has safe semantics) as an association
- * (contributed property if returns a single value, contributed collection if returns a collection).
- */
- // tag::refguide[]
- AS_BOTH,
-
- // end::refguide[]
- /**
- * Contributed as an action but <i>not</i> as an association.
- */
- // tag::refguide[]
- AS_ACTION,
-
- // end::refguide[]
- /**
- * (If takes a single argument and has safe semantics) then is contributed as an association
- * (contributed property if returns a single value, contributed collection if returns a collection) but <i>not</i>
- * as an action.
- */
- // tag::refguide[]
- AS_ASSOCIATION,
-
- // end::refguide[]
- /**
- * The action is not contributed as either an action or as an association.
- */
- // tag::refguide[]
- AS_NEITHER,
-
- // end::refguide[]
- /**
- * Ignore the value provided by this annotation (meaning that the framework will keep searching, in meta
- * annotations or superclasses/interfaces).
- */
- // tag::refguide[]
- NOT_SPECIFIED
-
-}
-// end::refguide[]
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/ContributingFacet.java
similarity index 63%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacet.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/ContributingFacet.java
index d79ad92..cdbf33a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/ContributingFacet.java
@@ -17,42 +17,53 @@
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.actions.notcontributed;
+package org.apache.isis.core.metamodel.facets.actions.contributing;
-import org.apache.isis.applib.annotation.Contributed;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import lombok.val;
/**
- * Indicates that the action should not be contributed to any
- * objects.
- *
+ * Indicates that the action should be contributed to objects either
+ * as ACTION or ASSOCIATION.
* <p>
- * In the standard Apache Isis Programming Model, corresponds to annotating the
- * action method using {@code @Programmatic}.
+ * Since v2 only ever used for mixed in actions.
+ * @since 2.0
*/
-public interface NotContributedFacet extends Facet {
+public interface ContributingFacet extends Facet {
+
+ enum Contributing {
- public Contributed contributed();
+ /**
+ * Contributed as an action but <i>not</i> as an association.
+ */
+ AS_ACTION,
+
+ /**
+ * (If takes a single argument and has safe semantics) then is contributed as an association
+ * (contributed property if returns a single value, contributed collection if returns a collection) but <i>not</i>
+ * as an action.
+ */
+ AS_ASSOCIATION,
+ }
+
+ public Contributing contributed();
default boolean isActionContributionVetoed() {
// not contributed to actions if...
- return contributed() == Contributed.AS_NEITHER
- || contributed() == Contributed.AS_ASSOCIATION;
+ return contributed() == Contributing.AS_ASSOCIATION;
}
default boolean isAssociationContributionVetoed() {
// not contributed to associations if...
- return contributed() == Contributed.AS_NEITHER
- || contributed() == Contributed.AS_ACTION;
+ return contributed() == Contributing.AS_ACTION;
}
// -- UTILITIES
static boolean isActionContributionVetoed(final ObjectAction action) {
- val notContributed = action.getFacet(NotContributedFacet.class);
+ val notContributed = action.getFacet(ContributingFacet.class);
if(notContributed != null
&& notContributed.isActionContributionVetoed()) {
return true;
@@ -61,7 +72,7 @@ public interface NotContributedFacet extends Facet {
}
static boolean isAssociationContributionVetoed(final ObjectAction action) {
- val notContributed = action.getFacet(NotContributedFacet.class);
+ val notContributed = action.getFacet(ContributingFacet.class);
if(notContributed != null
&& notContributed.isAssociationContributionVetoed()) {
return true;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/ContributingFacetAbstract.java
similarity index 68%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacetAbstract.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/ContributingFacetAbstract.java
index 6780fca..74c0db2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/NotContributedFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/ContributingFacetAbstract.java
@@ -17,48 +17,47 @@
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.actions.notcontributed;
+package org.apache.isis.core.metamodel.facets.actions.contributing;
import java.util.Map;
-import org.apache.isis.applib.annotation.Contributed;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-public abstract class NotContributedFacetAbstract
+public abstract class ContributingFacetAbstract
extends FacetAbstract
-implements NotContributedFacet {
+implements ContributingFacet {
- private final Contributed contributed;
+ private final Contributing contributing;
public static Class<? extends Facet> type() {
- return NotContributedFacet.class;
+ return ContributingFacet.class;
}
- public NotContributedFacetAbstract(
- final Contributed contributed,
+ public ContributingFacetAbstract(
+ final Contributing contributing,
final FacetHolder holder) {
- this(contributed, holder, Derivation.NOT_DERIVED);
+ this(contributing, holder, Derivation.NOT_DERIVED);
}
- public NotContributedFacetAbstract(
- final Contributed contributed,
+ public ContributingFacetAbstract(
+ final Contributing contributing,
final FacetHolder holder,
final Derivation derivation) {
super(type(), holder, derivation);
- this.contributed = contributed;
+ this.contributing = contributing;
}
@Override
- public Contributed contributed() {
- return contributed;
+ public Contributing contributed() {
+ return contributing;
}
@Override
public void appendAttributesTo(final Map<String, Object> attributeMap) {
super.appendAttributesTo(attributeMap);
- attributeMap.put("contributed", contributed);
+ attributeMap.put("contributing", contributing);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/derived/ContributingFacetDerivedFromMixinFacetFactory.java
similarity index 77%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacetFactory.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/derived/ContributingFacetDerivedFromMixinFacetFactory.java
index 3e570c3..3d36899 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/contributing/derived/ContributingFacetDerivedFromMixinFacetFactory.java
@@ -17,22 +17,22 @@
* under the License.
*/
-package org.apache.isis.core.metamodel.facets.actions.notcontributed.derived;
+package org.apache.isis.core.metamodel.facets.actions.contributing.derived;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.applib.annotation.Contributed;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacetAbstract;
+import org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacetAbstract;
+import org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacet.Contributing;
import org.apache.isis.core.metamodel.facets.object.mixin.MixinFacet;
import lombok.val;
-public class NotContributedFacetDerivedFromMixinFacetFactory extends FacetFactoryAbstract {
+public class ContributingFacetDerivedFromMixinFacetFactory extends FacetFactoryAbstract {
- public NotContributedFacetDerivedFromMixinFacetFactory() {
+ public ContributingFacetDerivedFromMixinFacetFactory() {
super(FeatureType.ACTIONS_ONLY);
}
@@ -62,11 +62,8 @@ public class NotContributedFacetDerivedFromMixinFacetFactory extends FacetFactor
|| processMethodContext.synthesizeOnType(ActionLayout.class).isPresent();
if(isForceContributedAsAction) {
- FacetUtil.addFacet(new NotContributedFacetAbstract(Contributed.AS_ACTION, facetedMethod) {});
- } else {
- // fallback to legacy default
- FacetUtil.addFacet(new NotContributedFacetDerivedFromMixinFacet(facetedMethod));
- }
+ FacetUtil.addFacet(new ContributingFacetAbstract(Contributing.AS_ACTION, facetedMethod) {});
+ }
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
index 9d31f4c..a5ae70b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.actions.layout;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacet;
import org.apache.isis.core.metamodel.facets.actions.position.ActionPositionFacet;
import org.apache.isis.core.metamodel.facets.actions.position.ActionPositionFacetFallback;
import org.apache.isis.core.metamodel.facets.actions.redirect.RedirectFacet;
@@ -32,10 +31,7 @@ import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
-import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
-import org.apache.isis.core.metamodel.facets.object.mixin.MixinFacet;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleFacet;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import lombok.val;
@@ -115,17 +111,17 @@ extends FacetFactoryAbstract {
// }
}
- private boolean isContributingServiceOrMixinObject(final ProcessMethodContext processMethodContext) {
- final Class<?> cls = processMethodContext.getCls();
- final ObjectSpecification spec = getSpecificationLoader().loadSpecification(cls);
-
- return DomainServiceFacet.isContributing(spec) || isMixinObject(spec);
- }
-
- private static boolean isMixinObject(final ObjectSpecification spec) {
- final MixinFacet mixinFacet = spec.getFacet(MixinFacet.class);
- final boolean b = mixinFacet != null && !mixinFacet.isFallback();
- return b;
- }
+// private boolean isContributingServiceOrMixinObject(final ProcessMethodContext processMethodContext) {
+// final Class<?> cls = processMethodContext.getCls();
+// final ObjectSpecification spec = getSpecificationLoader().loadSpecification(cls);
+//
+// return DomainServiceFacet.isContributing(spec) || isMixinObject(spec);
+// }
+
+// private static boolean isMixinObject(final ObjectSpecification spec) {
+// final MixinFacet mixinFacet = spec.getFacet(MixinFacet.class);
+// final boolean b = mixinFacet != null && !mixinFacet.isFallback();
+// return b;
+// }
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacet.java
deleted file mode 100644
index e00f676..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacet.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.actions.notcontributed.derived;
-
-import java.util.Map;
-
-import org.apache.isis.applib.annotation.Contributed;
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacetAbstract;
-
-
-public class NotContributedFacetDerivedFromDomainServiceFacet extends NotContributedFacetAbstract {
-
- private final NatureOfService natureOfService;
-
- public NotContributedFacetDerivedFromDomainServiceFacet(final NatureOfService natureOfService, final FacetHolder holder) {
- super(Contributed.AS_NEITHER , holder, Derivation.DERIVED);
- this.natureOfService = natureOfService;
- }
-
- NatureOfService getNatureOfService() {
- return natureOfService;
- }
-
- @Override public void appendAttributesTo(final Map<String, Object> attributeMap) {
- super.appendAttributesTo(attributeMap);
- attributeMap.put("natureOfService", natureOfService);
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactory.java
deleted file mode 100644
index 182dfaf..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.actions.notcontributed.derived;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.FacetedMethod;
-import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-
-public class NotContributedFacetDerivedFromDomainServiceFacetFactory extends FacetFactoryAbstract {
-
- public NotContributedFacetDerivedFromDomainServiceFacetFactory() {
- super(FeatureType.ACTIONS_ONLY);
- }
-
- @Override
- public void process(final ProcessMethodContext processMethodContext) {
- final Method method = processMethodContext.getMethod();
- final Class<?> declaringClass = method.getDeclaringClass();
- final ObjectSpecification spec = getSpecificationLoader().loadSpecification(declaringClass);
-
- final DomainServiceFacet domainServiceFacet = spec.getFacet(DomainServiceFacet.class);
- if(domainServiceFacet == null || domainServiceFacet.isFallback()) {
- return;
- }
-
- final NatureOfService natureOfService = domainServiceFacet.getNatureOfService();
- if(natureOfService == NatureOfService.VIEW) {
- return;
- }
-
- final FacetedMethod facetHolder = processMethodContext.getFacetHolder();
- FacetUtil.addFacet(new NotContributedFacetDerivedFromDomainServiceFacet(natureOfService, facetHolder));
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java
deleted file mode 100644
index 597c5e6..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromMixinFacet.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.actions.notcontributed.derived;
-
-import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.applib.annotation.Contributed;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacetAbstract;
-
-/**
- * By default, any mixin actions are contributed as both actions and associations. This can be overridden using
- * {@link ActionLayout#contributed()}.
- */
-public class NotContributedFacetDerivedFromMixinFacet extends NotContributedFacetAbstract {
-
- public NotContributedFacetDerivedFromMixinFacet(
- final FacetHolder holder) {
- super(Contributed.AS_BOTH, holder, Derivation.DERIVED);
- }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
index 0b3806a..ee2bfea 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactory.java
@@ -25,7 +25,6 @@ import java.lang.reflect.TypeVariable;
import java.util.Optional;
import org.apache.isis.applib.annotation.Collection;
-import org.apache.isis.applib.annotation.Contributed;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.events.domain.CollectionDomainEvent;
import org.apache.isis.commons.internal.collections._Collections;
@@ -35,7 +34,8 @@ import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromArray;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromGenerics;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacetAbstract;
+import org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacetAbstract;
+import org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacet.Contributing;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacetAbstract;
import org.apache.isis.core.metamodel.facets.collections.collection.disabled.DisabledFacetForCollectionAnnotation;
import org.apache.isis.core.metamodel.facets.collections.collection.hidden.HiddenFacetForCollectionAnnotation;
@@ -91,7 +91,7 @@ public class CollectionAnnotationFacetFactory extends FacetFactoryAbstract {
//@ActionLayout(contributed=ASSOCIATION) ... it seems, is already allowed for mixins
val facetedMethod = processMethodContext.getFacetHolder();
FacetUtil.addOrReplaceFacet(new ActionSemanticsFacetAbstract(SemanticsOf.SAFE, facetedMethod) {});
- FacetUtil.addFacet(new NotContributedFacetAbstract(Contributed.AS_ASSOCIATION, facetedMethod) {});
+ FacetUtil.addFacet(new ContributingFacetAbstract(Contributing.AS_ASSOCIATION, facetedMethod) {});
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacet.java
index 5bb4709..f5497d3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacet.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacet;
+import org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacet;
import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacet;
/**
@@ -39,7 +39,7 @@ public interface DomainServiceFacet extends Facet {
*
* <p>
* If set to {@link org.apache.isis.applib.annotation.NatureOfService#DOMAIN},
- * then {@link NotContributedFacet} and
+ * then {@link ContributingFacet} and
* {@link NotInServiceMenuFacet} is
* derived for all actions.
* </p>
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java
index 997c836..a59be93 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinFacetForDomainObjectAnnotation.java
@@ -55,22 +55,22 @@ public class MixinFacetForDomainObjectAnnotation extends MixinFacetAbstract {
final ServiceInjector servicesInjector) {
return domainObjectIfAny
- .filter(domainObject -> domainObject.nature() == Nature.MIXIN)
- .map(domainObject -> {
-
- val mixinContructors = _Reflect
- .getPublicConstructors(candidateMixinType)
- .filter(paramCount(1));
-
- return mixinContructors.getSingleton() // empty if cardinality!=1
- .map(constructor -> new MixinFacetForDomainObjectAnnotation(
- candidateMixinType,
- domainObject.mixinMethod(),
- constructor,
- facetHolder))
- .orElse(null);
- })
- .orElse(null);
+ .filter(domainObject -> domainObject.nature() == Nature.MIXIN)
+ .map(domainObject -> {
+
+ val mixinContructors = _Reflect
+ .getPublicConstructors(candidateMixinType)
+ .filter(paramCount(1));
+
+ return mixinContructors.getSingleton() // empty if cardinality!=1
+ .map(constructor -> new MixinFacetForDomainObjectAnnotation(
+ candidateMixinType,
+ domainObject.mixinMethod(),
+ constructor,
+ facetHolder))
+ .orElse(null);
+ })
+ .orElse(null);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
index defd2eb..c3845ef 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
@@ -24,7 +24,6 @@ import java.util.Optional;
import javax.annotation.Nullable;
import javax.validation.constraints.Pattern;
-import org.apache.isis.applib.annotation.Contributed;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.events.domain.PropertyDomainEvent;
@@ -34,7 +33,8 @@ import org.apache.isis.core.metamodel.facetapi.FacetUtil;
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.notcontributed.NotContributedFacetAbstract;
+import org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacetAbstract;
+import org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacet.Contributing;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacetAbstract;
import org.apache.isis.core.metamodel.facets.members.publish.command.CommandPublishingFacetForPropertyAnnotation;
import org.apache.isis.core.metamodel.facets.members.publish.execution.ExecutionPublishingPropertyFacetForPropertyAnnotation;
@@ -119,7 +119,7 @@ implements MetaModelRefiner {
//@ActionLayout(contributed=ASSOCIATION) ... it seems, is already allowed for mixins
val facetedMethod = processMethodContext.getFacetHolder();
FacetUtil.addOrReplaceFacet(new ActionSemanticsFacetAbstract(SemanticsOf.SAFE, facetedMethod) {});
- FacetUtil.addFacet(new NotContributedFacetAbstract(Contributed.AS_ASSOCIATION, facetedMethod) {});
+ FacetUtil.addFacet(new ContributingFacetAbstract(Contributing.AS_ASSOCIATION, facetedMethod) {});
}
void processModify(final ProcessMethodContext processMethodContext, Optional<Property> propertyIfAny) {
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 4f6d0f6..5c0ac38 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
@@ -26,11 +26,10 @@ import org.apache.isis.core.metamodel.authorization.standard.AuthorizationFacetF
import org.apache.isis.core.metamodel.facets.OrphanedSupportingMethodValidator;
import org.apache.isis.core.metamodel.facets.actions.action.ActionAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.action.ActionChoicesForCollectionParameterFacetFactory;
+import org.apache.isis.core.metamodel.facets.actions.contributing.derived.ContributingFacetDerivedFromMixinFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.defaults.method.ActionDefaultsFacetViaMethodFactory;
import org.apache.isis.core.metamodel.facets.actions.homepage.annotation.HomePageFacetAnnotationFactory;
import org.apache.isis.core.metamodel.facets.actions.layout.ActionLayoutFacetFactory;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromDomainServiceFacetFactory;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromMixinFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.derived.NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.validate.method.ActionValidationFacetViaMethodFactory;
import org.apache.isis.core.metamodel.facets.all.i18n.TranslationFacetFactory;
@@ -237,7 +236,6 @@ public final class ProgrammingModelFacetsJava8 extends ProgrammingModelAbstract
addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, BigDecimalFacetOnParameterFromJavaxValidationAnnotationFactory.class);
addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, BigDecimalFacetOnPropertyFromJavaxValidationDigitsAnnotationFactory.class);
- addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, NotContributedFacetDerivedFromDomainServiceFacetFactory.class);
addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, NotInServiceMenuFacetDerivedFromDomainServiceFacetFactory.class);
@@ -266,7 +264,7 @@ public final class ProgrammingModelFacetsJava8 extends ProgrammingModelAbstract
addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, ParameterAnnotationFacetFactory.class);
// must come after DomainObjectAnnotationFacetFactory & MixinFacetFactory
- addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, NotContributedFacetDerivedFromMixinFacetFactory.class);
+ addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, ContributingFacetDerivedFromMixinFacetFactory.class);
addFactory(FacetProcessingOrder.E1_MEMBER_MODELLING, OrphanedSupportingMethodValidator.class);
addFactory(FacetProcessingOrder.F1_LAYOUT, GridFacetFactory.class);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/Predicates.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/Predicates.java
index 49c8e8e..a74443b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/Predicates.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/Predicates.java
@@ -20,7 +20,7 @@ package org.apache.isis.core.metamodel.specloader.specimpl;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacet;
+import org.apache.isis.core.metamodel.facets.actions.contributing.ContributingFacet;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
@@ -59,7 +59,7 @@ final class Predicates {
if(isAlwaysHidden(mixinTypeAction)) {
return false;
}
- if(NotContributedFacet.isActionContributionVetoed(mixinTypeAction)) {
+ if(ContributingFacet.isActionContributionVetoed(mixinTypeAction)) {
return false;
}
return true;
@@ -72,7 +72,7 @@ final class Predicates {
if(isAlwaysHidden(mixinAction)) {
return false;
}
- if(NotContributedFacet.isAssociationContributionVetoed(mixinAction)) {
+ if(ContributingFacet.isAssociationContributionVetoed(mixinAction)) {
return false;
}
if(!isGetterCandidate(mixinAction)) {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
deleted file mode 100644
index 8c6e9ef..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutAnnotationFacetFactoryJunit4Test.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * 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.actions.layout;
-
-import org.hamcrest.CoreMatchers;
-import org.jmock.Expectations;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.jupiter.api.Disabled;
-
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.apache.isis.applib.annotation.Action;
-import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.applib.annotation.Contributed;
-import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
-import org.apache.isis.core.metamodel.facets.FacetFactory;
-import org.apache.isis.core.metamodel.facets.FacetedMethod;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacet;
-import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
-import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacetAbstract;
-import org.apache.isis.core.metamodel.facets.object.mixin.MixinFacet;
-
-import lombok.val;
-
-public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetFactoryJUnit4TestCase {
-
- ActionLayoutFacetFactory facetFactory;
-
- @Before
- public void setUp() throws Exception {
- facetFactory = new ActionLayoutFacetFactory();
- facetFactory.setMetaModelContext(super.metaModelContext);
- }
-
- public static class Contributing extends ActionLayoutAnnotationFacetFactoryJunit4Test {
-
- @Test
- public void onDomainServiceForViewWithDefault() {
-
- // given
- @DomainService()
- class CustomerService {
-
- @ActionLayout()
- public String name() {
- return "Joe";
- }
- }
-
- context.checking(new Expectations() {{
-
- allowing(mockSpecificationLoader).loadSpecification(CustomerService.class);
- will(returnValue(mockObjSpec));
-
- allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
- will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, NatureOfService.VIEW) {
- }));
- }});
-
- expectNoMethodsRemoved();
-
- facetedMethod = FacetedMethod.createForAction(CustomerService.class, "name");
-
- // when
- facetFactory.process(new FacetFactory.ProcessMethodContext(
- CustomerService.class, null, facetedMethod.getMethod(), mockMethodRemover, facetedMethod));
-
- // then
- final Facet facet = facetedMethod.getFacet(NotContributedFacet.class);
- assertThat(facet, CoreMatchers.is(nullValue()));
-
- }
-
- @Test @Ignore
- public void testOnDomainServiceForViewWithAssociation() {
-
- // given
- @DomainService()
- class CustomerService {
-
- @Property
- public String name() {
- return "Joe";
- }
- }
-
- context.checking(new Expectations() {{
-
- allowing(mockSpecificationLoader).loadSpecification(CustomerService.class);
- will(returnValue(mockObjSpec));
-
- allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
- will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, NatureOfService.VIEW) {
- }));
- }});
-
- expectNoMethodsRemoved();
-
- facetedMethod = FacetedMethod.createForAction(CustomerService.class, "name");
-
- // when
- facetFactory.process(new FacetFactory.ProcessMethodContext(
- CustomerService.class, null, facetedMethod.getMethod(), mockMethodRemover, facetedMethod));
-
- // then
- val facet = facetedMethod.getFacet(NotContributedFacet.class);
- assertThat(facet, CoreMatchers.is(not(nullValue())));
-// assertThat(facet instanceof NotContributedFacetForActionLayoutAnnotation, CoreMatchers.is(true));
-// final NotContributedFacetForActionLayoutAnnotation facetImpl = (NotContributedFacetForActionLayoutAnnotation) facet;
- assertThat(facet.contributed(), CoreMatchers.equalTo(Contributed.AS_ASSOCIATION));
-
- }
-
- @Test @Ignore
- public void onDomainServiceForViewWithAction() {
-
- // given
- @DomainService()
- class CustomerService {
-
- @Action
- public String name() {
- return "Joe";
- }
- }
-
- context.checking(new Expectations() {{
-
- allowing(mockSpecificationLoader).loadSpecification(CustomerService.class);
- will(returnValue(mockObjSpec));
-
- allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
- will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, NatureOfService.VIEW) {
- }));
- }});
-
- expectNoMethodsRemoved();
-
- facetedMethod = FacetedMethod.createForAction(CustomerService.class, "name");
-
- // when
- facetFactory.process(new FacetFactory.ProcessMethodContext(
- CustomerService.class, null, facetedMethod.getMethod(), mockMethodRemover, facetedMethod));
-
- // then
- val facet = facetedMethod.getFacet(NotContributedFacet.class);
- assertThat(facet, CoreMatchers.is(not(nullValue())));
- //assertThat(facet instanceof NotContributedFacetForActionLayoutAnnotation, CoreMatchers.is(true));
- //final NotContributedFacetForActionLayoutAnnotation facetImpl = (NotContributedFacetForActionLayoutAnnotation) facet;
- assertThat(facet.contributed(), CoreMatchers.equalTo(Contributed.AS_ACTION));
- }
-
- @Test @Ignore
- public void onDomainServiceForViewWithNeither() {
- // given
- @DomainService()
- class CustomerService {
-
- @Programmatic
- public String name() {
- return "Joe";
- }
- }
-
- context.checking(new Expectations() {{
- allowing(mockSpecificationLoader).loadSpecification(CustomerService.class);
- will(returnValue(mockObjSpec));
-
- allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
- will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, NatureOfService.VIEW) {
- }));
- }});
-
- expectNoMethodsRemoved();
-
- facetedMethod = FacetedMethod.createForAction(CustomerService.class, "name");
-
- // when
- facetFactory.process(new FacetFactory.ProcessMethodContext(
- CustomerService.class, null, facetedMethod.getMethod(), mockMethodRemover, facetedMethod));
-
- // then
- val facet = facetedMethod.getFacet(NotContributedFacet.class);
- assertThat(facet, CoreMatchers.is(not(nullValue())));
-// assertThat(facet instanceof NotContributedFacetForActionLayoutAnnotation, CoreMatchers.is(true));
-// final NotContributedFacetForActionLayoutAnnotation facetImpl = (NotContributedFacetForActionLayoutAnnotation) facet;
- assertThat(facet.contributed(), CoreMatchers.equalTo(Contributed.AS_NEITHER));
-
- }
-
- @Test
- public void onDomainObjectIsIgnored() {
-
- // given
- @DomainObject
- class Customer {
-
- @Action
- public String name() {
- return "Joe";
- }
- }
-
- context.checking(new Expectations() {{
-
- allowing(mockSpecificationLoader).loadSpecification(Customer.class);
- will(returnValue(mockObjSpec));
-
- allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
- will(returnValue(null));
-
- allowing(mockObjSpec).getFacet(MixinFacet.class);
- will(returnValue(null));
- }});
-
- expectNoMethodsRemoved();
-
- facetedMethod = FacetedMethod.createForAction(Customer.class, "name");
-
- // when
- facetFactory.process(new FacetFactory.ProcessMethodContext(
- Customer.class, null, facetedMethod.getMethod(), mockMethodRemover, facetedMethod));
-
- // then
- final Facet facet = facetedMethod.getFacet(NotContributedFacet.class);
- assertThat(facet, CoreMatchers.is(nullValue()));
- }
-
- }
-
-}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java
deleted file mode 100644
index 0862387..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notcontributed/derived/NotContributedFacetDerivedFromDomainServiceFacetFactoryTest.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * 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.actions.notcontributed.derived;
-
-import org.jmock.Expectations;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
-import org.apache.isis.core.metamodel.facets.FacetFactory;
-import org.apache.isis.core.metamodel.facets.FacetedMethod;
-import org.apache.isis.core.metamodel.facets.actions.notcontributed.NotContributedFacet;
-import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
-import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacetAbstract;
-
-public class NotContributedFacetDerivedFromDomainServiceFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
-
- private NotContributedFacetDerivedFromDomainServiceFacetFactory facetFactory;
-
- @Before
- public void setUp() throws Exception {
- facetFactory = new NotContributedFacetDerivedFromDomainServiceFacetFactory();
- facetFactory.setMetaModelContext(super.metaModelContext);
- }
-
- //TODO[2142] NatureOfService.VIEW_MENU_ONLY was deprecated, remove ?
- // @Test
- // public void whenMenu() throws Exception {
- //
- // // given
- // @DomainService(nature = NatureOfService.VIEW_MENU_ONLY)
- // class CustomerService {
- //
- // public String name() {
- // return "Joe";
- // }
- // }
- //
- // context.checking(new Expectations() {{
- // allowing(mockSpecificationLoader).loadSpecification(CustomerService.class);
- // will(returnValue(mockObjSpec));
- //
- // allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
- // will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, null, NatureOfService.VIEW_MENU_ONLY) {
- // }));
- // }});
- //
- // expectNoMethodsRemoved();
- //
- // facetedMethod = FacetedMethod.createForAction(CustomerService.class, "name");
- //
- // // when
- // facetFactory.process(new FacetFactory.ProcessMethodContext(CustomerService.class, null, facetedMethod.getMethod(), mockMethodRemover, facetedMethod));
- //
- // // then
- // final Facet facet = facetedMethod.getFacet(NotContributedFacet.class);
- // assertThat(facet, is(not(nullValue())));
- // assertThat(facet instanceof NotContributedFacetDerivedFromDomainServiceFacet, is(true));
- // final NotContributedFacetDerivedFromDomainServiceFacet facetDerivedFromDomainServiceFacet = (NotContributedFacetDerivedFromDomainServiceFacet) facet;
- // assertThat(facetDerivedFromDomainServiceFacet.getNatureOfService(), equalTo(NatureOfService.VIEW_MENU_ONLY));
- // }
-
-// @Test
-// public void whenDomain() throws Exception {
-//
-// // given
-// @DomainService(nature = NatureOfService.DOMAIN)
-// class CustomerService {
-//
-// public String name() {
-// return "Joe";
-// }
-// }
-//
-// context.checking(new Expectations() {{
-// allowing(mockSpecificationLoader).loadSpecification(CustomerService.class);
-// will(returnValue(mockObjSpec));
-//
-// allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
-// will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, null, NatureOfService.DOMAIN) {
-// }));
-// }});
-//
-// expectNoMethodsRemoved();
-//
-// facetedMethod = FacetedMethod.createForAction(CustomerService.class, "name");
-//
-// // when
-// facetFactory.process(new FacetFactory.ProcessMethodContext(CustomerService.class, null, facetedMethod.getMethod(), mockMethodRemover, facetedMethod));
-//
-// // then
-// final Facet facet = facetedMethod.getFacet(NotContributedFacet.class);
-// assertThat(facet, is(not(nullValue())));
-// assertThat(facet instanceof NotContributedFacetDerivedFromDomainServiceFacet, is(true));
-// final NotContributedFacetDerivedFromDomainServiceFacet facetDerivedFromDomainServiceFacet = (NotContributedFacetDerivedFromDomainServiceFacet) facet;
-// assertThat(facetDerivedFromDomainServiceFacet.getNatureOfService(), equalTo(NatureOfService.DOMAIN));
-// }
-
- @Test
- public void whenView() throws Exception {
-
- // given
- @DomainService()
- class CustomerService {
-
- public String name() {
- return "Joe";
- }
- }
-
- context.checking(new Expectations() {{
- allowing(mockSpecificationLoader).loadSpecification(CustomerService.class);
- will(returnValue(mockObjSpec));
-
- allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
- will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, NatureOfService.VIEW) {
- }));
- }});
-
- expectNoMethodsRemoved();
-
- facetedMethod = FacetedMethod.createForAction(CustomerService.class, "name");
-
- // when
- facetFactory.process(new FacetFactory.ProcessMethodContext(CustomerService.class, null, facetedMethod.getMethod(), mockMethodRemover, facetedMethod));
-
- // then
- final Facet facet = facetedMethod.getFacet(NotContributedFacet.class);
- assertThat(facet, is(nullValue()));
- }
-
- //TODO[2142] NatureOfService.VIEW_CONTRIBUTIONS_ONLY was deprecated, remove ?
- // @Test
- // public void whenContributions() throws Exception {
- //
- // // given
- // @DomainService(nature = NatureOfService.VIEW_CONTRIBUTIONS_ONLY)
- // class CustomerService {
- //
- // public String name() {
- // return "Joe";
- // }
- // }
- //
- // context.checking(new Expectations() {{
- // allowing(mockSpecificationLoader).loadSpecification(CustomerService.class);
- // will(returnValue(mockObjSpec));
- //
- // allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
- // will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, null, NatureOfService.VIEW_CONTRIBUTIONS_ONLY) {
- // }));
- // }});
- //
- // expectNoMethodsRemoved();
- //
- // facetedMethod = FacetedMethod.createForAction(CustomerService.class, "name");
- //
- // // when
- // facetFactory.process(new FacetFactory.ProcessMethodContext(CustomerService.class, null, facetedMethod.getMethod(), mockMethodRemover, facetedMethod));
- //
- // // then
- // final Facet facet = facetedMethod.getFacet(NotContributedFacet.class);
- // assertThat(facet, is(nullValue()));
- // }
-
- @Test
- public void whenNone() throws Exception {
-
- // given
- class CustomerService {
-
- public String name() {
- return "Joe";
- }
- }
-
- context.checking(new Expectations() {{
- allowing(mockSpecificationLoader).loadSpecification(CustomerService.class);
- will(returnValue(mockObjSpec));
-
- allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
- will(returnValue(null));
- }});
-
- expectNoMethodsRemoved();
-
- facetedMethod = FacetedMethod.createForAction(CustomerService.class, "name");
-
- // when
- facetFactory.process(new FacetFactory.ProcessMethodContext(CustomerService.class, null, facetedMethod.getMethod(), mockMethodRemover, facetedMethod));
-
- // then
- final Facet facet = facetedMethod.getFacet(NotContributedFacet.class);
- assertThat(facet, is(nullValue()));
- }
-
-}
\ No newline at end of file
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
index 0ecdbba..dd8818e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
@@ -64,7 +64,7 @@ public class ParameterNameFacetTest extends AbstractFacetFactoryJUnit4TestCase {
super.setUpFacetedMethodAndParameter();
// verify that
- assertEquals(125, programmingModel.streamFactories().count());
+ assertEquals(124, programmingModel.streamFactories().count());
}
@Override