You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/07/14 21:52:02 UTC

[1/3] git commit: ISIS-831: AbstractInteractionEvent now has a userData hash

Repository: isis
Updated Branches:
  refs/heads/master 447ca3d62 -> 877e7eddf


ISIS-831: AbstractInteractionEvent now has a userData hash

... to allow phases to pass information between each other, without coupling the publisher as to how its subscribers might want to interact.


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ef5168fe
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ef5168fe
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ef5168fe

Branch: refs/heads/master
Commit: ef5168feb0164e7f6b52454d2f1fda9c61a4be2b
Parents: 447ca3d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Jul 14 07:55:32 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jul 14 07:55:32 2014 +0100

----------------------------------------------------------------------
 .../eventbus/AbstractInteractionEvent.java      | 21 ++++++++++++++++++++
 1 file changed, 21 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/ef5168fe/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractInteractionEvent.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractInteractionEvent.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractInteractionEvent.java
index 76c605d..2ef6ace 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractInteractionEvent.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/AbstractInteractionEvent.java
@@ -18,6 +18,8 @@
  */
 package org.apache.isis.applib.services.eventbus;
 
+import java.util.Map;
+import com.google.common.collect.Maps;
 import org.apache.isis.applib.Identifier;
 import org.apache.isis.applib.util.ObjectContracts;
 
@@ -128,6 +130,25 @@ public abstract class AbstractInteractionEvent<S> extends java.util.EventObject
     }
     //endregion
 
+    //region > userData
+    /**
+     * Provides a mechanism to pass data to the next {@link #getPhase() phase}.
+     */
+    private final Map<Object, Object> userData = Maps.newHashMap();
+
+    /**
+     * Obtain user-data, as set by a previous {@link #getPhase() phase}.
+     */
+    public Object get(Object key) {
+        return userData.get(key);
+    }
+    /**
+     * Set user-data, for the use of a subsequent {@link #getPhase() phase}.
+     */
+    public void put(Object key, Object value) {
+        userData.put(key, value);
+    }
+    //endregion
 
     //region > toString
     @Override


[2/3] git commit: ISIS-835: fixed NPE, drop down for strings now ok for actions...

Posted by da...@apache.org.
ISIS-835: fixed NPE, drop down for strings now ok for actions...

... though still has an issue as a property (new value is just ignored).


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6427dfb1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6427dfb1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6427dfb1

Branch: refs/heads/master
Commit: 6427dfb1a4f2296c6aeaf6bf240af8a0cd2822cd
Parents: ef5168f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Jul 14 20:12:31 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jul 14 20:12:31 2014 +0100

----------------------------------------------------------------------
 .../model/mementos/ObjectAdapterMemento.java    |  5 ++
 .../ObjectAdapterMementoProviderAbstract.java   |  4 +-
 .../valuechoices/ValueChoicesSelect2Panel.java  | 64 +++++++++++++-------
 .../FixedObjectAdapterMementoProviderTest.java  | 64 ++++++++++++++++++++
 .../simple/SimpleObjectsFixturesService.java    |  8 ---
 5 files changed, 113 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/6427dfb1/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
index 58f5a66..72658fd 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
@@ -65,6 +65,7 @@ public class ObjectAdapterMemento implements Serializable {
     }
 
 
+
     enum Type {
         /**
          * The {@link ObjectAdapter} that this is the memento for directly has
@@ -349,6 +350,10 @@ public class ObjectAdapterMemento implements Serializable {
 
     @Override
     public String toString() {
+        return asString();
+    }
+
+    public String asString() {
         return type.toString(this);
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/6427dfb1/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
index 2112fc8..956b436 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
@@ -34,7 +34,7 @@ public abstract class ObjectAdapterMementoProviderAbstract extends TextChoicePro
 
     private static final long serialVersionUID = 1L;
     
-    private static final String NULL_PLACEHOLDER = "$$_isis_null_$$";
+    protected static final String NULL_PLACEHOLDER = "$$_isis_null_$$";
     private static final String NULL_DISPLAY_TEXT = "";
 
     private final ScalarModel scalarModel;
@@ -50,7 +50,7 @@ public abstract class ObjectAdapterMementoProviderAbstract extends TextChoicePro
 
     @Override
     protected Object getId(ObjectAdapterMemento choice) {
-        return choice != null? choice.toString(): NULL_PLACEHOLDER;
+        return choice != null? choice.asString(): NULL_PLACEHOLDER;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/isis/blob/6427dfb1/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
index b0c7079..c2a382d 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
@@ -18,13 +18,12 @@ package org.apache.isis.viewer.wicket.ui.components.widgets.valuechoices;
 
 import java.util.Collection;
 import java.util.List;
-
+import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Lists;
 import com.vaynberg.wicket.select2.ChoiceProvider;
 import com.vaynberg.wicket.select2.Select2Choice;
-
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
 import org.apache.wicket.behavior.Behavior;
@@ -32,7 +31,6 @@ import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.FormComponentLabel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
-
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
 import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
@@ -135,31 +133,52 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
 
     
     protected ChoiceProvider<ObjectAdapterMemento> newChoiceProvider(final List<ObjectAdapterMemento> choicesMementos) {
-        ChoiceProvider<ObjectAdapterMemento> provider = new ObjectAdapterMementoProviderAbstract(getScalarModel()) {
+        return new FixedObjectAdapterMementoProvider(getScalarModel(), choicesMementos);
+    }
+
+
+    static class FixedObjectAdapterMementoProvider extends ObjectAdapterMementoProviderAbstract {
 
-            private static final long serialVersionUID = 1L;
+        private static final long serialVersionUID = 1L;
+        private final List<ObjectAdapterMemento> choicesMementos;
 
-            @Override
-            public Collection<ObjectAdapterMemento> toChoices(final Collection<String> ids) {
-                final List<ObjectAdapterMemento> mementos = obtainMementos(null);
-                final Predicate<ObjectAdapterMemento> predicate = new Predicate<ObjectAdapterMemento>() {
+        public FixedObjectAdapterMementoProvider(
+                final ScalarModel scalarModel,
+                final List<ObjectAdapterMemento> choicesMementos) {
+            super(scalarModel);
+            this.choicesMementos = choicesMementos;
+        }
 
-                    @Override
-                    public boolean apply(ObjectAdapterMemento input) {
-                        final String id = (String) getId(input);
-                        return ids.contains(id);
+        @Override
+        public Collection<ObjectAdapterMemento> toChoices(final Collection<String> ids) {
+            final List<ObjectAdapterMemento> mementos = obtainMementos(null);
+
+            final Predicate<ObjectAdapterMemento> lookupOam = new Predicate<ObjectAdapterMemento>() {
+                @Override
+                public boolean apply(ObjectAdapterMemento input) {
+                    final String id = (String) getId(input);
+                    return ids.contains(id);
+                }
+            };
+
+            final Function<String, ObjectAdapterMemento> toOam = new Function<String, ObjectAdapterMemento>() {
+                @Override
+                public ObjectAdapterMemento apply(String input) {
+                    if (NULL_PLACEHOLDER.equals(input)) {
+                        return null;
                     }
-                };
-                return Collections2.filter(mementos, predicate); 
-            }
+                    final Collection<ObjectAdapterMemento> filteredCollection = Collections2.filter(mementos, lookupOam);
+                    return filteredCollection.iterator().next();
+                }
+            };
+            return Collections2.transform(ids, toOam);
+        }
 
-            @Override
-            protected List<ObjectAdapterMemento> obtainMementos(String term) {
-                return choicesMementos;
-            }
+        @Override
+        protected List<ObjectAdapterMemento> obtainMementos(String term) {
+            return choicesMementos;
+        }
 
-        };
-        return provider;
     }
 
     @Override
@@ -246,4 +265,5 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
     public ScalarModel getScalarModel() {
         return scalarModel;
     }
+
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/6427dfb1/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/FixedObjectAdapterMementoProviderTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/FixedObjectAdapterMementoProviderTest.java b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/FixedObjectAdapterMementoProviderTest.java
new file mode 100644
index 0000000..93f662e
--- /dev/null
+++ b/component/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/FixedObjectAdapterMementoProviderTest.java
@@ -0,0 +1,64 @@
+package org.apache.isis.viewer.wicket.ui.components.widgets.valuechoices;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import com.google.common.collect.Lists;
+import org.jmock.Expectations;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+
+public class FixedObjectAdapterMementoProviderTest {
+
+    @Rule
+    public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
+
+    private List<ObjectAdapterMemento> mementos;
+
+    private ObjectAdapterMemento mockMemento1;
+    private ObjectAdapterMemento mockMemento2;
+    private ValueChoicesSelect2Panel.FixedObjectAdapterMementoProvider provider;
+
+    @Before
+    public void setUp() throws Exception {
+        mockMemento1 = mock("mockMemento1");
+        mockMemento2 = mock("mockMemento2");
+
+        mementos = Lists.newArrayList(
+                mockMemento1, mockMemento2
+        );
+
+        provider = new ValueChoicesSelect2Panel.FixedObjectAdapterMementoProvider(null, mementos);
+    }
+
+    @Test
+    public void whenInList() throws Exception {
+        final Collection<ObjectAdapterMemento> mementos = provider.toChoices(Collections.singletonList("mockMemento1"));
+        Assert.assertThat(mementos.size(), is(1));
+        Assert.assertThat(mementos.iterator().next(), is(mockMemento1));
+    }
+
+    @Test
+    public void whenNullPlaceholder() throws Exception {
+        final Collection<ObjectAdapterMemento> mementos = provider.toChoices(Collections.singletonList("$$_isis_null_$$"));
+        Assert.assertThat(mementos.size(), is(1));
+        Assert.assertThat(mementos.iterator().next(), is(nullValue()));
+    }
+
+    private ObjectAdapterMemento mock(final String id) {
+        final ObjectAdapterMemento mock = context.mock(ObjectAdapterMemento.class, id);
+        context.checking(new Expectations() {{
+            allowing(mock).asString();
+            will(returnValue(id));
+        }});
+        return mock;
+    }
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/6427dfb1/example/application/simple_wicket_restful_jdo/fixture/src/main/java/fixture/simple/SimpleObjectsFixturesService.java
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/fixture/src/main/java/fixture/simple/SimpleObjectsFixturesService.java b/example/application/simple_wicket_restful_jdo/fixture/src/main/java/fixture/simple/SimpleObjectsFixturesService.java
index bdba641..12a9e2b 100644
--- a/example/application/simple_wicket_restful_jdo/fixture/src/main/java/fixture/simple/SimpleObjectsFixturesService.java
+++ b/example/application/simple_wicket_restful_jdo/fixture/src/main/java/fixture/simple/SimpleObjectsFixturesService.java
@@ -18,8 +18,6 @@
  */
 package fixture.simple;
 
-import dom.simple.SimpleObjects;
-
 import java.util.List;
 import org.apache.isis.applib.annotation.DomainService;
 import org.apache.isis.applib.annotation.MemberOrder;
@@ -65,11 +63,5 @@ public class SimpleObjectsFixturesService extends FixtureScripts {
         return run.get(0).getObject();
     }
 
-    // //////////////////////////////////////
-
-    private SimpleObjects simpleObjects;
-    public void injectSimpleObjects(SimpleObjects simpleObjects) {
-        this.simpleObjects = simpleObjects;
-    }
 
 }


[3/3] git commit: ISIS-837: remove guard which prevents flushing of properties that have NotPersistedFacet.class

Posted by da...@apache.org.
ISIS-837: remove guard which prevents flushing of properties that have NotPersistedFacet.class

(eg annotated with javax.jdo.annotations.NotPersistent)


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/877e7edd
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/877e7edd
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/877e7edd

Branch: refs/heads/master
Commit: 877e7eddfa49cad5869d8cf97982c75d9e84196f
Parents: 6427dfb
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Jul 14 20:51:47 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jul 14 20:51:47 2014 +0100

----------------------------------------------------------------------
 .../viewer/wicket/model/models/EntityModel.java   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/877e7edd/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
index 56d7738..2faca9b 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
@@ -36,7 +36,6 @@ import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
 import org.apache.isis.core.metamodel.adapter.oid.RootOid;
 import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
 import org.apache.isis.core.metamodel.consent.Consent;
-import org.apache.isis.core.metamodel.facets.propcoll.notpersisted.NotPersistedFacet;
 import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
 import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecId;
@@ -578,10 +577,19 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> implements UiH
         ObjectAdapter adapter = getObjectAdapterMemento().getObjectAdapter(ConcurrencyChecking.CHECK);
         for (final ScalarModel scalarModel : propertyScalarModels.values()) {
             final OneToOneAssociation property = scalarModel.getPropertyMemento().getProperty();
-            if(property.containsDoOpFacet(NotPersistedFacet.class)) {
-                // ignore derived properties
-                continue;
-            }
+
+            //
+            // previously there was a guard here to only apply changes provided:
+            //
+            // property.containsDoOpFacet(NotPersistedFacet.class) == null
+            //
+            // however, that logic is wrong; although a property may not be directly
+            // persisted so far as JDO is concerned, it may be indirectly persisted
+            // as the result of business logic in the setter.
+            //
+            // for example, see ExampleTaggableEntity (in isisaddons-module-tags).
+            //
+
             final ObjectAdapter associate = scalarModel.getObject();
             property.set(adapter, associate);
         }