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/09/11 00:08:38 UTC
[14/50] isis git commit: ISIS-1194: moving
ObjectSpecificationDefault#initialize to PersistenceSession
ISIS-1194: moving ObjectSpecificationDefault#initialize to PersistenceSession
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/604acc35
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/604acc35
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/604acc35
Branch: refs/heads/master
Commit: 604acc3577c1d9c22d06882493df1a0ebd57bd9d
Parents: 2887446
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 10 14:40:22 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 10 14:42:31 2015 +0100
----------------------------------------------------------------------
.../metamodel/spec/ObjectSpecification.java | 10 ------
.../specimpl/ObjectSpecificationAbstract.java | 8 -----
.../dflt/ObjectSpecificationDefault.java | 33 +++-----------------
.../system/persistence/PersistenceSession.java | 22 +++++++++++--
4 files changed, 24 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/604acc35/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
index e59ae4f..0aa950e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
@@ -331,16 +331,6 @@ public interface ObjectSpecification extends Specification, ObjectActionContaine
*/
boolean isHidden();
- // //////////////////////////////////////////////////////////////
- // Creation
- // //////////////////////////////////////////////////////////////
-
-
- /**
- * REVIEW: should this behaviour move, eg onto ObjectAdapter?
- */
- ObjectAdapter initialize(ObjectAdapter object);
-
// //////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/604acc35/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index c980252..9422e67 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -1143,14 +1143,6 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
return isValue() || isParented();
}
- // //////////////////////////////////////////////////////////////////////
- // misc
- // //////////////////////////////////////////////////////////////////////
-
- @Override
- public ObjectAdapter initialize(ObjectAdapter objectAdapter) {
- return objectAdapter;
- }
// //////////////////////////////////////////////////////////////////////
// toString
http://git-wip-us.apache.org/repos/asf/isis/blob/604acc35/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index effa99a..3e87171 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -19,22 +19,22 @@
package org.apache.isis.core.metamodel.specloader.specimpl.dflt;
-import java.lang.reflect.Array;
import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
+
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.filter.Filters;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
-import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -46,8 +46,6 @@ import org.apache.isis.core.metamodel.facets.all.i18n.NamedFacetTranslated;
import org.apache.isis.core.metamodel.facets.all.i18n.PluralFacetTranslated;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred;
-import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackFacet;
-import org.apache.isis.core.metamodel.facets.object.callbacks.CreatedCallbackFacet;
import org.apache.isis.core.metamodel.facets.object.icon.IconFacet;
import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
import org.apache.isis.core.metamodel.facets.object.plural.inferred.PluralFacetInferred;
@@ -57,10 +55,9 @@ import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.facets.object.wizard.WizardFacet;
import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ActionType;
-import org.apache.isis.core.metamodel.spec.ObjectInstantiationException;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
import org.apache.isis.core.metamodel.spec.ObjectSpecificationDependencies;
+import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
@@ -406,28 +403,6 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
return null;
}
- // //////////////////////////////////////////////////////////////////////
- // createObject
- // //////////////////////////////////////////////////////////////////////
-
-
- /**
- * REVIEW: does this behaviour live best here? Not that sure that it does...
- */
- @Override
- public ObjectAdapter initialize(final ObjectAdapter adapter) {
-
- // initialize new object
- final List<ObjectAssociation> fields = adapter.getSpecification().getAssociations(Contributed.EXCLUDED);
- for (ObjectAssociation field : fields) {
- field.toDefault(adapter);
- }
- getDependencyInjector().injectServicesInto(adapter.getObject());
-
- CallbackFacet.Util.callCallback(adapter, CreatedCallbackFacet.class);
-
- return adapter;
- }
// //////////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/604acc35/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 aa18041..a942e54 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
@@ -53,6 +53,8 @@ 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.ParentedCollectionOid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
+import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackFacet;
+import org.apache.isis.core.metamodel.facets.object.callbacks.CreatedCallbackFacet;
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;
@@ -62,6 +64,8 @@ import org.apache.isis.core.metamodel.spec.ObjectInstantiationException;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
+import org.apache.isis.core.metamodel.spec.feature.Contributed;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.runtime.persistence.FixturesInstalledFlag;
import org.apache.isis.core.runtime.persistence.NotPersistableException;
import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
@@ -388,7 +392,7 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
}
final Object pojo = createObject(objectSpec);
final ObjectAdapter adapter = adapterManager.adapterFor(pojo);
- return objectSpec.initialize(adapter);
+ return initialize(adapter);
}
@@ -401,7 +405,7 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
final ViewModelFacet facet = objectSpec.getFacet(ViewModelFacet.class);
facet.initialize(pojo, memento);
final ObjectAdapter adapter = adapterManager.adapterFor(pojo);
- return objectSpec.initialize(adapter);
+ return initialize(adapter);
}
@@ -435,6 +439,20 @@ public class PersistenceSession implements TransactionalResource, SessionScopedC
}
}
+ public ObjectAdapter initialize(final ObjectAdapter adapter) {
+
+ // initialize new object
+ final List<ObjectAssociation> fields = adapter.getSpecification().getAssociations(Contributed.EXCLUDED);
+ for (ObjectAssociation field : fields) {
+ field.toDefault(adapter);
+ }
+ servicesInjector.injectServicesInto(adapter.getObject());
+
+ CallbackFacet.Util.callCallback(adapter, CreatedCallbackFacet.class);
+
+ return adapter;
+ }
+
//endregion