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 2018/10/11 17:36:03 UTC

[isis] branch v2 updated: ISIS-2003: proposed fix for DomainServiceLayout facet picked up even if not specified

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/v2 by this push:
     new caeb2c0  ISIS-2003: proposed fix for DomainServiceLayout facet picked up even if not specified
caeb2c0 is described below

commit caeb2c098f402da580066319a2f62929be3f5edb
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Oct 11 19:35:50 2018 +0200

    ISIS-2003: proposed fix for DomainServiceLayout facet picked up even if
    not specified
    
    Task-Url: https://issues.apache.org/jira/browse/ISIS-2003
---
 .../DomainServiceLayoutFacetFactory.java           | 37 ++++++----------------
 ...NamedFacetForDomainServiceLayoutAnnotation.java | 18 ++++-------
 2 files changed, 16 insertions(+), 39 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
index 3ddd54e..d99a7dc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/DomainServiceLayoutFacetFactory.java
@@ -18,8 +18,6 @@
  */
 package org.apache.isis.core.metamodel.facets.object.domainservicelayout;
 
-import java.util.List;
-
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.DomainServiceLayout;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -43,37 +41,22 @@ public class DomainServiceLayoutFacetFactory extends FacetFactoryAbstract {
         final FacetHolder facetHolder = processClassContext.getFacetHolder();
 
         final DomainService domainService = Annotations.getAnnotation(cls, DomainService.class);
-        final List<DomainServiceLayout> domainServiceLayouts = Annotations.getAnnotations(cls, DomainServiceLayout.class);
+        final DomainServiceLayout domainServiceLayout = Annotations.getAnnotation(cls, DomainServiceLayout.class);
 
-        if (domainService == null && domainServiceLayouts == null) {
+        final boolean bothAnnotationsArePresent = domainService != null && domainServiceLayout != null; 
+        if (!bothAnnotationsArePresent) {
             return;
         }
 
-        final String domainServiceMenuOrder =
-                domainService != null && !domainService.menuOrder().equals("" + (Integer.MAX_VALUE - 100))
-                ? domainService.menuOrder()
-                        : null;
-                final String domainServiceLayoutMenuOrder =domainServiceLayouts.stream()
-                        .map(DomainServiceLayout::menuOrder)
-                        .filter(menuOrder -> !menuOrder.equals("" + (Integer.MAX_VALUE - 100)))
-                        .findFirst()
-                        .orElse(null);
-
-                final String menuOrder = DomainServiceMenuOrder.minimumOf(domainServiceLayoutMenuOrder, domainServiceMenuOrder);
-
-                DomainServiceLayout.MenuBar menuBar =
-                        domainServiceLayouts.stream()
-                        .map(DomainServiceLayout::menuBar)
-                        .filter(mb -> mb != DomainServiceLayout.MenuBar.NOT_SPECIFIED)
-                        .findFirst()
-                        .orElse(DomainServiceLayout.MenuBar.PRIMARY);
+        final String menuOrder = DomainServiceMenuOrder.orderOf(cls);
 
-                FacetUtil.addFacet(
-                        new DomainServiceLayoutFacetAnnotation(
-                                facetHolder,
-                                menuBar, menuOrder));
+        DomainServiceLayout.MenuBar menuBar =
+                domainServiceLayout != null
+                ? domainServiceLayout.menuBar()
+                        : DomainServiceLayout.MenuBar.PRIMARY;
 
-                FacetUtil.addFacet(NamedFacetForDomainServiceLayoutAnnotation.create(domainServiceLayouts, facetHolder));
+        FacetUtil.addFacet(new DomainServiceLayoutFacetAnnotation(facetHolder, menuBar, menuOrder));
+        FacetUtil.addFacet(NamedFacetForDomainServiceLayoutAnnotation.create(domainServiceLayout, facetHolder));
     }
 
 }
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/NamedFacetForDomainServiceLayoutAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/NamedFacetForDomainServiceLayoutAnnotation.java
index 59ca7ae..d5d6ca7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/NamedFacetForDomainServiceLayoutAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainservicelayout/NamedFacetForDomainServiceLayoutAnnotation.java
@@ -19,8 +19,6 @@
 package org.apache.isis.core.metamodel.facets.object.domainservicelayout;
 
 
-import java.util.List;
-
 import org.apache.isis.applib.annotation.DomainServiceLayout;
 import org.apache.isis.commons.internal.base._Strings;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -30,16 +28,12 @@ import org.apache.isis.core.metamodel.facets.all.named.NamedFacetAbstract;
 
 public class NamedFacetForDomainServiceLayoutAnnotation extends NamedFacetAbstract {
 
-    public static NamedFacet create(
-            final List<DomainServiceLayout> domainServiceLayouts,
-            final FacetHolder holder) {
-
-        return domainServiceLayouts.stream()
-                .map(DomainServiceLayout::named)
-                .filter(_Strings::isNotEmpty)
-                .findFirst()
-                .map(named -> new NamedFacetForDomainServiceLayoutAnnotation(named, holder))
-                .orElse(null);
+    public static NamedFacet create(final DomainServiceLayout domainServiceLayout, final FacetHolder holder) {
+        if(domainServiceLayout == null) {
+            return null;
+        }
+        final String named = _Strings.emptyToNull(domainServiceLayout.named());
+        return named != null ? new NamedFacetForDomainServiceLayoutAnnotation(named, holder) : null;
     }
 
     private NamedFacetForDomainServiceLayoutAnnotation(String value, FacetHolder holder) {