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/25 08:25:58 UTC
[isis] branch master updated: ISIS-2464: remove config option
isis.core.metaModel.validator.serviceActionsOnly
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 ca5b79c ISIS-2464: remove config option isis.core.metaModel.validator.serviceActionsOnly
ca5b79c is described below
commit ca5b79ce9624a92af746e6ac42343ff774a13422
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Nov 25 09:25:43 2020 +0100
ISIS-2464: remove config option
isis.core.metaModel.validator.serviceActionsOnly
also remove deprecated options from NatureOfService
---
.../isis/applib/annotation/NatureOfService.java | 66 +-----------------
.../apache/isis/core/config/IsisConfiguration.java | 9 ---
.../actions/layout/ActionLayoutFacetFactory.java | 8 +--
.../object/domainservice/DomainServiceFacet.java | 45 ++++++++++++-
.../DomainServiceFacetAnnotationFactory.java | 30 ++++-----
...jectSpecIdFacetDerivedFromClassNameFactory.java | 9 +--
.../services/metamodel/MetaModelExporter.java | 8 +--
.../specimpl/dflt/ObjectSpecificationDefault.java | 10 ---
...tionLayoutAnnotationFacetFactoryJunit4Test.java | 78 +++++++++++-----------
...etDerivedFromDomainServiceFacetFactoryTest.java | 70 +++++++++----------
...etDerivedFromDomainServiceFacetFactoryTest.java | 72 ++++++++++----------
.../menubars/bootstrap3/MenuBarsServiceBS3.java | 9 +--
.../service/swagger/internal/Generation.java | 12 +---
.../resources/DomainServiceResourceServerside.java | 15 +----
14 files changed, 184 insertions(+), 257 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
index b20aaa1..7d10459 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/NatureOfService.java
@@ -42,59 +42,16 @@ public enum NatureOfService {
REST,
// end::refguide[]
- //
- // -- DEPRECATIONS
- //
-
- /**
- * A <em>programmatic</em> service.
- * <p>
- * The service's actions do not appear on any viewer and are not visible in the REST API. In other words
- * these are not contributed to the domain-model. However, the service is injectable into domain objects.
- * </p>
- *
- * @deprecated will be removed with 2.0.0 release! use Spring's {@link org.springframework.stereotype.Service @Service} instead;
- * @apiNote For now, used as synonym for {@link #REST}
- */
- @Deprecated
- DOMAIN,
-
- /**
- * @deprecated will be removed with 2.0.0 release! use {@link #REST} instead;
- * @apiNote For now, used as synonym for {@link #REST}
- */
- @Deprecated
- VIEW_REST_ONLY,
-
- /**
- * @deprecated will be removed with 2.0.0 release! use {@link #VIEW} instead
- * @apiNote For now, used as synonym for {@link #VIEW}
- */
- @Deprecated
- VIEW_MENU_ONLY,
-
- /**
- * @deprecated will be removed with 2.0.0 release!
- * <p>
- * For now, contributing actions will be gathered to show up in the 'others' menu to ease migration.
- * These will likely not work.
- * <p>
- * Migration Note: For each {@code Action} write a new mixin class.
- * see {@link Mixin}
- * @apiNote For now, used as synonym for {@link #VIEW}
- */
- @Deprecated
- VIEW_CONTRIBUTIONS_ONLY,
-
;
// -- BASIC PREDICATES
/**
+ * Whether a service contributes its actions to viewers and to the REST API.
* @see {@link NatureOfService#VIEW}
*/
public boolean isView() {
- return this == VIEW || this == VIEW_MENU_ONLY || this == VIEW_CONTRIBUTIONS_ONLY;
+ return this == VIEW;
}
/**
@@ -102,24 +59,7 @@ public enum NatureOfService {
* @see {@link NatureOfService#REST}
*/
public boolean isRestOnly() {
- return this == REST || this == VIEW_REST_ONLY;
- }
-
- /**
- * Whether a service contributes no actions at all.
- * @see {@link NatureOfService#DOMAIN}
- */
- public boolean isProgrammatic() {
- return this == DOMAIN;
- }
-
- // -- SEMANTIC PREDICATES
-
- /**
- * Whether a service contributes its actions (not necessarily exclusive) to the REST API.
- */
- public boolean isRestAlso() {
- return isRestOnly() || isView();
+ return this == REST;
}
// tag::refguide[]
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index 0cf009f..0cfc73b 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -1350,15 +1350,6 @@ public class IsisConfiguration {
private boolean actionCollectionParameterChoices = true;
/**
- * If set, checks that any domain services have only actions associated with them, not properties
- * or collections.
- *
- * @deprecated - in that in the future the programming model will simply not search for properties or collections of domain services.
- */
- @Deprecated
- private boolean serviceActionsOnly = true;
-
- /**
* Whether to ensure that the object type of all objects must be specified explicitly, using either
* {@link DomainObject#objectType()} or {@link DomainService#objectType()}.
*
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 04b7cdc..be6a6f6 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
@@ -119,13 +119,7 @@ extends FacetFactoryAbstract {
final Class<?> cls = processMethodContext.getCls();
final ObjectSpecification spec = getSpecificationLoader().loadSpecification(cls);
- return isContributingService(spec) || isMixinObject(spec);
- }
-
- private static boolean isContributingService(final ObjectSpecification spec) {
- final DomainServiceFacet domainServiceFacet = spec.getFacet(DomainServiceFacet.class);
- return domainServiceFacet != null && !domainServiceFacet.isFallback() &&
- !domainServiceFacet.getNatureOfService().isProgrammatic();
+ return DomainServiceFacet.isContributing(spec) || isMixinObject(spec);
}
private static boolean isMixinObject(final ObjectSpecification spec) {
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 60e92a5..5bb4709 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
@@ -18,13 +18,17 @@
*/
package org.apache.isis.core.metamodel.facets.object.domainservice;
+import java.util.Optional;
+
+import javax.annotation.Nullable;
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.notinservicemenu.NotInServiceMenuFacet;
-
/**
* Corresponds to annotating the class with the {@link org.apache.isis.applib.annotation.DomainService} annotation.
*/
@@ -41,5 +45,44 @@ public interface DomainServiceFacet extends Facet {
* </p>
*/
public NatureOfService getNatureOfService();
+
+ // -- UTILITY
+
+ public static Optional<NatureOfService> getNatureOfService(final @Nullable FacetHolder facetHolderIfAny) {
+ return Optional.ofNullable(facetHolderIfAny)
+ .map(facetHolder->facetHolder.getFacet(DomainServiceFacet.class))
+ .filter(_NullSafe::isPresent)
+ .map(DomainServiceFacet::getNatureOfService);
+ }
+
+ /**
+ * @param facetHolderIfAny - null-able
+ * @return whether facetHolder represents a service that contributes actions to at least REST
+ * (and potentially the UI)
+ */
+ public static boolean isContributing(final @Nullable FacetHolder facetHolderIfAny) {
+ return getNatureOfService(facetHolderIfAny)
+ .isPresent();
+ }
+
+ /**
+ * @param facetHolderIfAny - null-able
+ * @return whether facetHolder represents a service that contributes actions to the UI (and REST implied)
+ */
+ public static boolean isContributingToUiAndRest(final @Nullable FacetHolder facetHolderIfAny) {
+ return getNatureOfService(facetHolderIfAny)
+ .filter(NatureOfService::isView)
+ .isPresent();
+ }
+
+ /**
+ * @param facetHolderIfAny - null-able
+ * @return whether facetHolder represents a service that contributes actions only to REST
+ */
+ public static boolean isContributingOnlyToRest(final @Nullable FacetHolder facetHolderIfAny) {
+ return getNatureOfService(facetHolderIfAny)
+ .filter(NatureOfService::isRestOnly)
+ .isPresent();
+ }
}
\ No newline at end of file
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
index 03446b9..27fd0cc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactory.java
@@ -77,26 +77,26 @@ implements MetaModelRefiner {
facetHolder,
domainServiceAnnotation.repositoryFor()));
- val natureOfService = domainServiceFacet.getNatureOfService();
-
- switch (natureOfService) {
- case VIEW_CONTRIBUTIONS_ONLY:
- val msg = String.format("%s: menu/contributed services (nature == %s) are prohibited "
- + "convert into a mixin (@Mixin annotation) instead",
- cls.getName(),
- natureOfService);
-
- mixinOnlyValidator.onFailure(facetHolder, Identifier.classIdentifier(cls), msg);
- break;
- default:
- // no op
- }
+// val natureOfService = domainServiceFacet.getNatureOfService();
+//
+// switch (natureOfService) {
+// case VIEW_CONTRIBUTIONS_ONLY:
+// val msg = String.format("%s: menu/contributed services (nature == %s) are prohibited "
+// + "convert into a mixin (@Mixin annotation) instead",
+// cls.getName(),
+// natureOfService);
+//
+// mixinOnlyValidator.onFailure(facetHolder, Identifier.classIdentifier(cls), msg);
+// break;
+// default:
+// // no op
+// }
}
@Override
public void refineProgrammingModel(ProgrammingModel programmingModel) {
- val isServiceActionsOnly = getConfiguration().getCore().getMetaModel().getValidator().isServiceActionsOnly();
+ val isServiceActionsOnly = true;
if (isServiceActionsOnly) {
programmingModel.addValidator(new MetaModelValidatorVisiting.Visitor() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
index 5645807..99e99c5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/objectspecid/classname/ObjectSpecIdFacetDerivedFromClassNameFactory.java
@@ -184,12 +184,9 @@ implements MetaModelRefiner, ObjectSpecIdFacetFactory {
return false; //skip validation
}
if (objectSpec.isManagedBean()) {
- // don't check if domain service isn't a target in public API (UI/REST)
- final DomainServiceFacet domainServiceFacet = objectSpec.getFacet(DomainServiceFacet.class);
- if(domainServiceFacet != null) {
- if(domainServiceFacet.getNatureOfService() == NatureOfService.DOMAIN) {
- return false; //skip validation
- }
+ // only check if domain service is contributing to the public API (UI/REST)
+ if(!DomainServiceFacet.getNatureOfService(objectSpec).isPresent()) {
+ return false; //skip validation
}
// don't check if domain service has only programmatic methods
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java
index c72d6aa..6b83a7e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java
@@ -26,7 +26,6 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
-import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.services.commanddto.processor.CommandDtoProcessor;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.applib.spec.Specification;
@@ -207,7 +206,7 @@ class MetaModelExporter {
}
if (specification.isManagedBean()) {
- if(!hasNatureOfServiceOfDomain(specification)) {
+ if(DomainServiceFacet.getNatureOfService(specification).isPresent()) {
addActions(specification, domainClassByObjectSpec, config);
}
} else {
@@ -221,11 +220,6 @@ class MetaModelExporter {
return specification.getCorrespondingClass().isEnum();
}
- private boolean hasNatureOfServiceOfDomain(final ObjectSpecification specification) {
- final DomainServiceFacet domainServiceFacet = specification.getFacet(DomainServiceFacet.class);
- return domainServiceFacet != null && domainServiceFacet.getNatureOfService() == NatureOfService.DOMAIN;
- }
-
private void addProperties(
final ObjectSpecification specification,
final Map<ObjectSpecification, DomainClassDto> domainClassByObjectSpec,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 2a6daec..e621285 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -134,16 +134,6 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
return;
}
- val domainServiceFacet = getFacet(DomainServiceFacet.class);
- val isServiceWithNatureOfDomain = domainServiceFacet != null
- && domainServiceFacet.getNatureOfService() == NatureOfService.DOMAIN;
- if (isServiceWithNatureOfDomain) {
- if (log.isDebugEnabled()) {
- log.debug("skipping type hierarchy introspection for domain service with natureOfService = DOMAIN {}", getFullIdentifier());
- }
- return;
- }
-
// superclass
final Class<?> superclass = getCorrespondingClass().getSuperclass();
loadSpecOfSuperclass(superclass);
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
index ac2885f..2c3b9db 100644
--- 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
@@ -324,45 +324,45 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
//
// }
- @Test
- public void onDomainServiceForDomainWithBoth() {
-
- // given
- @DomainService(nature = NatureOfService.DOMAIN)
- class CustomerService {
-
- @ActionLayout(contributed = Contributed.AS_NEITHER)
- 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) { }));
-
- allowing(mockObjSpec).getFacet(MixinFacet.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, CoreMatchers.is(nullValue()));
-
- }
+// @Test
+// public void onDomainServiceForDomainWithBoth() {
+//
+// // given
+// @DomainService(nature = NatureOfService.DOMAIN)
+// class CustomerService {
+//
+// @ActionLayout(contributed = Contributed.AS_NEITHER)
+// 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) { }));
+//
+// allowing(mockObjSpec).getFacet(MixinFacet.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, CoreMatchers.is(nullValue()));
+//
+// }
@Test
public void onDomainObjectIsIgnored() {
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
index 3edc71f..2b00fd9 100644
--- 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
@@ -85,41 +85,41 @@ public class NotContributedFacetDerivedFromDomainServiceFacetFactoryTest extends
// 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 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 {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
index 5656d39..9a7189c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/notinservicemenu/derived/NotInServiceMenuFacetDerivedFromDomainServiceFacetFactoryTest.java
@@ -86,42 +86,42 @@ extends AbstractFacetFactoryJUnit4TestCase {
// assertThat(facetDerivedFromDomainServiceFacet.getNatureOfService(), equalTo(NatureOfService.VIEW_CONTRIBUTIONS_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");
- facetFactory.setMetaModelContext(super.metaModelContext);
-
- // when
- facetFactory.process(new FacetFactory.ProcessMethodContext(CustomerService.class, null, facetedMethod.getMethod(), mockMethodRemover, facetedMethod));
-
- // then
- final Facet facet = facetedMethod.getFacet(NotInServiceMenuFacet.class);
- assertThat(facet, is(not(nullValue())));
- assertThat(facet instanceof NotInServiceMenuFacetDerivedFromDomainServiceFacet, is(true));
- final NotInServiceMenuFacetDerivedFromDomainServiceFacet facetDerivedFromDomainServiceFacet = (NotInServiceMenuFacetDerivedFromDomainServiceFacet) facet;
- assertThat(facetDerivedFromDomainServiceFacet.getNatureOfService(), equalTo(NatureOfService.DOMAIN));
- }
+// @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");
+// facetFactory.setMetaModelContext(super.metaModelContext);
+//
+// // when
+// facetFactory.process(new FacetFactory.ProcessMethodContext(CustomerService.class, null, facetedMethod.getMethod(), mockMethodRemover, facetedMethod));
+//
+// // then
+// final Facet facet = facetedMethod.getFacet(NotInServiceMenuFacet.class);
+// assertThat(facet, is(not(nullValue())));
+// assertThat(facet instanceof NotInServiceMenuFacetDerivedFromDomainServiceFacet, is(true));
+// final NotInServiceMenuFacetDerivedFromDomainServiceFacet facetDerivedFromDomainServiceFacet = (NotInServiceMenuFacetDerivedFromDomainServiceFacet) facet;
+// assertThat(facetDerivedFromDomainServiceFacet.getNatureOfService(), equalTo(NatureOfService.DOMAIN));
+// }
@Test
public void whenView() throws Exception {
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
index 5eaadad..5fe092e 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
@@ -230,12 +230,9 @@ public class MenuBarsServiceBS3 implements MenuBarsService {
// services that have an imperative hidden() method.
return false;
}
- val domainServiceFacet = spec.getFacet(DomainServiceFacet.class);
- if (domainServiceFacet == null) {
- return true;
- }
- val natureOfService = domainServiceFacet.getNatureOfService();
- return natureOfService == null || natureOfService != NatureOfService.DOMAIN;
+ return DomainServiceFacet.getNatureOfService(spec)
+ .filter(NatureOfService::isView)
+ .isPresent();
}
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
index 3060ce4..353daef 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
@@ -151,19 +151,9 @@ class Generation {
for (val spec : specificationLoader.snapshotSpecifications()) {
- val domainServiceFacet = spec.getFacet(DomainServiceFacet.class);
- if (domainServiceFacet == null) {
+ if(!DomainServiceFacet.isContributing(spec)) {
continue;
}
- val natureOfService = domainServiceFacet.getNatureOfService();
-
- if (natureOfService.isProgrammatic()) {
- continue; // ignore programmatic services
- }
-
- if (visibility.isPublic() && !natureOfService.isRestAlso()) {
- continue; // ignore services that don't publicly contribute to rest
- }
val serviceActions = Util.actionsOf(spec, visibility, classExcluder);
if(serviceActions.isEmpty()) {
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
index 208c3b2..c58f5b0 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/DomainServiceResourceServerside.java
@@ -38,13 +38,11 @@ import javax.ws.rs.core.Response;
import org.springframework.stereotype.Component;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.services.command.Command;
import org.apache.isis.commons.internal.codec._UrlDecoderUtil;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.iactn.IsisInteractionTracker;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
@@ -64,15 +62,8 @@ import lombok.val;
@Path("/services")
public class DomainServiceResourceServerside extends ResourceAbstract implements DomainServiceResource {
- private static final Predicate<ManagedObject> NATURE_REST_ALSO = (final ManagedObject input) -> {
- final ObjectSpecification specification = input.getSpecification();
- final DomainServiceFacet facet = specification.getFacet(DomainServiceFacet.class);
- if (facet == null) {
- // not expected, because we know these are domain services.
- return false;
- }
- val natureOfService = facet.getNatureOfService();
- return natureOfService.isRestAlso();
+ private static final Predicate<ManagedObject> NATURE_REST = (final ManagedObject input) -> {
+ return DomainServiceFacet.isContributing(input.getSpecification());
};
@Inject
@@ -95,7 +86,7 @@ public class DomainServiceResourceServerside extends ResourceAbstract implements
val metaModelContext = resourceContext.getMetaModelContext();
final Stream<ManagedObject> serviceAdapters = metaModelContext.streamServiceAdapters()
- .filter(NATURE_REST_ALSO);
+ .filter(NATURE_REST);
final DomainServicesListReprRenderer renderer = new DomainServicesListReprRenderer(resourceContext, null, JsonRepresentation.newMap());
renderer.usingLinkToBuilder(new DomainServiceLinkTo())