[23/50] [abbrv] isis git commit: ISIS-970: unit tests for @DomainObject, @ViewModel; also @DomainObjectLayout and @ViewModelLayout

[da...@apache.org]

http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IdentifierGeneratorForDataNucleus.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IdentifierGeneratorForDataNucleus.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IdentifierGeneratorForDataNucleus.java
index 8ec253a..80f2514 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IdentifierGeneratorForDataNucleus.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/IdentifierGeneratorForDataNucleus.java
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
 import org.apache.isis.core.commons.debug.DebugBuilder;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.core.metamodel.facets.object.recreatable.RecreatableObjectFacet;
+import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecId;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationLoader;
@@ -55,7 +55,7 @@ class IdentifierGeneratorForDataNucleus implements IdentifierGenerator {
     public String createTransientIdentifierFor(ObjectSpecId objectSpecId, Object pojo) {
 
         final ObjectSpecification spec = getSpecificationLoader().lookupBySpecId(objectSpecId);
-        final RecreatableObjectFacet recreatableObjectFacet = spec.getFacet(RecreatableObjectFacet.class);
+        final ViewModelFacet recreatableObjectFacet = spec.getFacet(ViewModelFacet.class);
         if(recreatableObjectFacet != null) {
             return recreatableObjectFacet.memento(pojo);
         }
@@ -79,8 +79,8 @@ class IdentifierGeneratorForDataNucleus implements IdentifierGenerator {
         }
         
         final ObjectSpecification spec = getSpecificationLookup().lookupBySpecId(objectSpecId);
-        if(spec.containsFacet(RecreatableObjectFacet.class)) {
-            RecreatableObjectFacet recreatableObjectFacet = spec.getFacet(RecreatableObjectFacet.class);
+        if(spec.containsFacet(ViewModelFacet.class)) {
+            ViewModelFacet recreatableObjectFacet = spec.getFacet(ViewModelFacet.class);
             return recreatableObjectFacet.memento(pojo);
         }
         final Object jdoOid = getJdoPersistenceManager().getObjectId(pojo);

http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/OidGenerator.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/OidGenerator.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/OidGenerator.java
index d7ca1be..c76f004 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/OidGenerator.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/OidGenerator.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.commons.debug.DebuggableWithTitle;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.*;
 import org.apache.isis.core.metamodel.adapter.oid.Oid.State;
-import org.apache.isis.core.metamodel.facets.object.recreatable.RecreatableObjectFacet;
+import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecId;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationLoader;
@@ -59,7 +59,7 @@ public class OidGenerator implements DebuggableWithTitle {
         final ObjectSpecification spec = getSpecificationLookup().loadSpecification(pojo.getClass());
         final ObjectSpecId objectSpecId = spec.getSpecId();
         final String transientIdentifier = identifierGenerator.createTransientIdentifierFor(objectSpecId, pojo);
-        final State state = spec.containsDoOpFacet(RecreatableObjectFacet.class)? State.VIEWMODEL:State.TRANSIENT;
+        final State state = spec.containsDoOpFacet(ViewModelFacet.class)? State.VIEWMODEL:State.TRANSIENT;
         return new RootOidDefault(objectSpecId, transientIdentifier, state);
     }
 
@@ -95,7 +95,7 @@ public class OidGenerator implements DebuggableWithTitle {
         final String persistentIdentifier = identifierGenerator.createPersistentIdentifierFor(objectSpecId, pojo, transientRootOid);
         
         final ObjectSpecification spec = getSpecificationLookup().lookupBySpecId(objectSpecId);
-        final State state = spec != null && spec.containsFacet(RecreatableObjectFacet.class)? State.VIEWMODEL:State.PERSISTENT;
+        final State state = spec != null && spec.containsFacet(ViewModelFacet.class)? State.VIEWMODEL:State.PERSISTENT;
         return new RootOidDefault(objectSpecId, persistentIdentifier, state);
     }
 

http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index 8e7f405..8d4c1cb 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -41,7 +41,7 @@ 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.facets.object.immutable.ImmutableFacetUtils;
-import org.apache.isis.core.metamodel.facets.object.recreatable.RecreatableObjectFacet;
+import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
 import org.apache.isis.core.metamodel.services.ServiceUtil;
 import org.apache.isis.core.metamodel.services.ServicesInjectorSpi;
 import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
@@ -320,7 +320,7 @@ public class PersistenceSession implements SessionScopedComponent, DebuggableWit
             LOG.debug("creating view model instance of " + objectSpec);
         }
         final Object pojo = objectSpec.createObject();
-        RecreatableObjectFacet facet = objectSpec.getFacet(RecreatableObjectFacet.class);
+        ViewModelFacet facet = objectSpec.getFacet(ViewModelFacet.class);
         facet.initialize(pojo, memento);
         final ObjectAdapter adapter = getAdapterManager().adapterFor(pojo);
         return objectSpec.initialize(adapter);

http://git-wip-us.apache.org/repos/asf/isis/blob/ea81a494/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
index 086fe8a..a4856ba 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
@@ -22,7 +22,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
 import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
-import org.apache.isis.core.metamodel.facets.object.recreatable.RecreatableObjectFacet;
+import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecId;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
@@ -72,7 +72,7 @@ public final class OidUtils {
         // TODO: the logic to figure out which PersistenceSession API to call should be pushed down into PersistenceSession itself.
         final PersistenceSession persistenceSession = rendererContext.getPersistenceSession();
 
-        if(spec.containsFacet(RecreatableObjectFacet.class)) {
+        if(spec.containsFacet(ViewModelFacet.class)) {
 
             // this is a hack; the RO viewer when rendering the URL for the view model loses the "view model" indicator
             // ("*") from the specId, meaning that the marshalling logic above in RootOidDefault.deString() creates an