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 18:54:18 UTC

[isis] branch master updated: ISIS-2464: remove @DomainService(repositoryFor=...)

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 a9e51de  ISIS-2464: remove @DomainService(repositoryFor=...)
a9e51de is described below

commit a9e51de416e2b7d8120dcc10559fb2de4ce449f5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Nov 25 19:54:04 2020 +0100

    ISIS-2464: remove @DomainService(repositoryFor=...)
---
 .../modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc | 18 ++++++---
 .../applib-ant/examples/annotation/Action.java     | 15 +++++++
 .../examples/annotation/DomainService.java         | 12 +-----
 .../applib-ant/pages/DomainService/nature.adoc     |  1 -
 .../isis/applib/annotation/DomainService.java      | 12 +-----
 .../domainservice/DomainServiceFacetAbstract.java  |  1 -
 .../annotation/DomainServiceFacetAnnotation.java   |  3 +-
 .../DomainServiceFacetAnnotationFactory.java       | 25 +-----------
 ...conFacetDerivedFromDomainServiceAnnotation.java | 47 ----------------------
 .../metamodel/facets/object/icon/IconFacet.java    |  6 ++-
 ...tionLayoutAnnotationFacetFactoryJunit4Test.java | 10 ++---
 ...etDerivedFromDomainServiceFacetFactoryTest.java |  4 +-
 ...etDerivedFromDomainServiceFacetFactoryTest.java |  6 +--
 .../app/feature/ApplicationFeatureViewModels.java  |  3 +-
 14 files changed, 44 insertions(+), 119 deletions(-)

diff --git a/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc
index 3b102ad..1cd59c4 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc
@@ -76,17 +76,24 @@ VIEW_MENU_ONLY,
 VIEW_CONTRIBUTIONS_ONLY,
 ----
 
-== Changes to the Programming Model (Publishing)
+== Changes to the Programming Model
 
 === Removed
 
 [source,java]
 ----
-@Action/@Property(command=...)
-@Action/@Property(publish=...)
-@DomainObject(audit=...)
-@DomainObject(publish=...)
+@Action/@Property(command=...)    // <.>
+@Action/@Property(publish=...)    // <.>
+@DomainObject(audit=...)          // <.>
+@DomainObject(publish=...)        // <.> 
+@DomainService(repositoryFor=...) // <.>
 ----
+<.> replaced with `commandPublishing`
+<.> replaced with `executionPublishing`
+<.> replaced with `entityChangePublishing`
+<.> replaced with `entityChangePublishing`
+<.> if this domain service acts as a repository for an entity type, 
+specify that entity type (was never implemented)
 
 === Added
 
@@ -140,4 +147,3 @@ CommandServiceInternal -> CommandPublisher
 
 
 
-
diff --git a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Action.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Action.java
index 08550e6..8734add 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Action.java
+++ b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/Action.java
@@ -196,5 +196,20 @@ public @interface Action {
     Class<?> typeOf()                                               // <.>
             default Object.class;
 
+    // end::refguide[]
+    /**
+     * For downloading {@link Blob} or {@link Clob}, optionally restrict the files accepted (eg <tt>.xslx</tt>).
+     *
+     * <p>
+     * The value should be of the form "file_extension|audio/*|video/*|image/*|media_type".
+     * </p>
+     *
+     * @see <a href="http://www.w3schools.com/tags/att_input_accept.asp">http://www.w3schools.com</a>
+     *
+     */
+    // tag::refguide[]
+    String fileAccept()                                             // <.>
+            default "";
+
 }
 // end::refguide[]
diff --git a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainService.java b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainService.java
index 84e234a..90b9510 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainService.java
+++ b/api/applib/src/main/adoc/modules/applib-ant/examples/annotation/DomainService.java
@@ -69,16 +69,6 @@ public @interface DomainService {
     // tag::refguide[]
     String objectType()                         // <.>
             default "";
-
-    // end::refguide[]
-    /**
-     * 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;
-
-    // tag::refguide[]
+    
 }
 // end::refguide[]
diff --git a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainService/nature.adoc b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainService/nature.adoc
index 57c24fc..63b9b74 100644
--- a/api/applib/src/main/adoc/modules/applib-ant/pages/DomainService/nature.adoc
+++ b/api/applib/src/main/adoc/modules/applib-ant/pages/DomainService/nature.adoc
@@ -41,7 +41,6 @@ A final example:
 @RequiredArgsConstructor(onConstructor_ = {@Inject} )
 public class Loans {                                   // <.>
 
-    @Inject
     private final LoanRepository loanRepository;       // <.>
 
     @Action(semantics=SemanticsOf.SAFE)
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 84e234a..90b9510 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
@@ -69,16 +69,6 @@ public @interface DomainService {
     // tag::refguide[]
     String objectType()                         // <.>
             default "";
-
-    // end::refguide[]
-    /**
-     * 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;
-
-    // tag::refguide[]
+    
 }
 // end::refguide[]
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 0c04e9f..91f9a03 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
@@ -39,7 +39,6 @@ implements DomainServiceFacet {
 
     public DomainServiceFacetAbstract(
             final FacetHolder facetHolder,
-            final Class<?> repositoryFor,
             final NatureOfService natureOfService) {
         super(DomainServiceFacetAbstract.type(), facetHolder, Derivation.NOT_DERIVED);
         this.natureOfService = natureOfService;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotation.java
index 55aed4b..4637048 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/DomainServiceFacetAnnotation.java
@@ -28,8 +28,7 @@ public class DomainServiceFacetAnnotation extends DomainServiceFacetAbstract {
 
     public DomainServiceFacetAnnotation(
             final FacetHolder facetHolder,
-            final Class<?> repositoryFor,
             final NatureOfService natureOfService) {
-        super(facetHolder, repositoryFor, natureOfService);
+        super(facetHolder, natureOfService);
     }
 }
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 27fd0cc..f575f96 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
@@ -22,7 +22,6 @@ package org.apache.isis.core.metamodel.facets.object.domainservice.annotation;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.core.metamodel.context.MetaModelContext;
 import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -57,7 +56,6 @@ implements MetaModelRefiner {
         mixinOnlyValidator.setMetaModelContext(metaModelContext);
     }
 
-    @SuppressWarnings("deprecation") // because we specifically want to handle deprecated enum use here
     @Override
     public void process(ProcessClassContext processClassContext) {
         val cls = processClassContext.getCls();
@@ -68,29 +66,8 @@ implements MetaModelRefiner {
         val facetHolder = processClassContext.getFacetHolder();
         val domainServiceFacet = new DomainServiceFacetAnnotation(
                 facetHolder,
-                domainServiceAnnotation.repositoryFor(), domainServiceAnnotation.nature());
+                domainServiceAnnotation.nature());
         super.addFacet(domainServiceFacet);
-
-
-        super.addFacet(
-                new IconFacetDerivedFromDomainServiceAnnotation(
-                        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
-//        }
     }
 
     @Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/IconFacetDerivedFromDomainServiceAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/IconFacetDerivedFromDomainServiceAnnotation.java
deleted file mode 100644
index 975d4ff..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservice/annotation/IconFacetDerivedFromDomainServiceAnnotation.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.object.domainservice.annotation;
-
-import java.util.Map;
-
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.object.icon.IconFacetAbstract;
-import org.apache.isis.core.metamodel.spec.ManagedObject;
-
-
-public class IconFacetDerivedFromDomainServiceAnnotation extends IconFacetAbstract {
-
-    private final Class<?> repositoryFor;
-
-    public IconFacetDerivedFromDomainServiceAnnotation(FacetHolder facetHolder, Class<?> repositoryFor) {
-        super(facetHolder);
-        this.repositoryFor = repositoryFor;
-    }
-
-    @Override
-    public String iconName(ManagedObject object) {
-        return repositoryFor.getName();
-    }
-
-    @Override public void appendAttributesTo(final Map<String, Object> attributeMap) {
-        super.appendAttributesTo(attributeMap);
-        attributeMap.put("repositoryFor", repositoryFor);
-    }
-
-}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacet.java
index c33ef34..65f751b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/icon/IconFacet.java
@@ -20,9 +20,11 @@
 package org.apache.isis.core.metamodel.facets.object.icon;
 
 import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
+import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
 import org.apache.isis.core.metamodel.spec.ManagedObject;
 
-/*
+/**
  * Icon for an object a class (for example, by placing an appropriately named image
  * file into a certain directory).
  *
@@ -33,7 +35,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
  * different icons for its instances (eg Visa, Mastercard, Amex).
  *
  * <p>
- * In the standard Apache Isis Programming Model, typically corresponds to a method named <tt>iconName</tt>.
+ * In the standard Apache Isis Programming Model, typically corresponds to a method named {@code iconName}.
  *
  * @see TitleFacet
  * @see PluralFacet
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 2c3b9db..2a7681e 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
@@ -74,7 +74,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
                 will(returnValue(mockObjSpec));
 
                 allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
-                will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, null, NatureOfService.VIEW) {
+                will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, NatureOfService.VIEW) {
                 }));
             }});
 
@@ -109,7 +109,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
                 will(returnValue(mockObjSpec));
 
                 allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
-                will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, null, NatureOfService.VIEW) {
+                will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, NatureOfService.VIEW) {
                 }));
             }});
 
@@ -146,7 +146,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
                 will(returnValue(mockObjSpec));
 
                 allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
-                will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, null, NatureOfService.VIEW) {
+                will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, NatureOfService.VIEW) {
                 }));
             }});
 
@@ -186,7 +186,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
                 will(returnValue(mockObjSpec));
 
                 allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
-                will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, null, NatureOfService.VIEW) {
+                will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, NatureOfService.VIEW) {
                 }));
             }});
 
@@ -223,7 +223,7 @@ public class ActionLayoutAnnotationFacetFactoryJunit4Test extends AbstractFacetF
                 will(returnValue(mockObjSpec));
 
                 allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
-                will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, null, NatureOfService.VIEW) {
+                will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, NatureOfService.VIEW) {
                 }));
             }});
 
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 2b00fd9..0862387 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
@@ -22,9 +22,7 @@ import org.jmock.Expectations;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
@@ -138,7 +136,7 @@ public class NotContributedFacetDerivedFromDomainServiceFacetFactoryTest extends
             will(returnValue(mockObjSpec));
 
             allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
-            will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, null, NatureOfService.VIEW) {
+            will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, NatureOfService.VIEW) {
             }));
         }});
 
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 9a7189c..a452adc 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
@@ -22,9 +22,7 @@ import org.jmock.Expectations;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
@@ -140,7 +138,7 @@ extends AbstractFacetFactoryJUnit4TestCase {
             will(returnValue(mockObjSpec));
 
             allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
-            will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, null, NatureOfService.VIEW) {
+            will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, NatureOfService.VIEW) {
             }));
         }});
 
@@ -173,7 +171,7 @@ extends AbstractFacetFactoryJUnit4TestCase {
             will(returnValue(mockObjSpec));
 
             allowing(mockObjSpec).getFacet(DomainServiceFacet.class);
-            will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, null, NatureOfService.VIEW) {
+            will(returnValue(new DomainServiceFacetAbstract(mockObjSpec, NatureOfService.VIEW) {
             }));
         }});
 
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModels.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModels.java
index 490604d..a4b9d54 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModels.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModels.java
@@ -40,8 +40,7 @@ import org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureReposit
 
 @DomainService(
         nature = NatureOfService.VIEW,
-        objectType = "isissecurity.ApplicationFeatureViewModels",
-        repositoryFor = ApplicationFeatureViewModel.class
+        objectType = "isissecurity.ApplicationFeatureViewModels"
         )
 @DomainServiceLayout(
         named="Security",