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/17 10:27:46 UTC
[isis] branch master updated: ISIS-2158: minor code quality
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 96fb7f4 ISIS-2158: minor code quality
96fb7f4 is described below
commit 96fb7f42dfbed14362a67e03f13b915f3cf6192a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jan 17 11:27:34 2020 +0100
ISIS-2158: minor code quality
---
.../applib-svc/examples/services/bookmark/Bookmark.java | 3 ++-
.../org/apache/isis/applib/services/bookmark/Bookmark.java | 3 ++-
.../enums/PropertyChoicesFacetDerivedFromChoicesFacet.java | 10 +++++-----
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/Bookmark.java b/api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/Bookmark.java
index c9bbe83..447a196 100644
--- a/api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/Bookmark.java
+++ b/api/applib/src/main/adoc/modules/applib-svc/examples/services/bookmark/Bookmark.java
@@ -27,6 +27,7 @@ import javax.annotation.Nullable;
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.schema.common.v2.OidDto;
+import lombok.AccessLevel;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.val;
@@ -37,7 +38,7 @@ import lombok.val;
* <p>
* Analogous to the <tt>RootOid</tt>.
*/
-@Value @lombok.Value @RequiredArgsConstructor
+@Value @lombok.Value @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
public class Bookmark implements Serializable {
private static final long serialVersionUID = 2L;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
index c9bbe83..447a196 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
@@ -27,6 +27,7 @@ import javax.annotation.Nullable;
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.schema.common.v2.OidDto;
+import lombok.AccessLevel;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.val;
@@ -37,7 +38,7 @@ import lombok.val;
* <p>
* Analogous to the <tt>RootOid</tt>.
*/
-@Value @lombok.Value @RequiredArgsConstructor
+@Value @lombok.Value @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
public class Bookmark implements Serializable {
private static final long serialVersionUID = 2L;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
index f2a8785..2464d85 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/choices/enums/PropertyChoicesFacetDerivedFromChoicesFacet.java
@@ -26,7 +26,8 @@ import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
import org.apache.isis.core.metamodel.facets.properties.choices.PropertyChoicesFacetAbstract;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+
+import lombok.val;
public class PropertyChoicesFacetDerivedFromChoicesFacet extends PropertyChoicesFacetAbstract {
@@ -39,10 +40,9 @@ public class PropertyChoicesFacetDerivedFromChoicesFacet extends PropertyChoices
final ManagedObject adapter,
final InteractionInitiatedBy interactionInitiatedBy) {
- final FacetHolder facetHolder = getFacetHolder();
- final FacetedMethod facetedMethod = (FacetedMethod) facetHolder;
- final ObjectSpecification noSpec = getSpecification(facetedMethod.getType());
- final ChoicesFacet choicesFacet = noSpec.getFacet(ChoicesFacet.class);
+ val facetedMethod = (FacetedMethod) getFacetHolder();
+ val methodSpec = getSpecification(facetedMethod.getType());
+ val choicesFacet = methodSpec.getFacet(ChoicesFacet.class);
if (choicesFacet == null) {
return _Constants.emptyObjects;
}