[isis] branch master updated: ISIS-2294: mitigate possible new bugs (sonar analysis)

[ah...@apache.org]

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 deee4f2  ISIS-2294: mitigate possible new bugs (sonar analysis)
deee4f2 is described below

commit deee4f2bc527d6aaa8bffc5e54f60251400b0f66
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Feb 21 15:24:19 2020 +0100

    ISIS-2294: mitigate possible new bugs (sonar analysis)
---
 .../org/apache/isis/core/metamodel/util/snapshot/XmlSnapshot.java    | 5 ++---
 .../core/runtime/persistence/transaction/AdapterAndProperty.java     | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSnapshot.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSnapshot.java
index f85b5db..cb69db7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSnapshot.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/util/snapshot/XmlSnapshot.java
@@ -849,7 +849,7 @@ public class XmlSnapshot implements Snapshot {
     private String oidAsString(final ManagedObject adapter) {
         if (adapter.getPojo() instanceof ViewModel) {
             // return a fake oid for view models;
-            // a snapshot may be being used to create the memento/OID
+            // a snapshot may be used to create the memento/OID
             String fakeOid = viewModelFakeOids.get(adapter);
             if (fakeOid == null) {
                 fakeOid = "viewmodel-fakeoid-" + UUID.randomUUID().toString();
@@ -857,8 +857,7 @@ public class XmlSnapshot implements Snapshot {
             }
             return fakeOid;
         } else {
-            return ManagedObject.stringify(adapter)
-                    .orElse(null);
+            return ManagedObject.stringifyElseFail(adapter);
         }
     }
 
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AdapterAndProperty.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AdapterAndProperty.java
index 3fab8f2..48efe12 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AdapterAndProperty.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AdapterAndProperty.java
@@ -51,7 +51,7 @@ public class AdapterAndProperty {
         this.property = property;
         this.propertyId = property.getId();
 
-        this.bookmark = ManagedObject.bookmark(adapter).orElse(null);
+        this.bookmark = ManagedObject.bookmarkElseFail(adapter);
         this.bookmarkStr = bookmark.toString();
         
     }