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/06/05 07:57:14 UTC
[isis] branch master updated: ISIS-2340: ManagedObjects: move and
gather unwrap utility methods (2)
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 41c7b76 ISIS-2340: ManagedObjects: move and gather unwrap utility methods (2)
41c7b76 is described below
commit 41c7b76b3a2eb2a300d8f754504f90029685a845
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Jun 5 09:57:01 2020 +0200
ISIS-2340: ManagedObjects: move and gather unwrap utility methods (2)
---
.../facets/objectvalue/maxlen/MaxLengthFacetAbstract.java | 3 ++-
.../org/apache/isis/core/metamodel/spec/ManagedObject.java | 12 +-----------
.../org/apache/isis/core/metamodel/spec/ManagedObjects.java | 12 ++++++++++++
.../isis/core/metamodel/facets/ObjectAdapterUtilsTest.java | 6 +++---
4 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/maxlen/MaxLengthFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/maxlen/MaxLengthFacetAbstract.java
index cf6030f..beda1c3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/maxlen/MaxLengthFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/maxlen/MaxLengthFacetAbstract.java
@@ -25,6 +25,7 @@ import org.apache.isis.core.metamodel.facets.SingleIntValueFacetAbstract;
import org.apache.isis.core.metamodel.interactions.ProposedHolder;
import org.apache.isis.core.metamodel.interactions.ValidityContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
+import org.apache.isis.core.metamodel.spec.ManagedObjects.UnwrapUtil;
import lombok.val;
@@ -44,7 +45,7 @@ public abstract class MaxLengthFacetAbstract extends SingleIntValueFacetAbstract
*/
@Override
public boolean exceeds(final ManagedObject adapter) {
- final String str = ManagedObject.unwrapSingleAsStringOrElse(adapter, null);
+ final String str = UnwrapUtil.singleAsStringOrElse(adapter, null);
if (str == null) {
return false;
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
index 56d586a..5e0e049 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObject.java
@@ -268,17 +268,7 @@ public interface ManagedObject {
return unwrappedObjects;
}
- @Nullable
- public static String unwrapSingleAsStringOrElse(@Nullable final ManagedObject adapter, @Nullable String orElse) {
- final Object obj = UnwrapUtil.single(adapter);
- if (obj == null) {
- return null;
- }
- if (!(obj instanceof String)) {
- return orElse;
- }
- return (String) obj;
- }
+
/**
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
index cfa5f13..d9d3608 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ManagedObjects.java
@@ -524,6 +524,18 @@ public final class ManagedObjects {
: null;
}
+ @Nullable
+ public static String singleAsStringOrElse(@Nullable final ManagedObject adapter, @Nullable String orElse) {
+ final Object obj = UnwrapUtil.single(adapter);
+ if (obj == null) {
+ return null;
+ }
+ if (obj instanceof String) {
+ return (String) obj;
+ }
+ return orElse;
+ }
+
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
index ae847e5..f603043 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
@@ -55,21 +55,21 @@ public class ObjectAdapterUtilsTest {
@Test
public void testUnwrapStringWhenNull() {
- assertNull(ManagedObject.unwrapSingleAsStringOrElse(null, null));
+ assertNull(UnwrapUtil.singleAsStringOrElse(null, null));
}
@Test
public void testUnwrapStringWhenNotNullButNotString() {
underlyingDomainObject = new Object();
expectAdapterWillReturn(underlyingDomainObject);
- assertNull(ManagedObject.unwrapSingleAsStringOrElse(mockObjectAdapter, null));
+ assertNull(UnwrapUtil.singleAsStringOrElse(mockObjectAdapter, null));
}
@Test
public void testUnwrapStringWhenNotNullAndString() {
underlyingDomainObject = "huzzah";
expectAdapterWillReturn(underlyingDomainObject);
- assertEquals("huzzah", ManagedObject.unwrapSingleAsStringOrElse(mockObjectAdapter, null));
+ assertEquals("huzzah", UnwrapUtil.singleAsStringOrElse(mockObjectAdapter, null));
}
private void expectAdapterWillReturn(final Object domainObject) {