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 2012/12/13 01:01:08 UTC
[48/52] [partial] ISIS-188: renaming packages in line with
groupId:artifactId
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationFiltersTest_visibleWhere.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationFiltersTest_visibleWhere.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationFiltersTest_visibleWhere.java
index 6897f29..9abb199 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationFiltersTest_visibleWhere.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationFiltersTest_visibleWhere.java
@@ -26,7 +26,6 @@ import java.util.Collection;
import org.jmock.Expectations;
import org.jmock.Mockery;
-import org.jmock.auto.Mock;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Before;
import org.junit.Rule;
@@ -41,8 +40,9 @@ import org.apache.isis.applib.filter.Filter;
import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
@RunWith(Parameterized.class)
public class ObjectAssociationFiltersTest_visibleWhere {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstractTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstractTest.java
index 65f94ac..c12b60d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorAbstractTest.java
@@ -22,15 +22,15 @@ package org.apache.isis.core.metamodel.services;
import java.util.Arrays;
import org.jmock.Expectations;
-import org.jmock.auto.Mock;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ServicesInjectorAbstractTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
index 734090f..58fd543 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.spec;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.core.testsupport.value.ValueTypeContractTestAbstract;
+import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class ObjectSpecIdTest_valueSemantics extends ValueTypeContractTestAbstract<ObjectSpecId> {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFiltersTests.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFiltersTests.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFiltersTests.java
index 30bffd3..96000ab 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFiltersTests.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/feature/ObjectAssociationFiltersTests.java
@@ -23,7 +23,6 @@ import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
import org.jmock.Expectations;
-import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
@@ -32,8 +31,9 @@ import org.apache.isis.applib.filter.Filter;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.hide.HiddenFacet;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectAssociationFiltersTests {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
index 811d6ed..22d4a0d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
@@ -28,7 +28,6 @@ import java.util.Map;
import com.google.common.collect.Maps;
-import org.jmock.auto.Mock;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -36,8 +35,9 @@ import org.junit.Test;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class SpecificationCacheDefaultTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
index 02cd03c..0cc4e04 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertThat;
import com.google.common.collect.Lists;
import org.jmock.Expectations;
-import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -39,8 +38,9 @@ import org.apache.isis.core.metamodel.facets.named.NamedFacet;
import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectActionParameterAbstractTest_getId_and_getName {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
index bb2e24e..9337d11 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.jmock.Expectations;
-import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -46,8 +45,9 @@ import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectAssociationAbstractTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
index 6a3f5f2..f22aac1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.jmock.Expectations;
-import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -46,8 +45,9 @@ import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectAssociationAbstractTest_alwaysHidden {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelBaseTest_constructDefaults.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelBaseTest_constructDefaults.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelBaseTest_constructDefaults.java
index a499021..d10111b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelBaseTest_constructDefaults.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelBaseTest_constructDefaults.java
@@ -23,15 +23,15 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.junit.Assert.assertThat;
-import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class IsisMetaModelBaseTest_constructDefaults {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_constructWithServices.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_constructWithServices.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_constructWithServices.java
index 141d67d..0c7ff2b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_constructWithServices.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_constructWithServices.java
@@ -24,15 +24,15 @@ import static org.junit.Assert.assertThat;
import java.util.List;
-import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.commons.matchers.IsisMatchers;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class IsisMetaModelTest_constructWithServices {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_getDomainObjectContainer.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_getDomainObjectContainer.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_getDomainObjectContainer.java
index 3a3419d..292467f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_getDomainObjectContainer.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_getDomainObjectContainer.java
@@ -24,16 +24,16 @@ import static org.hamcrest.CoreMatchers.notNullValue;
import static org.junit.Assert.assertThat;
import org.jmock.Expectations;
-import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
-import org.apache.isis.core.testsupport.jmock.IsisActions;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.IsisActions;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class IsisMetaModelTest_getDomainObjectContainer {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_init.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_init.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_init.java
index 0cf67a4..c3ff7ea 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_init.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_init.java
@@ -25,7 +25,6 @@ import com.google.common.collect.Lists;
import org.jmock.Expectations;
import org.jmock.Sequence;
-import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -37,9 +36,10 @@ import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
-import org.apache.isis.core.testsupport.jmock.IsisActions;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.IsisActions;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class IsisMetaModelTest_init {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_shutdown.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_shutdown.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_shutdown.java
index 411e8e1..3902663 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_shutdown.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/app/IsisMetaModelTest_shutdown.java
@@ -25,7 +25,6 @@ import com.google.common.collect.Lists;
import org.jmock.Expectations;
import org.jmock.Sequence;
-import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -37,9 +36,10 @@ import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
-import org.apache.isis.core.testsupport.jmock.IsisActions;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.IsisActions;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class IsisMetaModelTest_shutdown {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryJUnit4TestCase.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryJUnit4TestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryJUnit4TestCase.java
index 30721ba..3885514 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryJUnit4TestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryJUnit4TestCase.java
@@ -22,7 +22,6 @@ package org.apache.isis.core.progmodel.facets;
import java.lang.reflect.Method;
import java.util.List;
-import org.jmock.auto.Mock;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -39,8 +38,9 @@ import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest.Customer;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public abstract class AbstractFacetFactoryJUnit4TestCase {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/ObjectAdapterUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/ObjectAdapterUtilsTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/ObjectAdapterUtilsTest.java
index 81b241d..30cf25c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/ObjectAdapterUtilsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/ObjectAdapterUtilsTest.java
@@ -23,14 +23,14 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import org.jmock.Expectations;
-import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectAdapterUtils;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectAdapterUtilsTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/collections/JavaCollectionFacetTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/collections/JavaCollectionFacetTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/collections/JavaCollectionFacetTest.java
index 6e1dfeb..25a49a4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/collections/JavaCollectionFacetTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/collections/JavaCollectionFacetTest.java
@@ -27,7 +27,6 @@ import java.util.Collection;
import java.util.Iterator;
import org.jmock.Expectations;
-import org.jmock.auto.Mock;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -37,8 +36,9 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.collections.collection.JavaCollectionFacet;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JavaCollectionFacetTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
index 4b4293e..ad080dc 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
@@ -30,7 +30,6 @@ import com.google.common.collect.Lists;
import org.jmock.Expectations;
import org.jmock.Sequence;
-import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
@@ -43,8 +42,9 @@ import org.apache.isis.core.metamodel.methodutils.MethodScope;
import org.apache.isis.core.progmodel.facets.MethodFinderUtils;
import org.apache.isis.core.progmodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation;
import org.apache.isis.core.progmodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation.TitleComponent;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class TitleFacetViaTitleAnnotationTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactoryTest.java
index b2d7a32..96004fc 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/objecttype/ObjectTypeDerivedFromClassNameFacetFactoryTest.java
@@ -25,7 +25,6 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import org.jmock.Expectations;
-import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Test;
@@ -34,6 +33,7 @@ import org.apache.isis.core.metamodel.facets.object.objecttype.ObjectSpecIdFacet
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryJUnit4TestCase;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
public class ObjectTypeDerivedFromClassNameFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetUsingParserTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetUsingParserTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetUsingParserTest.java
index 5c6339a..2fa47c9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetUsingParserTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/object/parseable/ParseableFacetUsingParserTest.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.progmodel.facets.object.parseable;
import java.util.IllegalFormatWidthException;
import org.jmock.Expectations;
-import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
@@ -37,8 +36,9 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ParseableFacetUsingParserTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ImageValueSemanticsProviderAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
index 19e0f63..702e4d0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertEquals;
import java.awt.Image;
-import org.jmock.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -31,8 +30,9 @@ import org.junit.Test;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.progmodel.facets.value.image.ImageValueSemanticsProviderAbstract;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ImageValueSemanticsProviderAbstractTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index 898cd4d..55f0a6e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.progmodel.facets.value;
-import static org.apache.isis.core.testsupport.jmock.ReturnArgumentJMockAction.returnArgument;
+import static org.apache.isis.core.unittestsupport.jmocking.ReturnArgumentJMockAction.returnArgument;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -29,7 +29,6 @@ import static org.junit.Assert.fail;
import java.util.Locale;
import org.jmock.Expectations;
-import org.jmock.auto.Mock;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
@@ -51,8 +50,9 @@ import org.apache.isis.core.progmodel.facets.object.encodeable.EncodableFacetUsi
import org.apache.isis.core.progmodel.facets.object.parseable.ParseableFacetUsingParser;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderAndFacetAbstract;
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public abstract class ValueSemanticsProviderAbstractTestCase {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/metamodel/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTestAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTestAbstract.java
index 4e32a72..ab20e6b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTestAbstract.java
@@ -24,7 +24,6 @@ import java.util.HashSet;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.jmock.Expectations;
-import org.jmock.auto.Mock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
@@ -47,9 +46,10 @@ import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.Collecti
import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverserDefault;
import org.apache.isis.core.progmodel.layout.dflt.MemberLayoutArrangerDefault;
import org.apache.isis.core.progmodel.metamodelvalidator.dflt.MetaModelValidatorDefault;
-import org.apache.isis.core.testsupport.jmock.InjectIntoJMockAction;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2;
-import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmock.auto.Mock;
+import org.apache.isis.core.unittestsupport.jmocking.InjectIntoJMockAction;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public abstract class ObjectReflectorDefaultTestAbstract {
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/objectstore-inmemory/pom.xml
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/pom.xml b/core/objectstore-inmemory/pom.xml
index 0fcca0b..2c1cd2d 100644
--- a/core/objectstore-inmemory/pom.xml
+++ b/core/objectstore-inmemory/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>isis-core-objectstore</artifactId>
- <name>Isis Core In-Memory ObjectStore</name>
+ <name>Isis Core (In-Memory) ObjectStore</name>
<properties>
<siteBaseDir>..</siteBaseDir>
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/InMemoryObjectStore.java
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/InMemoryObjectStore.java b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/InMemoryObjectStore.java
new file mode 100644
index 0000000..9974bba
--- /dev/null
+++ b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/InMemoryObjectStore.java
@@ -0,0 +1,513 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.objectstore;
+
+import java.text.MessageFormat;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+import org.apache.isis.core.commons.debug.DebugBuilder;
+import org.apache.isis.core.commons.debug.DebugUtils;
+import org.apache.isis.core.commons.exceptions.IsisException;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.RootOid;
+import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
+import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationLoader;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.objectstore.commands.InMemoryCreateObjectCommand;
+import org.apache.isis.core.objectstore.commands.InMemoryDestroyObjectCommand;
+import org.apache.isis.core.objectstore.commands.InMemorySaveObjectCommand;
+import org.apache.isis.core.objectstore.internal.ObjectStoreInstances;
+import org.apache.isis.core.objectstore.internal.ObjectStorePersistedObjects;
+import org.apache.isis.core.objectstore.internal.ObjectStorePersistedObjectsDefault;
+import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
+import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
+import org.apache.isis.core.runtime.persistence.UnsupportedFindException;
+import org.apache.isis.core.runtime.persistence.objectstore.ObjectStoreSpi;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObjectCommand;
+import org.apache.isis.core.runtime.persistence.query.PersistenceQueryBuiltIn;
+import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.persistence.AdapterManagerSpi;
+import org.apache.isis.core.runtime.system.persistence.PersistenceQuery;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
+import org.apache.log4j.Logger;
+
+import com.google.common.collect.Lists;
+
+public class InMemoryObjectStore implements ObjectStoreSpi {
+
+ private final static Logger LOG = Logger.getLogger(InMemoryObjectStore.class);
+
+ protected ObjectStorePersistedObjects persistedObjects;
+
+ public InMemoryObjectStore() {
+ LOG.info("creating memory object store");
+ }
+
+ // ///////////////////////////////////////////////////////
+ // Name
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public String name() {
+ return "In-Memory Object Store";
+ }
+
+ // ///////////////////////////////////////////////////////
+ // open, close, shutdown
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public void open() {
+ // TODO: all a bit hacky, but is to keep tests running. Should really
+ // sort out using mocks.
+ final InMemoryPersistenceSessionFactory inMemoryPersistenceSessionFactory = getInMemoryPersistenceSessionFactory();
+ persistedObjects = inMemoryPersistenceSessionFactory == null ? null : inMemoryPersistenceSessionFactory.getPersistedObjects();
+ if (persistedObjects == null) {
+ if (inMemoryPersistenceSessionFactory != null) {
+ persistedObjects = inMemoryPersistenceSessionFactory.createPersistedObjects();
+ } else {
+ persistedObjects = new ObjectStorePersistedObjectsDefault();
+ }
+ } else {
+ recreateAdapters();
+ }
+ }
+
+ protected void recreateAdapters() {
+ for (final ObjectSpecification noSpec : persistedObjects.specifications()) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("recreating adapters for: " + noSpec.getFullIdentifier());
+ }
+ recreateAdapters(persistedObjects.instancesFor(noSpec));
+ }
+ }
+
+ private void recreateAdapters(final ObjectStoreInstances objectStoreInstances) {
+ for (final Oid oid : objectStoreInstances.getOids()) {
+
+ // it's important not to "touch" the pojo, not even in log messages.
+ // That's because
+ // the toString() will cause bytecode enhancement to try to resolve
+ // references.
+
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("recreating adapter: oid=" + oid);
+ }
+ final Object pojo = objectStoreInstances.getPojo(oid);
+
+ final ObjectAdapter existingAdapterLookedUpByPojo = getAdapterManager().getAdapterFor(pojo);
+ if (existingAdapterLookedUpByPojo != null) {
+ // this could happen if we rehydrate a persisted object that
+ // depends on another persisted object
+ // not yet rehydrated.
+ getPersistenceSession().removeAdapter(existingAdapterLookedUpByPojo);
+ }
+
+ final ObjectAdapter existingAdapterLookedUpByOid = getAdapterManager().getAdapterFor(oid);
+ if (existingAdapterLookedUpByOid != null) {
+ throw new IsisException("A mapping already exists for " + oid + ": " + existingAdapterLookedUpByOid);
+ }
+
+ final ObjectAdapter recreatedAdapter = getPersistenceSession().mapRecreatedPojo(oid, pojo);
+
+ final Version version = objectStoreInstances.getVersion(oid);
+ recreatedAdapter.setVersion(version);
+ }
+ }
+
+ @Override
+ public void close() {
+ final InMemoryPersistenceSessionFactory inMemoryPersistenceSessionFactory = getInMemoryPersistenceSessionFactory();
+ // TODO: this is hacky, only here to keep tests running. Should sort out
+ // using mocks
+ if (inMemoryPersistenceSessionFactory != null) {
+ inMemoryPersistenceSessionFactory.attach(getPersistenceSession(), persistedObjects);
+ persistedObjects = null;
+ }
+ }
+
+ // ///////////////////////////////////////////////////////
+ // fixtures
+ // ///////////////////////////////////////////////////////
+
+ /**
+ * No permanent persistence, so must always install fixtures.
+ */
+ @Override
+ public boolean isFixturesInstalled() {
+ return false;
+ }
+
+ // ///////////////////////////////////////////////////////
+ // reset
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public void reset() {
+ }
+
+ // ///////////////////////////////////////////////////////
+ // Transaction management
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public void startTransaction() {
+ }
+
+ @Override
+ public void endTransaction() {
+ }
+
+ @Override
+ public void abortTransaction() {
+ }
+
+ // ///////////////////////////////////////////////////////
+ // Command Creation
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public CreateObjectCommand createCreateObjectCommand(final ObjectAdapter object) {
+ if (object.getSpecification().isParented()) {
+ return null;
+ }
+ return new InMemoryCreateObjectCommand(object, persistedObjects);
+ }
+
+ @Override
+ public SaveObjectCommand createSaveObjectCommand(final ObjectAdapter object) {
+ if (object.getSpecification().isParented()) {
+ return null;
+ }
+ return new InMemorySaveObjectCommand(object, persistedObjects);
+ }
+
+ @Override
+ public DestroyObjectCommand createDestroyObjectCommand(final ObjectAdapter object) {
+ return new InMemoryDestroyObjectCommand(object, persistedObjects);
+ }
+
+ // ///////////////////////////////////////////////////////
+ // Command Execution
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public void execute(final List<PersistenceCommand> commands) throws ObjectPersistenceException {
+ if (LOG.isInfoEnabled()) {
+ LOG.info("execute commands");
+ }
+ for (final PersistenceCommand command : commands) {
+ command.execute(null);
+ }
+ LOG.info("end execution");
+ }
+
+ // ///////////////////////////////////////////////////////
+ // getObject, resolveField, resolveImmediately
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public ObjectAdapter loadInstanceAndAdapt(final TypedOid oid) throws ObjectNotFoundException, ObjectPersistenceException {
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("getObject " + oid);
+ }
+ final ObjectSpecification objectSpec = getSpecificationLookup().lookupBySpecId(oid.getObjectSpecId());
+ final ObjectStoreInstances ins = instancesFor(objectSpec);
+ final ObjectAdapter adapter = ins.getObjectAndMapIfRequired(oid);
+ if (adapter == null) {
+ throw new ObjectNotFoundException(oid);
+ }
+ return adapter;
+ }
+
+ @Override
+ public void resolveImmediately(final ObjectAdapter adapter) throws ObjectPersistenceException {
+
+ // these diagnostics are because, even though this method is called by
+ // PersistenceSessionObjectStore#resolveImmediately which has a check,
+ // seem to be hitting a race condition with another thread that is
+ // resolving the object before I get here.
+ if (adapter.canTransitionToResolving()) {
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("resolve " + adapter);
+ }
+ } else {
+ LOG.warn("resolveImmediately ignored, " + "adapter's current state is: " + adapter.getResolveState() + " ; oid: " + adapter.getOid());
+ }
+
+ adapter.markAsResolvedIfPossible();
+ }
+
+ @Override
+ public void resolveField(final ObjectAdapter object, final ObjectAssociation field) throws ObjectPersistenceException {
+ final ObjectAdapter referenceAdapter = field.get(object);
+ referenceAdapter.markAsResolvedIfPossible();
+ }
+
+
+
+ // ///////////////////////////////////////////////////////
+ // getInstances, hasInstances
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public List<ObjectAdapter> loadInstancesAndAdapt(final PersistenceQuery persistenceQuery) throws ObjectPersistenceException, UnsupportedFindException {
+
+ if (!(persistenceQuery instanceof PersistenceQueryBuiltIn)) {
+ throw new IllegalArgumentException(MessageFormat.format("Provided PersistenceQuery not supported; was {0}; " + "the in-memory object store only supports {1}", persistenceQuery.getClass().getName(), PersistenceQueryBuiltIn.class.getName()));
+ }
+ final PersistenceQueryBuiltIn builtIn = (PersistenceQueryBuiltIn) persistenceQuery;
+
+ final List<ObjectAdapter> instances = Lists.newArrayList();
+ final ObjectSpecification spec = persistenceQuery.getSpecification();
+ findInstances(spec, builtIn, instances);
+ return resolved(instances);
+ }
+
+ @Override
+ public boolean hasInstances(final ObjectSpecification spec) {
+ if (instancesFor(spec).hasInstances()) {
+ return true;
+ }
+
+ // includeSubclasses
+ final List<ObjectSpecification> subclasses = spec.subclasses();
+ for (int i = 0; i < subclasses.size(); i++) {
+ if (hasInstances(subclasses.get(i))) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ private void findInstances(final ObjectSpecification spec, final PersistenceQueryBuiltIn persistenceQuery, final List<ObjectAdapter> foundInstances) {
+
+ instancesFor(spec).findInstancesAndAdd(persistenceQuery, foundInstances);
+
+ // include subclasses
+ final List<ObjectSpecification> subclasses = spec.subclasses();
+ for (int i = 0; i < subclasses.size(); i++) {
+ findInstances(subclasses.get(i), persistenceQuery, foundInstances);
+ }
+ }
+
+ private static List<ObjectAdapter> resolved(final List<ObjectAdapter> instances) {
+ for (ObjectAdapter adapter: instances) {
+ adapter.markAsResolvedIfPossible();
+ }
+ return instances;
+ }
+
+ // ///////////////////////////////////////////////////////
+ // Services
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public RootOid getOidForService(ObjectSpecification serviceSpec) {
+ return (RootOid) persistedObjects.getService(serviceSpec.getSpecId());
+ }
+
+ @Override
+ public void registerService(final RootOid rootOid) {
+ persistedObjects.registerService(rootOid.getObjectSpecId(), rootOid);
+ }
+
+ private ObjectStoreInstances instancesFor(final ObjectSpecification spec) {
+ return persistedObjects.instancesFor(spec);
+ }
+
+ // ///////////////////////////////////////////////////////
+ // Debugging
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public String debugTitle() {
+ return name();
+ }
+
+ @Override
+ public void debugData(final DebugBuilder debug) {
+ debug.appendTitle("Domain Objects");
+ for (final ObjectSpecification spec : persistedObjects.specifications()) {
+ debug.appendln(spec.getFullIdentifier());
+ final ObjectStoreInstances instances = instancesFor(spec);
+ instances.debugData(debug);
+ }
+ debug.unindent();
+ debug.appendln();
+ }
+
+ private String debugCollectionGraph(final ObjectAdapter collection, final int level, final Vector recursiveElements) {
+ final StringBuffer s = new StringBuffer();
+
+ if (recursiveElements.contains(collection)) {
+ s.append("*\n");
+ } else {
+ recursiveElements.addElement(collection);
+
+ final CollectionFacet facet = CollectionFacetUtils.getCollectionFacetFromSpec(collection);
+ final Iterator<ObjectAdapter> e = facet.iterator(collection);
+
+ while (e.hasNext()) {
+ indent(s, level);
+
+ ObjectAdapter element;
+ try {
+ element = e.next();
+ } catch (final ClassCastException ex) {
+ LOG.error(ex);
+ return s.toString();
+ }
+
+ s.append(element);
+ s.append(debugGraph(element, level + 1, recursiveElements));
+ }
+ }
+
+ return s.toString();
+ }
+
+ private String debugGraph(final ObjectAdapter object, final int level, final Vector recursiveElements) {
+ if (level > 3) {
+ return "...\n"; // only go 3 levels?
+ }
+
+ Vector elements;
+ if (recursiveElements == null) {
+ elements = new Vector(25, 10);
+ } else {
+ elements = recursiveElements;
+ }
+
+ if (object.getSpecification().isParentedOrFreeCollection()) {
+ return "\n" + debugCollectionGraph(object, level, elements);
+ } else {
+ return "\n" + debugObjectGraph(object, level, elements);
+ }
+ }
+
+ private String debugObjectGraph(final ObjectAdapter object, final int level, final Vector recursiveElements) {
+ final StringBuffer s = new StringBuffer();
+
+ recursiveElements.addElement(object);
+
+ // work through all its fields
+ final List<ObjectAssociation> fields = object.getSpecification().getAssociations();
+
+ for (int i = 0; i < fields.size(); i++) {
+ final ObjectAssociation field = fields.get(i);
+ final Object obj = field.get(object);
+
+ final String id = field.getId();
+ indent(s, level);
+
+ if (field.isOneToManyAssociation()) {
+ s.append(id + ": \n" + debugCollectionGraph((ObjectAdapter) obj, level + 1, recursiveElements));
+ } else {
+ if (recursiveElements.contains(obj)) {
+ s.append(id + ": " + obj + "*\n");
+ } else {
+ s.append(id + ": " + obj);
+ s.append(debugGraph((ObjectAdapter) obj, level + 1, recursiveElements));
+ }
+ }
+ }
+
+ return s.toString();
+ }
+
+ private void indent(final StringBuffer s, final int level) {
+ for (int indent = 0; indent < level; indent++) {
+ s.append(DebugUtils.indentString(4) + "|");
+ }
+
+ s.append(DebugUtils.indentString(4) + "+--");
+ }
+
+ // ///////////////////////////////////////////////////////
+ // Dependencies (from context)
+ // ///////////////////////////////////////////////////////
+
+ /**
+ * Must use {@link IsisContext context}, because although this object is
+ * recreated with each {@link PersistenceSession session}, the persisted
+ * objects that get
+ * {@link #attachPersistedObjects(ObjectStorePersistedObjects) attached} to
+ * it span multiple sessions.
+ *
+ * <p>
+ * The alternative design would be to laboriously inject the session into
+ * not only this object but also the {@link ObjectStoreInstances} that do
+ * the work.
+ */
+ protected PersistenceSession getPersistenceSession() {
+ return IsisContext.getPersistenceSession();
+ }
+
+ /**
+ * Must use {@link IsisContext context}, because although this object is
+ * recreated with each {@link PersistenceSession session}, the persisted
+ * objects that get
+ * {@link #attachPersistedObjects(ObjectStorePersistedObjects) attached} to
+ * it span multiple sessions.
+ *
+ * <p>
+ * The alternative design would be to laboriously inject the session into
+ * not only this object but also the {@link ObjectStoreInstances} that do
+ * the work.
+ */
+ protected AdapterManager getAdapterManager() {
+ return getPersistenceSession().getAdapterManager();
+ }
+
+ protected SpecificationLoader getSpecificationLookup() {
+ return IsisContext.getSpecificationLoader();
+ }
+
+
+ /**
+ * Downcasts the {@link PersistenceSessionFactory} to
+ * {@link InMemoryPersistenceSessionFactory}.
+ */
+ protected InMemoryPersistenceSessionFactory getInMemoryPersistenceSessionFactory() {
+ final PersistenceSessionFactory persistenceSessionFactory = getPersistenceSession().getPersistenceSessionFactory();
+
+ if (!(persistenceSessionFactory instanceof InMemoryPersistenceSessionFactory)) {
+ // for testing support
+ return null;
+ }
+ return (InMemoryPersistenceSessionFactory) persistenceSessionFactory;
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/InMemoryPersistenceMechanismInstaller.java
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/InMemoryPersistenceMechanismInstaller.java b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/InMemoryPersistenceMechanismInstaller.java
new file mode 100644
index 0000000..a0777ce
--- /dev/null
+++ b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/InMemoryPersistenceMechanismInstaller.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.objectstore;
+
+import java.lang.reflect.Modifier;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapterFactory;
+import org.apache.isis.core.metamodel.spec.ObjectInstantiationException;
+import org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstallerAbstract;
+import org.apache.isis.core.runtime.persistence.objectfactory.ObjectFactoryAbstract;
+import org.apache.isis.core.runtime.persistence.objectfactory.ObjectFactoryAbstract.Mode;
+import org.apache.isis.core.runtime.persistence.objectstore.ObjectStoreSpi;
+import org.apache.isis.core.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.persistence.AdapterManagerSpi;
+import org.apache.isis.core.runtime.system.persistence.ObjectFactory;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
+
+/**
+ * Installs the in-memory object store.
+ */
+public class InMemoryPersistenceMechanismInstaller extends PersistenceMechanismInstallerAbstract {
+
+ public static final String NAME = "in-memory";
+
+ public InMemoryPersistenceMechanismInstaller() {
+ super(NAME);
+ }
+
+ // ///////////////////////////////////////////////////////////////
+ // createPersistenceSessionFactory
+ // ///////////////////////////////////////////////////////////////
+
+ @Override
+ public PersistenceSessionFactory createPersistenceSessionFactory(final DeploymentType deploymentType) {
+ return new InMemoryPersistenceSessionFactory(deploymentType, getConfiguration(), this);
+ }
+
+ // ///////////////////////////////////////////////////////////////
+ // Hook methods
+ // ///////////////////////////////////////////////////////////////
+
+ /**
+ * Hook method to return {@link ObjectStoreSpi}.
+ */
+ @Override
+ protected ObjectStoreSpi createObjectStore(final IsisConfiguration configuration, final ObjectAdapterFactory adapterFactory, final AdapterManagerSpi adapterManager) {
+ return new InMemoryObjectStore();
+ }
+
+
+ @Override
+ public ObjectFactory createObjectFactory(IsisConfiguration configuration) {
+ return new ObjectFactoryBasic();
+ }
+}
+
+
+class ObjectFactoryBasic extends ObjectFactoryAbstract {
+
+ public ObjectFactoryBasic() {
+ }
+
+ public ObjectFactoryBasic(final Mode mode) {
+ super(mode);
+ }
+
+ /**
+ * Simply instantiates reflectively, does not enhance bytecode etc in any
+ * way.
+ */
+ @Override
+ protected <T> T doInstantiate(final Class<T> cls) throws ObjectInstantiationException {
+ if (Modifier.isAbstract(cls.getModifiers())) {
+ throw new ObjectInstantiationException("Cannot create an instance of an abstract class: " + cls);
+ }
+ try {
+ return cls.newInstance();
+ } catch (final IllegalAccessException e) {
+ throw new ObjectInstantiationException(e);
+ } catch (final InstantiationException e) {
+ throw new ObjectInstantiationException(e);
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/InMemoryPersistenceSessionFactory.java
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/InMemoryPersistenceSessionFactory.java b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/InMemoryPersistenceSessionFactory.java
new file mode 100644
index 0000000..b1a38b6
--- /dev/null
+++ b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/InMemoryPersistenceSessionFactory.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.objectstore;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.objectstore.internal.ObjectStoreInstances;
+import org.apache.isis.core.objectstore.internal.ObjectStorePersistedObjects;
+import org.apache.isis.core.objectstore.internal.ObjectStorePersistedObjectsDefault;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegate;
+import org.apache.isis.core.runtime.persistence.PersistenceSessionFactoryDelegating;
+import org.apache.isis.core.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.persistence.IdentifierGenerator;
+import org.apache.isis.core.runtime.system.persistence.IdentifierGeneratorDefault;
+import org.apache.isis.core.runtime.system.persistence.OidGenerator;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+
+public class InMemoryPersistenceSessionFactory extends PersistenceSessionFactoryDelegating {
+
+ private ObjectStorePersistedObjects persistedObjects;
+
+ public InMemoryPersistenceSessionFactory(final DeploymentType deploymentType, final IsisConfiguration configuration, final PersistenceSessionFactoryDelegate persistenceSessionFactoryDelegate) {
+ super(deploymentType, configuration, persistenceSessionFactoryDelegate);
+ }
+
+ ObjectStorePersistedObjects getPersistedObjects() {
+ return persistedObjects;
+ }
+
+ @Override
+ public PersistenceSession createPersistenceSession() {
+ final PersistenceSession persistenceSession = super.createPersistenceSession();
+ if (persistedObjects != null) {
+ final OidGenerator oidGenerator = persistenceSession.getOidGenerator();
+ final IdentifierGenerator identifierGenerator = oidGenerator.getIdentifierGenerator();
+ if (identifierGenerator instanceof IdentifierGeneratorDefault) {
+ final IdentifierGeneratorDefault identifierGeneratorDefault = (IdentifierGeneratorDefault) identifierGenerator;
+ identifierGeneratorDefault.resetTo(persistedObjects.getOidGeneratorMemento());
+ }
+ }
+
+ return persistenceSession;
+ }
+
+ /**
+ * Not API - called when {@link InMemoryObjectStore} first
+ * {@link InMemoryObjectStore#open() open}ed.
+ */
+ public ObjectStorePersistedObjects createPersistedObjects() {
+ return new ObjectStorePersistedObjectsDefault();
+ }
+
+ /**
+ * Not API - called when {@link InMemoryObjectStore} is
+ * {@link InMemoryObjectStore#close() close}d.
+ */
+ public void attach(final PersistenceSession persistenceSession, final ObjectStorePersistedObjects persistedObjects) {
+ final OidGenerator oidGenerator = persistenceSession.getOidGenerator();
+ final IdentifierGenerator identifierGenerator = oidGenerator.getIdentifierGenerator();
+ if (identifierGenerator instanceof IdentifierGeneratorDefault) {
+ final IdentifierGeneratorDefault identifierGeneratorDefault = (IdentifierGeneratorDefault) identifierGenerator;
+ persistedObjects.saveOidGeneratorMemento(identifierGeneratorDefault.getMemento());
+ }
+ this.persistedObjects = persistedObjects;
+ }
+
+ @Override
+ protected void doShutdown() {
+ if (persistedObjects != null) {
+ for (final ObjectStoreInstances inst : persistedObjects.instances()) {
+ inst.shutdown();
+ }
+ persistedObjects.clear();
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/AbstractInMemoryPersistenceCommand.java
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/AbstractInMemoryPersistenceCommand.java b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/AbstractInMemoryPersistenceCommand.java
new file mode 100644
index 0000000..8003032
--- /dev/null
+++ b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/AbstractInMemoryPersistenceCommand.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.objectstore.commands;
+
+import org.apache.log4j.Logger;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.objectstore.internal.ObjectStoreInstances;
+import org.apache.isis.core.objectstore.internal.ObjectStorePersistedObjects;
+import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandAbstract;
+
+public abstract class AbstractInMemoryPersistenceCommand extends PersistenceCommandAbstract {
+
+ private final static Logger LOG = Logger.getLogger(AbstractInMemoryPersistenceCommand.class);
+
+ private final ObjectStorePersistedObjects persistedObjects;
+
+ public AbstractInMemoryPersistenceCommand(final ObjectAdapter adapter, final ObjectStorePersistedObjects persistedObjects) {
+ super(adapter);
+ this.persistedObjects = persistedObjects;
+ }
+
+ protected void save(final ObjectAdapter adapter) throws ObjectPersistenceException {
+ final ObjectSpecification specification = adapter.getSpecification();
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(" saving object " + adapter + " as instance of " + specification.getShortIdentifier());
+ }
+ final ObjectStoreInstances ins = instancesFor(specification);
+ ins.save(adapter); // also sets the version
+ }
+
+ protected void destroy(final ObjectAdapter adapter) {
+ final ObjectSpecification specification = adapter.getSpecification();
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(" destroy object " + adapter + " as instance of " + specification.getShortIdentifier());
+ }
+ final ObjectStoreInstances ins = instancesFor(specification);
+ ins.remove(adapter.getOid());
+ }
+
+ private ObjectStoreInstances instancesFor(final ObjectSpecification spec) {
+ return persistedObjects.instancesFor(spec);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemoryCreateObjectCommand.java
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemoryCreateObjectCommand.java b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemoryCreateObjectCommand.java
new file mode 100644
index 0000000..ce03d36
--- /dev/null
+++ b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemoryCreateObjectCommand.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.objectstore.commands;
+
+import org.apache.log4j.Logger;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.objectstore.internal.ObjectStorePersistedObjects;
+import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
+
+public final class InMemoryCreateObjectCommand extends AbstractInMemoryPersistenceCommand implements CreateObjectCommand {
+ private final static Logger LOG = Logger.getLogger(InMemoryCreateObjectCommand.class);
+
+ public InMemoryCreateObjectCommand(final ObjectAdapter object, final ObjectStorePersistedObjects persistedObjects) {
+ super(object, persistedObjects);
+ }
+
+ @Override
+ public void execute(final PersistenceCommandContext context) throws ObjectPersistenceException {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(" create object " + onAdapter());
+ }
+ save(onAdapter());
+ }
+
+ @Override
+ public String toString() {
+ return "CreateObjectCommand [object=" + onAdapter() + "]";
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemoryDestroyObjectCommand.java
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemoryDestroyObjectCommand.java b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemoryDestroyObjectCommand.java
new file mode 100644
index 0000000..75e8d3c
--- /dev/null
+++ b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemoryDestroyObjectCommand.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.objectstore.commands;
+
+import org.apache.log4j.Logger;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.objectstore.internal.ObjectStorePersistedObjects;
+import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
+
+public final class InMemoryDestroyObjectCommand extends AbstractInMemoryPersistenceCommand implements DestroyObjectCommand {
+ private final static Logger LOG = Logger.getLogger(InMemoryDestroyObjectCommand.class);
+
+ public InMemoryDestroyObjectCommand(final ObjectAdapter adapter, final ObjectStorePersistedObjects persistedObjects) {
+ super(adapter, persistedObjects);
+ }
+
+ @Override
+ public void execute(final PersistenceCommandContext context) throws ObjectPersistenceException {
+ if (LOG.isInfoEnabled()) {
+ LOG.info(" delete object '" + onAdapter() + "'");
+ }
+ destroy(onAdapter());
+ }
+
+ @Override
+ public String toString() {
+ return "DestroyObjectCommand [object=" + onAdapter() + "]";
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/951a0fe4/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemorySaveObjectCommand.java
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemorySaveObjectCommand.java b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemorySaveObjectCommand.java
new file mode 100644
index 0000000..aee520b
--- /dev/null
+++ b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemorySaveObjectCommand.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.objectstore.commands;
+
+import org.apache.log4j.Logger;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.objectstore.internal.ObjectStorePersistedObjects;
+import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObjectCommand;
+
+public final class InMemorySaveObjectCommand extends AbstractInMemoryPersistenceCommand implements SaveObjectCommand {
+
+ @SuppressWarnings("unused")
+ private final static Logger LOG = Logger.getLogger(InMemorySaveObjectCommand.class);
+
+ public InMemorySaveObjectCommand(final ObjectAdapter object, final ObjectStorePersistedObjects persistedObjects) {
+ super(object, persistedObjects);
+ }
+
+ @Override
+ public void execute(final PersistenceCommandContext context) throws ObjectPersistenceException {
+ save(onAdapter());
+ }
+
+ @Override
+ public String toString() {
+ return "SaveObjectCommand [object=" + onAdapter() + "]";
+ }
+}
\ No newline at end of file