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/01/20 20:18:37 UTC
[isis] branch master updated: ISIS-2158: deprecating
DomainService.repositoryFor (never got implem)
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 6c35b2b ISIS-2158: deprecating DomainService.repositoryFor (never got implem)
6c35b2b is described below
commit 6c35b2be179ebe61aa5e4a87c77fa9553b3aa5a8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 20 21:18:24 2020 +0100
ISIS-2158: deprecating DomainService.repositoryFor (never got implem)
---
.../isis/applib/annotation/DomainService.java | 27 ++--------------------
.../object/domainservice/DomainServiceFacet.java | 9 --------
.../domainservice/DomainServiceFacetAbstract.java | 8 -------
.../specloader/SpecificationLoaderDefault.java | 3 +++
.../DomainServiceFacetAnnotationFactoryTest.java | 11 +++------
5 files changed, 8 insertions(+), 50 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
index 450b3fb..e836635 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/DomainService.java
@@ -58,7 +58,9 @@ public @interface DomainService {
/**
* If this domain service acts as a repository for an entity type, specify that entity type.
+ * @deprecated was never implemented
*/
+ @Deprecated
Class<?> repositoryFor() default Object.class;
/**
@@ -66,30 +68,5 @@ public @interface DomainService {
*/
NatureOfService nature() default NatureOfService.VIEW;
- //TODO[2140] deprecated, remove?
- // /**
- // * Number in Dewey Decimal format representing the order.
- // *
- // * <p>
- // * Same convention as {@link MemberOrder#sequence()}. If not specified, placed after any named.
- // * </p>
- // *
- // * <p>
- // * Either this attribute or {@link DomainServiceLayout#menuOrder()} can be used; they are equivalent.
- // * Typically this attribute is used for services with a {@link #nature() nature} of
- // * {@link NatureOfService#DOMAIN domain} (these are not visible in the UI) whereas
- // * {@link DomainServiceLayout#menuOrder()} is used for services with a nature of
- // * {@link NatureOfService#VIEW_MENU_ONLY} (which do appear in the UI)
- // * </p>
- // *
- // * <p>
- // * The default value is set to "Integer.MAX_VALUE - 100" so that any domain services intended to override the
- // * default implementations provided by the framework itself will do so without having to specify the
- // * menuOrder (with the exception of <tt>EventBusServiceJdo</tt>, all framework implementations have a
- // * default order greater than Integer.MAX_VALUE - 50).
- // * </p>
- // */
- // String menuOrder() default Constants.MENU_ORDER_DEFAULT ;
-
}
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 8a5f07f..60e92a5 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
@@ -31,15 +31,6 @@ import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServi
public interface DomainServiceFacet extends Facet {
/**
- * Corresponds to {@link org.apache.isis.applib.annotation.DomainService#repositoryFor()}.
- * <p/>
- * <p>
- * May be null.
- * </p>
- */
- public Class<?> getRepositoryFor();
-
- /**
* Corresponds to {@link org.apache.isis.applib.annotation.DomainService#nature()}.
*
* <p>
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacetAbstract.java
index 2683a32..0c04e9f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/DomainServiceFacetAbstract.java
@@ -35,7 +35,6 @@ implements DomainServiceFacet {
return DomainServiceFacet.class;
}
- private final Class<?> repositoryFor;
private final NatureOfService natureOfService;
public DomainServiceFacetAbstract(
@@ -43,23 +42,16 @@ implements DomainServiceFacet {
final Class<?> repositoryFor,
final NatureOfService natureOfService) {
super(DomainServiceFacetAbstract.type(), facetHolder, Derivation.NOT_DERIVED);
- this.repositoryFor = repositoryFor;
this.natureOfService = natureOfService;
}
@Override
- public Class<?> getRepositoryFor() {
- return repositoryFor;
- }
-
- @Override
public NatureOfService getNatureOfService() {
return natureOfService;
}
@Override public void appendAttributesTo(final Map<String, Object> attributeMap) {
super.appendAttributesTo(attributeMap);
- attributeMap.put("repositoryFor", repositoryFor);
attributeMap.put("natureOfService", natureOfService);
}
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
index d9e26ed..a4111c1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderDefault.java
@@ -258,6 +258,9 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
log.info(" - introspecting {} mixins", typeRegistry.getMixinTypes().size());
log.info(" - introspecting {} entities", typeRegistry.getEntityTypes().size());
+
+ System.out.println("!!! entities " + typeRegistry.getEntityTypes());
+
log.info(" - introspecting {} view models", typeRegistry.getViewModelTypes().size());
introspect(domainObjectSpecs, IntrospectionState.TYPE_AND_MEMBERS_INTROSPECTED);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactoryTest.java
index 1d31caa..cd860d5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotationFactoryTest.java
@@ -18,16 +18,12 @@
*/
package org.apache.isis.core.metamodel.facets.object.domainservice.annotation;
-import org.junit.Assert;
-
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.domainservice.DomainServiceFacet;
-import static org.apache.isis.core.metamodel.commons.matchers.IsisMatchers.classEqualTo;
-
public class DomainServiceFacetAnnotationFactoryTest extends AbstractFacetFactoryTest {
private DomainServiceFacetAnnotationFactory facetFactory;
@@ -46,9 +42,8 @@ public class DomainServiceFacetAnnotationFactoryTest extends AbstractFacetFactor
}
public void testAggregatedAnnotationPickedUpOnClass() {
- class Customer {
- }
- @DomainService(repositoryFor = Customer.class)
+
+ @DomainService
class Customers {
}
@@ -58,7 +53,7 @@ public class DomainServiceFacetAnnotationFactoryTest extends AbstractFacetFactor
assertNotNull(facet);
assertTrue(facet instanceof DomainServiceFacetAnnotation);
DomainServiceFacetAnnotation domainServiceFacet = (DomainServiceFacetAnnotation) facet;
- Assert.assertThat(domainServiceFacet.getRepositoryFor(), classEqualTo(Customer.class));
+ assertNotNull(domainServiceFacet);
assertNoMethodsRemoved();
}