[isis] branch master updated: ISIS-2954: don't produce random UUIDs with demo UUID sample provider

[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 8b63954  ISIS-2954: don't produce random UUIDs with demo UUID sample 
provider
8b63954 is described below

commit 8b639549d499ac8187d6360a28fbd03d925f86a1
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Mon Feb 7 11:22:47 2022 +0100

    ISIS-2954: don't produce random UUIDs with demo UUID sample provider
    
    - Wicket Viewer, does call get-choices twice during action param
    negotiation, which has unwanted side-effects when the choice provider
    produces random samples
---
 .../isis/core/metamodel/valuesemantics/UUIDValueSemantics.java      | 5 +++--
 .../dom/types/javautil/uuids/holder/JavaUtilUuidHolder2.java        | 2 +-
 .../dom/types/javautil/uuids/samples/JavaUtilUuidSamples.java       | 6 +++++-
 .../select2/providers/ObjectAdapterMementoProviderAbstract.java     | 3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/UUIDValueSemantics.java
 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/UUIDValueSemantics.java
index f813e72..5facba1 100644
--- 
a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/UUIDValueSemantics.java
+++ 
b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/valuesemantics/UUIDValueSemantics.java
@@ -100,8 +100,9 @@ implements
     @Override
     public Can<UUID> getExamples() {
         return Can.of(
-                UUID.randomUUID(),
-                UUID.randomUUID());
+                UUID.fromString("57f2b7fa-1aed-41af-b9a2-8a25824335ac"),
+                UUID.fromString("d2302a34-a393-498c-977a-10ea6a6cb422"),
+                UUID.fromString("a89ba9b7-5e59-447d-bae7-5d91e2daa85b"));
     }
 
     //    private static final Pattern pattern = Pattern.compile(
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder2.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder2.java
index 61ad5e1..cb72e2d 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder2.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/holder/JavaUtilUuidHolder2.java
@@ -32,7 +32,7 @@ public interface JavaUtilUuidHolder2 extends 
JavaUtilUuidHolder {
         describedAs =
             "@PropertyLayout(labelPosition=LEFT)",
         hidden = Where.ALL_TABLES,
-        fieldSetId = "label-positions", sequence = "1")  // <.>
+        fieldSetId = "label-positions", sequence = "1")     // <.>
     default java.util.UUID getReadOnlyPropertyDerivedLabelPositionLeft() {
         return getReadOnlyProperty();
     }
diff --git 
a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/samples/JavaUtilUuidSamples.java
 
b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/samples/JavaUtilUuidSamples.java
index ad3a262..884066d 100644
--- 
a/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/samples/JavaUtilUuidSamples.java
+++ 
b/examples/demo/domain/src/main/java/demoapp/dom/types/javautil/uuids/samples/JavaUtilUuidSamples.java
@@ -23,6 +23,8 @@ import java.util.stream.Stream;
 
 import org.springframework.stereotype.Service;
 
+import org.apache.isis.core.metamodel.valuesemantics.UUIDValueSemantics;
+
 import demoapp.dom.types.Samples;
 
 @Service
@@ -30,7 +32,9 @@ public class JavaUtilUuidSamples implements Samples<UUID> {
 
     @Override
     public Stream<UUID> stream() {
-        return Stream.of(UUID.randomUUID(), UUID.randomUUID(), 
UUID.randomUUID());
+        return new UUIDValueSemantics()
+                .getExamples()
+                .stream();
     }
 
 }
diff --git 
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
 
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
index 641d6f5..fac7dc6 100644
--- 
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
+++ 
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
@@ -97,7 +97,8 @@ extends ChoiceProvider<ObjectMemento> {
 
         final List<ObjectMemento> mementos = 
_Lists.newArrayList(obtainMementos(term));
         // if not mandatory, and the list doesn't contain null already, then 
add it in.
-        if(!scalarModel.isRequired() && !mementos.contains(null)) {
+        if(!scalarModel.isRequired()
+                && !mementos.contains(null)) {
             mementos.add(0, null);
         }
         response.addAll(mementos);