[isis] branch master updated: ISIS-3060: minor: code readability

[ahuber]

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 1f46f50d5c ISIS-3060: minor: code readability
1f46f50d5c is described below

commit 1f46f50d5ceac7e9f3f5050b0668a99fa278c3ee
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Wed Jul 6 15:01:08 2022 +0200

    ISIS-3060: minor: code readability
---
 .../object/ProjectionFacetsPostProcessor.java      | 38 ++++++++++++----------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/object/ProjectionFacetsPostProcessor.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/object/ProjectionFacetsPostProcessor.java
index 6defc0316d..2f80b80b81 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/object/ProjectionFacetsPostProcessor.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/object/ProjectionFacetsPostProcessor.java
@@ -47,24 +47,26 @@ extends ObjectSpecificationPostProcessorAbstract {
 
     @Override
     public void postProcessObject(final ObjectSpecification 
objectSpecification) {
-        val projectionFacet = 
ProjectionFacetFromProjectingProperty.create(objectSpecification)
-                .orElse(null);
-        if (projectionFacet == null) {
-            return;
-        }
-        FacetUtil.addFacet(projectionFacet);
-        val titleFacet = objectSpecification.getFacet(TitleFacet.class);
-        if(canOverwrite(titleFacet)) {
-            FacetUtil.addFacet(new 
TitleFacetFromProjectionFacet(projectionFacet, objectSpecification));
-        }
-        val iconFacet = objectSpecification.getFacet(IconFacet.class);
-        if(canOverwrite(iconFacet)) {
-            FacetUtil.addFacet(new 
IconFacetFromProjectionFacet(projectionFacet, objectSpecification));
-        }
-        val cssClassFacet = objectSpecification.getFacet(CssClassFacet.class);
-        if(canOverwrite(cssClassFacet)) {
-            FacetUtil.addFacet(new 
CssClassFacetFromProjectionFacet(projectionFacet, objectSpecification));
-        }
+
+        FacetUtil.addFacetIfPresent(
+                
ProjectionFacetFromProjectingProperty.create(objectSpecification))
+        .ifPresent(projectionFacet->{
+
+            val titleFacet = objectSpecification.getFacet(TitleFacet.class);
+            if(canOverwrite(titleFacet)) {
+                FacetUtil.addFacet(new 
TitleFacetFromProjectionFacet(projectionFacet, objectSpecification));
+            }
+            val iconFacet = objectSpecification.getFacet(IconFacet.class);
+            if(canOverwrite(iconFacet)) {
+                FacetUtil.addFacet(new 
IconFacetFromProjectionFacet(projectionFacet, objectSpecification));
+            }
+            val cssClassFacet = 
objectSpecification.getFacet(CssClassFacet.class);
+            if(canOverwrite(cssClassFacet)) {
+                FacetUtil.addFacet(new 
CssClassFacetFromProjectionFacet(projectionFacet, objectSpecification));
+            }
+
+        });
+
     }
 
     // -- HELPER