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 2015/03/20 15:46:09 UTC
[1/2] isis git commit: ISIS-1101: entity component factories should
load entity without concurrency checking.
Repository: isis
Updated Branches:
refs/heads/master 1695572d5 -> 1f8d1356e
ISIS-1101: entity component factories should load entity without concurrency checking.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/97fdae6f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/97fdae6f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/97fdae6f
Branch: refs/heads/master
Commit: 97fdae6fae91409b95ddb395e0a09f5d48e89f8a
Parents: 1695572
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Mar 20 14:29:13 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Mar 20 14:29:13 2015 +0000
----------------------------------------------------------------------
.../ui/components/entity/EntityComponentFactoryAbstract.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/97fdae6f/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
index 717caf3..a35d59b 100644
--- a/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
+++ b/core/viewer-wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/EntityComponentFactoryAbstract.java
@@ -23,6 +23,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
@@ -52,7 +53,12 @@ public abstract class EntityComponentFactoryAbstract extends ComponentFactoryAbs
return ApplicationAdvice.DOES_NOT_APPLY;
}
final EntityModel entityModel = (EntityModel) model;
- final ObjectAdapter adapter = entityModel.getObject();
+ // hit a scenario on a redirect-and-post strategy where the component is rendered not on an
+ // EntityPage but instead using a custom home page. The hacky override in entity page (in EntityPage#onBeforeRender)
+ // is therefore not called. resulting in a concurrency exception.
+ //
+ // Therefore, we do the same processing here instead.
+ final ObjectAdapter adapter = entityModel.load(AdapterManager.ConcurrencyChecking.NO_CHECK);
if (adapter == null) {
// is ok;
}
[2/2] isis git commit: ISIS-1052: trivial enhancements to integration
testing
Posted by da...@apache.org.
ISIS-1052: trivial enhancements to integration testing
* fixture script expose overloaded versions of wrap(...) method
* IntegrationTestAbstract expose the FixtureClock
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1f8d1356
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1f8d1356
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1f8d1356
Branch: refs/heads/master
Commit: 1f8d1356ef05c91f2dbce43263d7e934c7b40d2c
Parents: 97fdae6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Mar 20 14:30:50 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Mar 20 14:30:50 2015 +0000
----------------------------------------------------------------------
.../org/apache/isis/applib/fixturescripts/FixtureScript.java | 4 ++++
.../isis/core/integtestsupport/IntegrationTestAbstract.java | 6 ++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1f8d1356/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
index 90ec780..99a3d1b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
@@ -832,6 +832,10 @@ public abstract class FixtureScript
return wrapperFactory.wrap(domainObject);
}
+ protected <T> T wrap(final T domainObject, final WrapperFactory.ExecutionMode executionMode) {
+ return wrapperFactory.wrap(domainObject, executionMode);
+ }
+
/**
* Unwraps domain object (no-arg if already wrapped).
*/
http://git-wip-us.apache.org/repos/asf/isis/blob/1f8d1356/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java
index 5bdfc68..4d7b9a0 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java
@@ -28,6 +28,7 @@ import org.junit.runners.model.Statement;
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.RecoverableException;
+import org.apache.isis.applib.fixtures.FixtureClock;
import org.apache.isis.applib.fixturescripts.FixtureScript;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.core.specsupport.scenarios.ScenarioExecution;
@@ -107,6 +108,11 @@ public abstract class IntegrationTestAbstract {
scenarioExecution().beginTran();
}
+ protected FixtureClock getFixtureClock() {
+ return ((FixtureClock)FixtureClock.getInstance());
+ }
+
+
// //////////////////////////////////////