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 2016/06/14 06:23:23 UTC
[2/5] isis git commit: ISIS-1427: renamed IsisSystem to
IsisSessionFactoryBuilder;
bind IsisSessionFactory to http servlet context rather than IsisSystem (also
do this in IsisWicketApplication); make OidMarshaller a singleton;
remove convenience accessor
ISIS-1427: renamed IsisSystem to IsisSessionFactoryBuilder; bind IsisSessionFactory to http servlet context rather than IsisSystem (also do this in IsisWicketApplication); make OidMarshaller a singleton; remove convenience accessors from ServicesInjector; bind DeploymentCategory as a "service" (bean) in ServicesInjector; similarly refactor to remove AuthenticationSessionProvider service; MSG_ constants now listed in MessageRegistry
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b1287594
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b1287594
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b1287594
Branch: refs/heads/ISIS-1427
Commit: b12875947beb6188b624808cdd9e6b83fe628d6d
Parents: b6b1bca
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Jun 13 20:32:15 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jun 13 20:32:15 2016 +0100
----------------------------------------------------------------------
.../integtestsupport/IsisSystemForTest.java | 8 +-
.../isis/tool/mavenplugin/IsisMojoAbstract.java | 8 +-
.../isis/core/metamodel/adapter/oid/Oid.java | 4 +-
.../metamodel/adapter/oid/OidMarshaller.java | 8 +-
.../adapter/oid/ParentedCollectionOid.java | 27 +--
.../core/metamodel/adapter/oid/RootOid.java | 32 ++-
.../adapter/version/ConcurrencyException.java | 5 +-
.../core/metamodel/adapter/version/Version.java | 64 +++--
.../metamodel/facets/FacetFactoryAbstract.java | 6 +-
...llectionIdentifyingFacetFactoryAbstract.java | 14 --
.../action/ActionAnnotationFacetFactory.java | 10 -
...onInvocationFacetForDomainEventAbstract.java | 7 +-
.../autocomplete/AutoCompleteFacetAbstract.java | 3 +-
.../metamodel/services/ServicesInjector.java | 52 +---
.../specimpl/ObjectSpecificationAbstract.java | 3 +-
.../isis/core/runtime/snapshot/XmlSnapshot.java | 18 +-
.../adapter/oid/OidMarshallerTest_marshall.java | 2 +-
.../oid/OidMarshallerTest_roundtripping.java | 18 +-
.../oid/OidMarshallerTest_unmarshal.java | 2 +-
.../isis/core/runtime/memento/Memento.java | 10 +-
.../core/runtime/runner/IsisInjectModule.java | 8 +-
.../PublishingServiceInternalDefault.java | 10 +-
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 11 +-
.../runtime/snapshot/XmlSnapshotBuilder.java | 4 +-
.../isis/core/runtime/system/IsisSystem.java | 238 +------------------
.../core/runtime/system/MessageRegistry.java | 34 +++
.../runtime/system/context/IsisContext.java | 4 +-
.../system/persistence/PersistenceSession.java | 13 +-
.../system/session/IsisSessionFactory.java | 27 +--
.../session/IsisSessionFactoryBuilder.java | 219 +++++++++++++++++
.../system/transaction/IsisTransaction.java | 10 +-
.../transaction/IsisTransactionManager.java | 15 +-
.../IsisComponentProviderUsingInstallers.java | 4 +-
.../core/webapp/IsisWebAppBootstrapper.java | 33 +--
.../isis/core/webapp/WebAppConstants.java | 6 +-
.../AuthenticationSessionStrategyDefault.java | 12 +-
.../domainobjects/DomainObjectLinkTo.java | 4 +-
.../domainobjects/DomainObjectReprRenderer.java | 8 +-
.../restfulobjects/rendering/util/OidUtils.java | 17 +-
.../restfulobjects/server/ResourceContext.java | 19 +-
.../server/resources/JsonParserHelper.java | 7 +-
.../server/resources/ResourceAbstract.java | 2 -
.../restfulobjects/server/util/OidUtils.java | 10 +-
...ontextTest_ensureCompatibleAcceptHeader.java | 2 +-
.../server/ResourceContextTest_getArg.java | 4 +-
.../wicket/viewer/IsisWicketApplication.java | 3 +
.../wicket/ConverterForObjectAdapter.java | 7 +-
.../ConverterForObjectAdapterMemento.java | 7 +-
.../wicket/viewer/IsisWicket_providers.java | 4 +-
.../model/mementos/ObjectAdapterMemento.java | 11 +-
.../viewer/wicket/model/models/ActionModel.java | 15 +-
.../wicket/model/models/BookmarkTreeNode.java | 4 +-
.../viewer/wicket/model/models/EntityModel.java | 6 +-
.../collection/bulk/BulkActionsLinkFactory.java | 2 +-
.../property/PropertyEditFormPanel.java | 5 +-
.../ObjectAdapterMementoProviderAbstract.java | 2 +-
.../widgets/breadcrumbs/BreadcrumbModel.java | 7 +-
.../widgets/breadcrumbs/BreadcrumbPanel.java | 3 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 9 +-
59 files changed, 509 insertions(+), 598 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
index 4aab64a..d76979b 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
@@ -44,7 +44,7 @@ import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.fixtures.FixturesInstallerDelegate;
import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
-import org.apache.isis.core.runtime.system.IsisSystem;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@@ -58,7 +58,7 @@ import org.apache.isis.core.specsupport.scenarios.DomainServiceProvider;
import static org.junit.Assert.fail;
/**
- * Wraps a plain {@link IsisSystem}, and provides a number of features to assist with testing.
+ * Wraps a plain {@link IsisSessionFactoryBuilder}, and provides a number of features to assist with testing.
*/
public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServiceProvider {
@@ -303,12 +303,12 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
configurationOverride
);
- final IsisSystem isisSystem = new IsisSystem(componentProvider, DeploymentCategory.PRODUCTION);
+ final IsisSessionFactoryBuilder isisSessionFactoryBuilder = new IsisSessionFactoryBuilder(componentProvider, DeploymentCategory.PRODUCTION);
// ensures that a FixtureClock is installed as the singleton underpinning the ClockService
FixtureClock.initialize();
- isisSessionFactory = isisSystem.buildSessionFactory();
+ isisSessionFactory = isisSessionFactoryBuilder.buildSessionFactory();
// REVIEW: does no harm, but is this required?
closeSession();
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java
----------------------------------------------------------------------
diff --git a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java
index 4214a4c..3b12ca6 100644
--- a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java
+++ b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoAbstract.java
@@ -33,7 +33,7 @@ import org.apache.maven.project.MavenProject;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
-import org.apache.isis.core.runtime.system.IsisSystem;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.tool.mavenplugin.util.MavenProjects;
@@ -59,11 +59,11 @@ public abstract class IsisMojoAbstract extends AbstractMojo {
final AppManifest manifest = InstanceUtil.createInstance(this.appManifest, AppManifest.class);
- final IsisSystem isisSystem = new IsisSystem(manifest);
+ final IsisSessionFactoryBuilder isisSessionFactoryBuilder = new IsisSessionFactoryBuilder(manifest);
IsisSessionFactory isisSessionFactory = null;
try {
- isisSessionFactory = isisSystem.buildSessionFactory();
- if(!isisSystem.isMetaModelValid()) {
+ isisSessionFactory = isisSessionFactoryBuilder.buildSessionFactory();
+ if(!isisSessionFactoryBuilder.isMetaModelValid()) {
MetaModelInvalidException metaModelInvalidException = IsisContext
.getMetaModelInvalidExceptionIfAny();
Set<String> validationErrors = metaModelInvalidException.getValidationErrors();
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
index 5d70c19..7d23946 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid.java
@@ -41,9 +41,9 @@ public interface Oid extends Encodable {
/**
* A string representation of this {@link Oid}.
*/
- String enString(OidMarshaller oidMarshaller);
+ String enString();
- String enStringNoVersion(OidMarshaller oidMarshaller);
+ String enStringNoVersion();
Version getVersion();
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshaller.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshaller.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshaller.java
index a70f43e..749e467 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshaller.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshaller.java
@@ -81,7 +81,11 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
* <p>
* Note that # and ; were not chosen as separators to minimize noise when URL encoding OIDs.
*/
-public class OidMarshaller {
+public final class OidMarshaller {
+
+ public final static OidMarshaller INSTANCE = new OidMarshaller();
+
+ private OidMarshaller(){}
//region > public constants
public static final String VIEWMODEL_INDICATOR =
@@ -258,7 +262,7 @@ public class OidMarshaller {
@Programmatic
public String marshalNoVersion(ParentedCollectionOid collectionOid) {
- return collectionOid.getRootOid().enStringNoVersion(this) + SEPARATOR_COLLECTION + collectionOid.getName();
+ return collectionOid.getRootOid().enStringNoVersion() + SEPARATOR_COLLECTION + collectionOid.getName();
}
@Programmatic
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedCollectionOid.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedCollectionOid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedCollectionOid.java
index 0745555..765b034 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedCollectionOid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedCollectionOid.java
@@ -37,6 +37,8 @@ public final class ParentedCollectionOid implements Serializable, Oid {
private static final long serialVersionUID = 1L;
+ private final static OidMarshaller OID_MARSHALLER = OidMarshaller.INSTANCE;
+
private final String name;
private int cachedHashCode;
@@ -92,19 +94,19 @@ public final class ParentedCollectionOid implements Serializable, Oid {
// enstring
// /////////////////////////////////////////////////////////
- public static ParentedCollectionOid deString(String oidStr, OidMarshaller oidMarshaller) {
- return oidMarshaller.unmarshal(oidStr, ParentedCollectionOid.class);
+ public static ParentedCollectionOid deString(String oidStr) {
+ return OID_MARSHALLER.unmarshal(oidStr, ParentedCollectionOid.class);
}
@Override
- public String enString(OidMarshaller oidMarshaller) {
- return oidMarshaller.marshal(this);
+ public String enString() {
+ return OID_MARSHALLER.marshal(this);
}
@Override
- public String enStringNoVersion(OidMarshaller oidMarshaller) {
- return oidMarshaller.marshalNoVersion(this);
+ public String enStringNoVersion() {
+ return OID_MARSHALLER.marshalNoVersion(this);
}
@@ -114,7 +116,7 @@ public final class ParentedCollectionOid implements Serializable, Oid {
public ParentedCollectionOid(DataInputExtended inputStream) throws IOException {
- this(ParentedCollectionOid.deString(inputStream.readUTF(), getEncodingMarshaller()));
+ this(ParentedCollectionOid.deString(inputStream.readUTF()));
}
private ParentedCollectionOid(ParentedCollectionOid oid) throws IOException {
@@ -125,14 +127,7 @@ public final class ParentedCollectionOid implements Serializable, Oid {
@Override
public void encode(DataOutputExtended outputStream) throws IOException {
- outputStream.writeUTF(enString(getEncodingMarshaller()));
- }
-
- /**
- * Cannot be a reference because Oid gets serialized by wicket viewer
- */
- private static OidMarshaller getEncodingMarshaller() {
- return new OidMarshaller();
+ outputStream.writeUTF(enString());
}
// /////////////////////////////////////////////////////////
@@ -150,7 +145,7 @@ public final class ParentedCollectionOid implements Serializable, Oid {
@Override
public String toString() {
- return enString(new OidMarshaller());
+ return enString();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java
index 27b0973..14e8100 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOid.java
@@ -43,10 +43,13 @@ public class RootOid implements TypedOid, Serializable {
private static final long serialVersionUID = 1L;
+ private final static OidMarshaller OID_MARSHALLER = OidMarshaller.INSTANCE;
+
private final ObjectSpecId objectSpecId;
private final String identifier;
private final State state;
+
// not part of equality check
private Version version;
@@ -139,7 +142,7 @@ public class RootOid implements TypedOid, Serializable {
//region > Encodeable
public RootOid(final DataInputExtended input) throws IOException {
final String oidStr = input.readUTF();
- final RootOid oid = getEncodingMarshaller().unmarshal(oidStr, RootOid.class);
+ final RootOid oid = OID_MARSHALLER.unmarshal(oidStr, RootOid.class);
this.objectSpecId = oid.objectSpecId;
this.identifier = oid.identifier;
this.state = oid.state;
@@ -149,37 +152,30 @@ public class RootOid implements TypedOid, Serializable {
@Override
public void encode(final DataOutputExtended output) throws IOException {
- output.writeUTF(enString(getEncodingMarshaller()));
+ output.writeUTF(enString());
}
- /**
- * Cannot be a reference because Oid gets serialized by wicket viewer
- */
- private OidMarshaller getEncodingMarshaller() {
- return new OidMarshaller();
- }
-
//endregion
//region > deString'able, enString
- public static RootOid deStringEncoded(final String urlEncodedOidStr, final OidMarshaller oidMarshaller) {
+ public static RootOid deStringEncoded(final String urlEncodedOidStr) {
final String oidStr = UrlEncodingUtils.urlDecode(urlEncodedOidStr);
- return deString(oidStr, oidMarshaller);
+ return deString(oidStr);
}
- public static RootOid deString(final String oidStr, final OidMarshaller oidMarshaller) {
- return oidMarshaller.unmarshal(oidStr, RootOid.class);
+ public static RootOid deString(final String oidStr) {
+ return OID_MARSHALLER.unmarshal(oidStr, RootOid.class);
}
@Override
- public String enString(final OidMarshaller oidMarshaller) {
- return oidMarshaller.marshal(this);
+ public String enString() {
+ return OID_MARSHALLER.marshal(this);
}
@Override
- public String enStringNoVersion(final OidMarshaller oidMarshaller) {
- return oidMarshaller.marshalNoVersion(this);
+ public String enStringNoVersion() {
+ return OID_MARSHALLER.marshalNoVersion(this);
}
//endregion
@@ -283,7 +279,7 @@ public class RootOid implements TypedOid, Serializable {
//region > toString
@Override
public String toString() {
- return enString(new OidMarshaller());
+ return enString();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/ConcurrencyException.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/ConcurrencyException.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/ConcurrencyException.java
index 2197550..3ad703e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/ConcurrencyException.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/ConcurrencyException.java
@@ -31,7 +31,7 @@ public class ConcurrencyException extends IsisException {
final StringBuilder buf = new StringBuilder();
buf.append(currentUser != null? currentUser + " " : "");
- buf.append(" attempted to update ").append(oid.enStringNoVersion(getOidMarshaller()));
+ buf.append(" attempted to update ").append(oid.enStringNoVersion());
buf.append(", however this object has since been modified");
if(datastoreVersion.getUser() != null) {
buf.append(" by ").append(datastoreVersion.getUser());
@@ -59,8 +59,5 @@ public class ConcurrencyException extends IsisException {
return oid;
}
- private static OidMarshaller getOidMarshaller() {
- return new OidMarshaller();
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java
index 78c0f4d..2eff19a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/version/Version.java
@@ -47,17 +47,11 @@ import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
*/
public class Version implements Serializable, Encodable {
-
private static final long serialVersionUID = 1L;
-
- private final Long sequence;
- private final String user;
- private final Long utcTimestamp;
- // ///////////////////////////////////////////////////////
- // factory methods
- // ///////////////////////////////////////////////////////
+ private final static OidMarshaller OID_MARSHALLER = OidMarshaller.INSTANCE;
+ //region > factory methods
public static Version create(final Long sequence) {
return create(sequence, null, (Long)null);
@@ -81,21 +75,28 @@ public class Version implements Serializable, Encodable {
return new Version(sequence, user, utcTimestamp);
}
+ //endregion
+
+ //region > constructor, fields
+ private final Long sequence;
+ private final String user;
+ private final Long utcTimestamp;
+
private Version(Long sequence, String user, Long utcTimestamp) {
this.sequence = sequence;
this.user = user;
this.utcTimestamp = utcTimestamp;
}
-
- // ///////////////////////////////////////////////////////
- // encodable
- // ///////////////////////////////////////////////////////
+ //endregion
+
+ //region > encodable
public Version(final DataInputExtended input) throws IOException {
this(input.readLong(), input.readUTF(), input.readLong());
}
-
+
+
@Override
public void encode(final DataOutputExtended output) throws IOException {
output.writeLong(sequence);
@@ -103,11 +104,9 @@ public class Version implements Serializable, Encodable {
output.writeLong(utcTimestamp);
}
+ //endregion
- // ///////////////////////////////////////////////////////
- // getters
- // ///////////////////////////////////////////////////////
-
+ //region > getters
/**
* The internal, strictly monotonically increasing, version number.
*
@@ -152,18 +151,17 @@ public class Version implements Serializable, Encodable {
return utcTimestamp != null? new Date(this.utcTimestamp): null;
}
+ //endregion
- // ///////////////////////////////////////////////////////
- // enString
- // ///////////////////////////////////////////////////////
+ //region > enString
- public String enString(OidMarshaller oidMarshaller) {
- return oidMarshaller.marshal(this);
+ public String enString() {
+ return OID_MARSHALLER.marshal(this);
}
- // ///////////////////////////////////////////////////////
- // equals, hashCode
- // ///////////////////////////////////////////////////////
+ //endregion
+
+ //region > equals, hashCode
@Override
public int hashCode() {
@@ -201,13 +199,11 @@ public class Version implements Serializable, Encodable {
public boolean different(Version version) {
return !equals(version);
}
-
-
- //////////////////////////////////////////////////////////////
- // sequence
- //////////////////////////////////////////////////////////////
-
-
+
+ //endregion
+
+ //region > sequence
+
@Override
public String toString() {
return "#" + sequence + " " + getUser() + " " + DateExtensions.asTimestamp(getTime());
@@ -219,5 +215,7 @@ public class Version implements Serializable, Encodable {
public String sequence() {
return Long.toString(sequence, 16);
}
-
+
+ //endregion
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
index 2cc6b00..299086a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/FacetFactoryAbstract.java
@@ -25,13 +25,11 @@ import com.google.common.collect.ImmutableList;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.services.configinternal.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.ServicesInjectorAware;
+import org.apache.isis.core.metamodel.services.configinternal.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
public abstract class FacetFactoryAbstract implements FacetFactory, ServicesInjectorAware {
@@ -86,7 +84,7 @@ public abstract class FacetFactoryAbstract implements FacetFactory, ServicesInje
protected IsisConfiguration getConfiguration() {
final ConfigurationServiceInternal configurationServiceInternal = servicesInjector
.getConfigurationServiceInternal();
- return (IsisConfigurationDefault)configurationServiceInternal;
+ return configurationServiceInternal;
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
index ae8b794..6719694 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/PropertyOrCollectionIdentifyingFacetFactoryAbstract.java
@@ -22,8 +22,6 @@ package org.apache.isis.core.metamodel.facets;
import java.util.List;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.specloader.CollectionUtils;
public abstract class PropertyOrCollectionIdentifyingFacetFactoryAbstract
@@ -43,18 +41,6 @@ public abstract class PropertyOrCollectionIdentifyingFacetFactoryAbstract
}
- // //////////////////////////////////////
-
-
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- super.setServicesInjector(servicesInjector);
- adapterManager = servicesInjector.getPersistenceSessionServiceInternal();
- }
-
- PersistenceSessionServiceInternal adapterManager;
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
index a60ff8a..01b6a6e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactory.java
@@ -87,8 +87,6 @@ import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFa
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.facets.members.disabled.DisabledFacet;
import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
-import org.apache.isis.core.metamodel.services.transtate.TransactionStateProviderInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.CollectionUtils;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
@@ -546,15 +544,7 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
hiddenValidator.setConfiguration(configuration);
disabledValidator.setConfiguration(configuration);
prototypeValidator.setConfiguration(configuration);
-
- this.transactionStateProviderInternal =
- servicesInjector.lookupService(TransactionStateProviderInternal.class);
-
- adapterManager = servicesInjector.getPersistenceSessionServiceInternal();
}
- private TransactionStateProviderInternal transactionStateProviderInternal;
- PersistenceSessionServiceInternal adapterManager;
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
index 6a84f78..4fb50bb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/invocation/ActionInvocationFacetForDomainEventAbstract.java
@@ -31,9 +31,6 @@ import java.util.concurrent.Callable;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
-import org.apache.isis.core.metamodel.spec.feature.Contributed;
-import org.apache.isis.core.metamodel.specloader.specimpl.MixedInMember2;
-import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionDefault;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -77,11 +74,13 @@ import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.ixn.InteractionDtoServiceInternal;
import org.apache.isis.core.metamodel.services.publishing.PublishingServiceInternal;
+import org.apache.isis.core.metamodel.services.transtate.TransactionStateProviderInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.specloader.ReflectiveActionException;
+import org.apache.isis.core.metamodel.specloader.specimpl.MixedInMember2;
import org.apache.isis.core.metamodel.transactions.TransactionState;
-import org.apache.isis.core.metamodel.services.transtate.TransactionStateProviderInternal;
import org.apache.isis.schema.ixn.v1.ActionInvocationDto;
public abstract class ActionInvocationFacetForDomainEventAbstract
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java
index 2c999cf..dd0bfef 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/autocomplete/AutoCompleteFacetAbstract.java
@@ -23,7 +23,6 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.applib.services.publish.PublisherService;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -41,9 +40,9 @@ import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.publishing.PublishingServiceInternal;
import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
public abstract class AutoCompleteFacetAbstract extends FacetAbstract implements AutoCompleteFacet {
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
index f83ec4e..a940154 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjector.java
@@ -42,14 +42,11 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.publish.PublishingService;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.authentication.MessageBroker;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.util.ToString;
-import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.exceptions.MetaModelException;
@@ -544,14 +541,6 @@ public class ServicesInjector implements ApplicationScopedComponent {
: (specificationLoader = lookupServiceElseFail(SpecificationLoader.class));
}
- private DeploymentCategoryProvider deploymentCategoryProvider;
- @Programmatic
- public DeploymentCategoryProvider getDeploymentCategoryProvider() {
- return deploymentCategoryProvider != null
- ? deploymentCategoryProvider
- : (deploymentCategoryProvider = lookupServiceElseFail(DeploymentCategoryProvider.class));
- }
-
private AuthenticationSessionProvider authenticationSessionProvider;
@Programmatic
public AuthenticationSessionProvider getAuthenticationSessionProvider() {
@@ -576,43 +565,12 @@ public class ServicesInjector implements ApplicationScopedComponent {
: (configurationServiceInternal = lookupServiceElseFail(ConfigurationServiceInternal.class));
}
- private OidMarshaller oidMarshaller;
-
- @Programmatic
- public OidMarshaller getOidMarshaller() {
- return oidMarshaller != null
- ? oidMarshaller
- : (oidMarshaller = lookupServiceElseFail(OidMarshaller.class));
- }
-
-
-
- //endregion
-
- //region > convenience lookups (not cached as derived properties)
-
- /**
- * Cannot be cached because is a derived property, not a registered service.
- */
- @Programmatic
- public AuthenticationSession getAuthenticationSession() {
- return getAuthenticationSessionProvider().getAuthenticationSession();
- }
-
- /**
- * Cannot be cached because is a derived property, not a registered service.
- */
- @Programmatic
- public MessageBroker getMessageBroker() {
- return getAuthenticationSession().getMessageBroker();
- }
-
- /**
- * Cannot be cached because is a derived property, not a registered service.
- */
+ private DeploymentCategoryProvider deploymentCategoryProvider;
@Programmatic
- public DeploymentCategory getDeploymentCategory() {
- return getDeploymentCategoryProvider().getDeploymentCategory();
+ public DeploymentCategoryProvider getDeploymentCategoryProvider() {
+ return deploymentCategoryProvider != null
+ ? deploymentCategoryProvider
+ : (deploymentCategoryProvider = lookupServiceElseFail(DeploymentCategoryProvider.class));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/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 8be8b8a..ceed921 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
@@ -53,7 +53,6 @@ import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.consent.InteractionResult;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
@@ -193,7 +192,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
this.facetProcessor = facetProcessor;
this.specificationLoader = servicesInjector.getSpecificationLoader();
- this.deploymentCategory = servicesInjector.getDeploymentCategory();
+ this.deploymentCategory = servicesInjector.getDeploymentCategoryProvider().getDeploymentCategory();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java
index 730d84c..5a1d5b0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java
@@ -121,25 +121,18 @@ public class XmlSnapshot implements Snapshot {
private final XsMetaModel xsMeta;
- private final OidMarshaller oidMarshaller;
-
/**
* Start a snapshot at the root object, using own namespace manager.
- *
- * @param oidMarshaller
- * TODO
+ *
*/
- public XmlSnapshot(final ObjectAdapter rootAdapter, OidMarshaller oidMarshaller) {
- this(rootAdapter, new XmlSchema(), oidMarshaller);
+ public XmlSnapshot(final ObjectAdapter rootAdapter) {
+ this(rootAdapter, new XmlSchema());
}
/**
* Start a snapshot at the root object, using supplied namespace manager.
- *
- * @param oidMarshaller
- * TODO
*/
- public XmlSnapshot(final ObjectAdapter rootAdapter, final XmlSchema schema, final OidMarshaller oidMarshaller) {
+ public XmlSnapshot(final ObjectAdapter rootAdapter, final XmlSchema schema) {
if (LOG.isDebugEnabled()) {
LOG.debug(".ctor(" + log("rootObj", rootAdapter) + andlog("schema", schema) + andlog("addOids", "" + true) + ")");
@@ -149,7 +142,6 @@ public class XmlSnapshot implements Snapshot {
this.xsMeta = new XsMetaModel();
this.schema = schema;
- this.oidMarshaller = oidMarshaller;
final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
@@ -837,7 +829,7 @@ public class XmlSnapshot implements Snapshot {
}
return fakeOid;
} else {
- return adapter.getOid().enString(oidMarshaller);
+ return adapter.getOid().enString();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_marshall.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_marshall.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_marshall.java
index d2591bc..24eae7c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_marshall.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_marshall.java
@@ -32,7 +32,7 @@ public class OidMarshallerTest_marshall {
@Before
public void setUp() throws Exception {
- oidMarshaller = new OidMarshaller();
+ oidMarshaller = OidMarshaller.INSTANCE;
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
index 5cbf7a7..e861353 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_roundtripping.java
@@ -28,14 +28,14 @@ import static org.junit.Assert.assertThat;
public class OidMarshallerTest_roundtripping {
- private OidMarshaller oidMarshaller = new OidMarshaller();
+ private OidMarshaller oidMarshaller = OidMarshaller.INSTANCE;
@Test
public void rootOid_withNoVersion() {
RootOid oid = RootOid.create(ObjectSpecId.of("CUS"), "123");
- final String enString = oid.enString(oidMarshaller);
- final RootOid deString = RootOid.deString(enString, oidMarshaller);
+ final String enString = oid.enString();
+ final RootOid deString = RootOid.deString(enString);
assertThat(deString, is(oid));
}
@@ -43,8 +43,8 @@ public class OidMarshallerTest_roundtripping {
public void rootOid_withVersion() {
RootOid oid = RootOid.create(ObjectSpecId.of("CUS"), "123", 90807L);
- final String enString = oid.enString(oidMarshaller);
- final RootOid deString = RootOid.deString(enString, oidMarshaller);
+ final String enString = oid.enString();
+ final RootOid deString = RootOid.deString(enString);
assertThat(deString, is(oid));
assertThat(deString.getVersion(), is(oid.getVersion())); // assert separately because not part of equality check
}
@@ -56,8 +56,8 @@ public class OidMarshallerTest_roundtripping {
RootOid parentOid = RootOid.create(ObjectSpecId.of("CUS"), "123");
ParentedCollectionOid oid = new ParentedCollectionOid(parentOid, "items");
- final String enString = oid.enString(oidMarshaller);
- final ParentedCollectionOid deString = ParentedCollectionOid.deString(enString, oidMarshaller);
+ final String enString = oid.enString();
+ final ParentedCollectionOid deString = ParentedCollectionOid.deString(enString);
assertThat(deString, is(oid));
}
@@ -66,8 +66,8 @@ public class OidMarshallerTest_roundtripping {
RootOid parentOid = RootOid.create(ObjectSpecId.of("CUS"), "123", 90807L);
ParentedCollectionOid oid = new ParentedCollectionOid(parentOid, "items");
- final String enString = oid.enString(oidMarshaller);
- final ParentedCollectionOid deString = ParentedCollectionOid.deString(enString, oidMarshaller);
+ final String enString = oid.enString();
+ final ParentedCollectionOid deString = ParentedCollectionOid.deString(enString);
assertThat(deString, is(oid));
assertThat(deString.getRootOid().getVersion(), is(parentOid.getVersion())); // assert separately because not part of equality check
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_unmarshal.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_unmarshal.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_unmarshal.java
index 50d1a9b..0e7902d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_unmarshal.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/OidMarshallerTest_unmarshal.java
@@ -61,7 +61,7 @@ public class OidMarshallerTest_unmarshal {
@Before
public void setUp() throws Exception {
- oidMarshaller = new OidMarshaller();
+ oidMarshaller = OidMarshaller.INSTANCE;
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
index aa9e242..241c107 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
@@ -60,11 +60,14 @@ import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
*/
public class Memento implements Serializable {
- private final static long serialVersionUID = 1L;
private final static Logger LOG = LoggerFactory.getLogger(Memento.class);
+ private final static long serialVersionUID = 1L;
+
+ private final static OidMarshaller OID_MARSHALLER = OidMarshaller.INSTANCE;
private final List<Oid> transientObjects = Lists.newArrayList();
+
private Data data;
@@ -166,9 +169,8 @@ public class Memento implements Serializable {
private static <T extends Oid> T clone(final T oid) {
if(oid == null) { return null; }
- final OidMarshaller oidMarshaller = new OidMarshaller();
- final String oidStr = oid.enString(oidMarshaller);
- return (T) oidMarshaller.unmarshal(oidStr, oid.getClass());
+ final String oidStr = oid.enString();
+ return (T) OID_MARSHALLER.unmarshal(oidStr, oid.getClass());
}
private Data createStandaloneData(final ObjectAdapter adapter) {
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisInjectModule.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisInjectModule.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisInjectModule.java
index b1420a6..f317dc5 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisInjectModule.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisInjectModule.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.runtime.system.IsisSystem;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProviderUsingInstallers;
@@ -111,13 +111,11 @@ public class IsisInjectModule extends AbstractModule {
final IsisComponentProviderUsingInstallers componentProvider =
new IsisComponentProviderUsingInstallers(appManifest, isisConfiguration);
- final IsisSystem system = new IsisSystem(componentProvider, deploymentCategory);
+ final IsisSessionFactoryBuilder builder = new IsisSessionFactoryBuilder(componentProvider, deploymentCategory);
// as a side-effect, if the metamodel turns out to be invalid, then
// this will push the MetaModelInvalidException into IsisContext.
- system.buildSessionFactory();
-
- return system.getSessionFactory();
+ return builder.buildSessionFactory();
}
@Provides
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
index b74f223..3b7d53c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/publish/PublishingServiceInternalDefault.java
@@ -26,7 +26,6 @@ import java.util.Map;
import java.util.UUID;
import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
@@ -80,6 +79,8 @@ import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@RequestScoped
public class PublishingServiceInternalDefault implements PublishingServiceInternal {
+ private final static OidMarshaller OID_MARSHALLER = OidMarshaller.INSTANCE;
+
//region > static helper functions
private Function<ObjectAdapter, ObjectAdapter> notDestroyedElseEmpty() {
return new Function<ObjectAdapter, ObjectAdapter>() {
@@ -250,7 +251,7 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
}
final RootOid adapterOid = (RootOid) targetAdapter.getOid();
- final String oidStr = oidMarshaller.marshal(adapterOid);
+ final String oidStr = OID_MARSHALLER.marshal(adapterOid);
final Identifier actionIdentifier = objectAction.getIdentifier();
final String title = oidStr + ": " + actionIdentifier.toNameParmsIdentityString();
@@ -314,7 +315,7 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
final ObjectAdapter adapter = isisSessionFactory.getCurrentSession()
.getPersistenceSession().adapterFor(object);
Oid oid = adapter.getOid();
- return oid != null? oid.enString(oidMarshaller): encodedValueOf(adapter);
+ return oid != null? oid.enString(): encodedValueOf(adapter);
}
private String encodedValueOf(ObjectAdapter adapter) {
EncodableFacet facet = adapter.getSpecification().getFacet(EncodableFacet.class);
@@ -446,9 +447,6 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
private MetricsService metricsService;
@javax.inject.Inject
- private OidMarshaller oidMarshaller;
-
- @javax.inject.Inject
private IsisSessionFactory isisSessionFactory;
private PersistenceSession getPersistenceSession() {
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
index 3fb3f8b..f63378d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
@@ -16,15 +16,12 @@
*/
package org.apache.isis.core.runtime.services.xmlsnapshot;
-import javax.inject.Inject;
-
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.xmlsnapshot.XmlSnapshotService;
import org.apache.isis.applib.services.xmlsnapshot.XmlSnapshotServiceAbstract;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.runtime.snapshot.XmlSnapshot;
import org.apache.isis.core.runtime.snapshot.XmlSnapshotBuilder;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -65,8 +62,7 @@ public class XmlSnapshotServiceDefault extends XmlSnapshotServiceAbstract {
XmlSnapshot xmlSnapshot = builder.build();
return xmlSnapshot;
}
- }
-
+ }
/**
* Creates a simple snapshot of the domain object.
@@ -75,7 +71,7 @@ public class XmlSnapshotServiceDefault extends XmlSnapshotServiceAbstract {
@Override
public XmlSnapshotService.Snapshot snapshotFor(final Object domainObject) {
final ObjectAdapter adapter = getPersistenceSession().adapterFor(domainObject);
- return new XmlSnapshot(adapter, oidMarshaller);
+ return new XmlSnapshot(adapter);
}
/**
@@ -100,8 +96,7 @@ public class XmlSnapshotServiceDefault extends XmlSnapshotServiceAbstract {
return isisSessionFactory.getCurrentSession().getPersistenceSession();
}
- @javax.inject.Inject
- OidMarshaller oidMarshaller;
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshotBuilder.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshotBuilder.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshotBuilder.java
index ea08bdf..6f0e2f6 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshotBuilder.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshotBuilder.java
@@ -23,7 +23,6 @@ import java.util.List;
import com.google.common.collect.Lists;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@@ -40,7 +39,6 @@ public class XmlSnapshotBuilder {
private final Object domainObject;
private XmlSchema schema;
- private OidMarshaller oidMarshaller = new OidMarshaller();
static class PathAndAnnotation {
public PathAndAnnotation(final String path, final String annotation) {
@@ -74,7 +72,7 @@ public class XmlSnapshotBuilder {
public XmlSnapshot build() {
final ObjectAdapter adapter = getPersistenceSession().adapterFor(domainObject);
- final XmlSnapshot snapshot = (schema != null) ? new XmlSnapshot(adapter, schema, oidMarshaller) : new XmlSnapshot(adapter, oidMarshaller);
+ final XmlSnapshot snapshot = (schema != null) ? new XmlSnapshot(adapter, schema) : new XmlSnapshot(adapter);
for (final XmlSnapshotBuilder.PathAndAnnotation paa : paths) {
if (paa.annotation != null) {
snapshot.include(paa.path, paa.annotation);
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
index 5424e77..0fa3fad 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
@@ -19,243 +19,17 @@
package org.apache.isis.core.runtime.system;
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collection;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.isis.applib.AppManifest;
-import org.apache.isis.applib.clock.Clock;
-import org.apache.isis.applib.fixtures.FixtureClock;
-import org.apache.isis.applib.fixturescripts.FixtureScripts;
-import org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault;
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.commons.lang.ListExtensions;
-import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
-import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.services.configinternal.ConfigurationServiceInternal;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
-import org.apache.isis.core.runtime.authentication.AuthenticationManager;
-import org.apache.isis.core.runtime.authorization.AuthorizationManager;
-import org.apache.isis.core.runtime.services.deplcat.DeploymentCategoryProviderDefault;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.internal.IsisLocaleInitializer;
-import org.apache.isis.core.runtime.system.internal.IsisTimeZoneInitializer;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactoryMetamodelRefiner;
-import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProvider;
-import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProviderDefault2;
-
-public class IsisSystem implements ApplicationScopedComponent {
-
- public static final Logger LOG = LoggerFactory.getLogger(IsisSystem.class);
+/**
+ * @deprecated
+ */
+@Deprecated
+public class IsisSystem {
public static final String MSG_ARE_YOU_SURE = "Are you sure?";
public static final String MSG_CONFIRM = "Confirm";
public static final String MSG_CANCEL = "Cancel";
-
- private boolean initialized = false;
-
- private IsisSessionFactory isisSessionFactory;
-
- //region > constructors, fields
-
- private final IsisComponentProvider componentProvider;
- private final DeploymentCategory deploymentCategory;
-
- private final IsisLocaleInitializer localeInitializer;
- private final IsisTimeZoneInitializer timeZoneInitializer;
-
- public IsisSystem(final AppManifest manifest) {
- this(new IsisComponentProviderDefault2(manifest, null),
- DeploymentCategory.PRODUCTION);
- }
-
- public IsisSystem(final IsisComponentProvider componentProvider, final DeploymentCategory deploymentCategory) {
-
- this.componentProvider = componentProvider;
- this.deploymentCategory = deploymentCategory;
-
- this.localeInitializer = new IsisLocaleInitializer();
- this.timeZoneInitializer = new IsisTimeZoneInitializer();
- }
-
- public DeploymentCategory getDeploymentCategory() {
- return deploymentCategory;
- }
- //endregion
-
- //region > sessionFactory
-
- /**
- * Populated after {@link #buildSessionFactory()}.
- */
- public IsisSessionFactory getSessionFactory() {
- return isisSessionFactory;
- }
-
- //endregion
-
- //region > buildSessionFactory
-
-
- public IsisSessionFactory buildSessionFactory() {
-
- if (initialized) {
- throw new IllegalStateException("Already initialized");
- }
- initialized = true;
-
-
- LOG.info("initialising Isis System");
- LOG.info("working directory: " + new File(".").getAbsolutePath());
-
- final IsisConfigurationDefault configuration = componentProvider.getConfiguration();
- LOG.info("resource stream source: " + configuration.getResourceStreamSource());
-
- localeInitializer.initLocale(configuration);
- timeZoneInitializer.initTimeZone(configuration);
-
- // a bit of a workaround, but required if anything in the metamodel (for example, a
- // ValueSemanticsProvider for a date value type) needs to use the Clock singleton
- // we do this after loading the services to allow a service to prime a different clock
- // implementation (eg to use an NTP time service).
- if (!getDeploymentCategory().isProduction() && !Clock.isInitialized()) {
- FixtureClock.initialize();
- }
-
- try {
-
- //
- // everything added to ServicesInjector will be able to @javax.inject.Inject'ed
- //
-
- //
- // the IsisSessionFactory will look up each of these components from the ServicesInjector
- //
-
- final ServicesInjector servicesInjector = componentProvider.provideServiceInjector(configuration);
-
- // fixtureScripts, deploymentCategory, configuration
- final DeploymentCategoryProviderDefault deploymentCategoryProvider =
- new DeploymentCategoryProviderDefault(deploymentCategory);
- servicesInjector.addFallbackIfRequired(DeploymentCategoryProvider.class, deploymentCategoryProvider);
- servicesInjector.addFallbackIfRequired(ConfigurationServiceInternal.class, configuration);
-
- // fixtureScripts
- servicesInjector.addFallbackIfRequired(FixtureScripts.class, new FixtureScriptsDefault());
-
- // authentication
- final AuthenticationManager authenticationManager = componentProvider.provideAuthenticationManager();
- servicesInjector.addFallbackIfRequired(AuthenticationManager.class, authenticationManager);
-
- // authorization
- final AuthorizationManager authorizationManager = componentProvider.provideAuthorizationManager();
- servicesInjector.addFallbackIfRequired(AuthorizationManager.class, authorizationManager);
-
- // specificationLoader
- final Collection<MetaModelRefiner> metaModelRefiners =
- refiners(authenticationManager, authorizationManager,
- new PersistenceSessionFactoryMetamodelRefiner());
- final SpecificationLoader specificationLoader =
- componentProvider.provideSpecificationLoader(servicesInjector, metaModelRefiners);
- servicesInjector.addFallbackIfRequired(SpecificationLoader.class, specificationLoader);
-
- // persistenceSessionFactory
- final PersistenceSessionFactory persistenceSessionFactory = new PersistenceSessionFactory(configuration);
- servicesInjector.addFallbackIfRequired(PersistenceSessionFactory.class, persistenceSessionFactory);
-
-
- servicesInjector.validateServices();
-
- // instantiate the IsisSessionFactory
- isisSessionFactory = new IsisSessionFactory(deploymentCategory, servicesInjector);
-
-
- //
- // now, add the IsisSessionFactory and its subcomponents into ServicesInjector, so that they can be
- // @javax.inject.Inject'd into any internal domain services
- //
-
- // isisSessionFactory itself
- servicesInjector.addFallbackIfRequired(IsisSessionFactory.class, isisSessionFactory);
-
- // subcomponents of isisSessionFactory itself
- servicesInjector.addFallbackIfRequired(OidMarshaller.class, isisSessionFactory.getOidMarshaller());
-
-
-
- //
- // finally, wire up components and components into services...
- //
- servicesInjector.autowire();
-
-
- // ... and make IsisSessionFactory available via the IsisContext static for those places where we canont
- // yet inject.
- IsisContext.setSessionFactory(isisSessionFactory);
-
-
-
-
- //
- // time to initialize...
- //
- try {
- // first, initial metamodel (may throw exception if invalid)
- specificationLoader.init();
- specificationLoader.validateAndAssert();
-
-
- //
- // remaining functionality only done if metamodel is valid.
- //
- authenticationManager.init();
- authorizationManager.init();
-
- persistenceSessionFactory.init(specificationLoader);
-
- isisSessionFactory.constructServices();
-
-
- } catch (final MetaModelInvalidException ex) {
- // no need to use a higher level, such as error(...); the calling code will expose any metamodel
- // validation errors in their own particular way.
- if(LOG.isDebugEnabled()) {
- LOG.debug("Meta model invalid", ex);
- }
- IsisContext.setMetaModelInvalidException(ex);
- }
-
-
- } catch (final IsisSystemException ex) {
- LOG.error("failed to initialise", ex);
- throw new RuntimeException(ex);
- }
-
- return isisSessionFactory;
- }
-
- private static Collection<MetaModelRefiner> refiners(Object... possibleRefiners ) {
- return ListExtensions.filtered(Arrays.asList(possibleRefiners), MetaModelRefiner.class);
- }
-
- //endregion
-
- // region > metaModel validity
- public boolean isMetaModelValid() {
- return IsisContext.getMetaModelInvalidExceptionIfAny() == null;
- }
- //endregion
+ private IsisSystem(){}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/runtime/src/main/java/org/apache/isis/core/runtime/system/MessageRegistry.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/MessageRegistry.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/MessageRegistry.java
new file mode 100644
index 0000000..3873b34
--- /dev/null
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/MessageRegistry.java
@@ -0,0 +1,34 @@
+/*
+ * 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.runtime.system;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class MessageRegistry {
+
+ public MessageRegistry(){}
+
+ public List<String> listMessages() {
+ return Arrays.asList(IsisSystem.MSG_ARE_YOU_SURE, IsisSystem.MSG_CONFIRM, IsisSystem.MSG_CANCEL);
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
index af705cb..495458b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
@@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
-import org.apache.isis.core.runtime.system.IsisSystem;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
import org.apache.isis.core.runtime.system.session.IsisSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@@ -64,7 +64,7 @@ public final class IsisContext {
/**
- * Intended to be called only by {@link IsisSystem}.
+ * Intended to be called only by {@link IsisSessionFactoryBuilder}.
*/
public static void setSessionFactory(final IsisSessionFactory sessionFactory) {
if (IsisContext.sessionFactory != null) {
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/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 b15e087..14073cc 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
@@ -157,6 +157,8 @@ public class PersistenceSession implements
//region > constants
private static final Logger LOG = LoggerFactory.getLogger(PersistenceSession.class);
+ private final static OidMarshaller OID_MARSHALLER = OidMarshaller.INSTANCE;
+
/**
* @see #isFixturesInstalled()
*/
@@ -203,7 +205,6 @@ public class PersistenceSession implements
// not final only for testing purposes
private IsisTransactionManager transactionManager;
- private final OidMarshaller oidMarshaller = new OidMarshaller();
/**
* populated only when {@link #open()}ed.
@@ -256,7 +257,7 @@ public class PersistenceSession implements
// sub-components
final AdapterManager adapterManager = this;
this.persistenceQueryFactory = new PersistenceQueryFactory(adapterManager, this.specificationLoader);
- this.transactionManager = new IsisTransactionManager(this, servicesInjector);
+ this.transactionManager = new IsisTransactionManager(this, authenticationSession, servicesInjector);
this.state = State.NOT_INITIALIZED;
@@ -610,10 +611,6 @@ public class PersistenceSession implements
return configuration;
}
- public OidMarshaller getOidMarshaller() {
- return oidMarshaller;
- }
-
//endregion
@@ -1026,7 +1023,7 @@ public class PersistenceSession implements
public void execute() {
if (LOG.isDebugEnabled()) {
- LOG.debug("resolveImmediately; oid=" + adapter.getOid().enString(oidMarshaller));
+ LOG.debug("resolveImmediately; oid=" + adapter.getOid().enString());
}
if (!adapter.representsPersistent()) {
@@ -1804,7 +1801,7 @@ public class PersistenceSession implements
// associate root adapter with the new Oid, and remap
if (LOG.isDebugEnabled()) {
LOG.debug("replacing Oid for root adapter and re-adding into maps; oid is now: " + persistedRootOid.enString(
- oidMarshaller) + " (was: " + transientRootOid.enString(oidMarshaller) + ")");
+ ) + " (was: " + transientRootOid.enString() + ")");
}
adapter.replaceOid(persistedRootOid);
oidAdapterMap.add(persistedRootOid, adapter);
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
index b7572ab..b81ec1d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactory.java
@@ -32,8 +32,6 @@ import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -44,7 +42,7 @@ import org.apache.isis.core.runtime.authentication.exploration.ExplorationSessio
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.fixtures.FixturesInstallerFromConfiguration;
import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.IsisSystem;
+import org.apache.isis.core.runtime.system.MessageRegistry;
import org.apache.isis.core.runtime.system.internal.InitialisationSession;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
@@ -82,7 +80,6 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
private final AuthenticationManager authenticationManager;
private final AuthorizationManager authorizationManager;
private final PersistenceSessionFactory persistenceSessionFactory;
- private final OidMarshaller oidMarshaller;
public IsisSessionFactory(
final DeploymentCategory deploymentCategory,
@@ -96,8 +93,6 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
this.authenticationManager = servicesInjector.getAuthenticationManager();
this.authorizationManager = servicesInjector.getAuthorizationManager();
this.persistenceSessionFactory = servicesInjector.lookupServiceElseFail(PersistenceSessionFactory.class);
-
- this.oidMarshaller = new OidMarshaller();
}
@@ -166,10 +161,12 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
// as used by the Wicket UI
final TranslationService translationService = servicesInjector.lookupServiceElseFail(TranslationService.class);
- final String context = IsisSystem.class.getName();
- translationService.translate(context, IsisSystem.MSG_ARE_YOU_SURE);
- translationService.translate(context, IsisSystem.MSG_CONFIRM);
- translationService.translate(context, IsisSystem.MSG_CANCEL);
+ final String context = IsisSessionFactoryBuilder.class.getName();
+ final MessageRegistry messageRegistry = new MessageRegistry();
+ final List<String> messages = messageRegistry.listMessages();
+ for (String message : messages) {
+ translationService.translate(context, message);
+ }
} finally {
closeSession();
@@ -438,16 +435,6 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
return persistenceSessionFactory;
}
- /**
- * The {@link OidMarshaller} to use for marshalling and unmarshalling {@link Oid}s
- * into strings.
- */
- @Programmatic
- public OidMarshaller getOidMarshaller() {
- return oidMarshaller;
- }
-
-
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
new file mode 100644
index 0000000..3bcdcdf
--- /dev/null
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryBuilder.java
@@ -0,0 +1,219 @@
+/*
+ * 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.runtime.system.session;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.isis.applib.AppManifest;
+import org.apache.isis.applib.clock.Clock;
+import org.apache.isis.applib.fixtures.FixtureClock;
+import org.apache.isis.applib.fixturescripts.FixtureScripts;
+import org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
+import org.apache.isis.core.commons.lang.ListExtensions;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
+import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.configinternal.ConfigurationServiceInternal;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authorization.AuthorizationManager;
+import org.apache.isis.core.runtime.services.deplcat.DeploymentCategoryProviderDefault;
+import org.apache.isis.core.runtime.system.IsisSystemException;
+import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.internal.IsisLocaleInitializer;
+import org.apache.isis.core.runtime.system.internal.IsisTimeZoneInitializer;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactoryMetamodelRefiner;
+import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProvider;
+import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProviderDefault2;
+
+public class IsisSessionFactoryBuilder {
+
+ public static final Logger LOG = LoggerFactory.getLogger(IsisSessionFactoryBuilder.class);
+
+ private boolean initialized = false;
+
+ //region > constructors, fields
+
+ private final IsisComponentProvider componentProvider;
+ private final DeploymentCategory deploymentCategory;
+
+ private final IsisLocaleInitializer localeInitializer;
+ private final IsisTimeZoneInitializer timeZoneInitializer;
+
+ public IsisSessionFactoryBuilder(final AppManifest manifest) {
+ this(new IsisComponentProviderDefault2(manifest, null), DeploymentCategory.PRODUCTION);
+ }
+
+ public IsisSessionFactoryBuilder(final IsisComponentProvider componentProvider, final DeploymentCategory deploymentCategory) {
+
+ this.componentProvider = componentProvider;
+ this.deploymentCategory = deploymentCategory;
+
+ this.localeInitializer = new IsisLocaleInitializer();
+ this.timeZoneInitializer = new IsisTimeZoneInitializer();
+ }
+
+ public DeploymentCategory getDeploymentCategory() {
+ return deploymentCategory;
+ }
+ //endregion
+
+
+ //region > buildSessionFactory
+
+ public IsisSessionFactory buildSessionFactory() {
+
+ if (initialized) {
+ throw new IllegalStateException("Already initialized");
+ }
+ initialized = true;
+
+
+ LOG.info("initialising Isis System");
+ LOG.info("working directory: " + new File(".").getAbsolutePath());
+
+ final IsisConfigurationDefault configuration = componentProvider.getConfiguration();
+ LOG.info("resource stream source: " + configuration.getResourceStreamSource());
+
+ localeInitializer.initLocale(configuration);
+ timeZoneInitializer.initTimeZone(configuration);
+
+ // a bit of a workaround, but required if anything in the metamodel (for example, a
+ // ValueSemanticsProvider for a date value type) needs to use the Clock singleton
+ // we do this after loading the services to allow a service to prime a different clock
+ // implementation (eg to use an NTP time service).
+ if (!getDeploymentCategory().isProduction() && !Clock.isInitialized()) {
+ FixtureClock.initialize();
+ }
+
+ IsisSessionFactory isisSessionFactory;
+ try {
+
+ // everything added to ServicesInjector will be able to @javax.inject.Inject'ed
+ // the IsisSessionFactory will look up each of these components from the ServicesInjector
+
+ final ServicesInjector servicesInjector = componentProvider.provideServiceInjector(configuration);
+
+ // deploymentCategory, configuration
+ servicesInjector.addFallbackIfRequired(
+ DeploymentCategoryProvider.class, new DeploymentCategoryProviderDefault(deploymentCategory));
+ servicesInjector.addFallbackIfRequired(ConfigurationServiceInternal.class, configuration);
+
+ // fixtureScripts
+ servicesInjector.addFallbackIfRequired(FixtureScripts.class, new FixtureScriptsDefault());
+
+ // authentication
+ final AuthenticationManager authenticationManager = componentProvider.provideAuthenticationManager();
+ servicesInjector.addFallbackIfRequired(AuthenticationManager.class, authenticationManager);
+
+ // authorization
+ final AuthorizationManager authorizationManager = componentProvider.provideAuthorizationManager();
+ servicesInjector.addFallbackIfRequired(AuthorizationManager.class, authorizationManager);
+
+ // specificationLoader
+ final Collection<MetaModelRefiner> metaModelRefiners = refiners(
+ authenticationManager, authorizationManager, new PersistenceSessionFactoryMetamodelRefiner());
+ final SpecificationLoader specificationLoader =
+ componentProvider.provideSpecificationLoader(servicesInjector, metaModelRefiners);
+ servicesInjector.addFallbackIfRequired(SpecificationLoader.class, specificationLoader);
+
+ // persistenceSessionFactory
+ final PersistenceSessionFactory persistenceSessionFactory = new PersistenceSessionFactory(configuration);
+ servicesInjector.addFallbackIfRequired(PersistenceSessionFactory.class, persistenceSessionFactory);
+
+
+ servicesInjector.validateServices();
+
+ // instantiate the IsisSessionFactory
+ isisSessionFactory = new IsisSessionFactory(deploymentCategory, servicesInjector);
+
+
+ // now, add the IsisSessionFactory itself into ServicesInjector, so it can be @javax.inject.Inject'd
+ // into any internal domain services
+ servicesInjector.addFallbackIfRequired(IsisSessionFactory.class, isisSessionFactory);
+
+
+
+ // finally, wire up components and components into services...
+ servicesInjector.autowire();
+
+
+ // ... and make IsisSessionFactory available via the IsisContext static for those places where we cannot
+ // yet inject.
+ IsisContext.setSessionFactory(isisSessionFactory);
+
+
+
+ // time to initialize...
+ try {
+ // first, initial metamodel (may throw exception if invalid)
+ specificationLoader.init();
+ specificationLoader.validateAndAssert();
+
+
+ // remaining functionality only done if metamodel is valid.
+ authenticationManager.init();
+ authorizationManager.init();
+
+ persistenceSessionFactory.init(specificationLoader);
+
+ isisSessionFactory.constructServices();
+
+ } catch (final MetaModelInvalidException ex) {
+ // no need to use a higher level, such as error(...); the calling code will expose any metamodel
+ // validation errors in their own particular way.
+ if(LOG.isDebugEnabled()) {
+ LOG.debug("Meta model invalid", ex);
+ }
+ IsisContext.setMetaModelInvalidException(ex);
+ }
+
+
+ } catch (final IsisSystemException ex) {
+ LOG.error("failed to initialise", ex);
+ throw new RuntimeException(ex);
+ }
+
+ return isisSessionFactory;
+ }
+
+ private static Collection<MetaModelRefiner> refiners(Object... possibleRefiners ) {
+ return ListExtensions.filtered(Arrays.asList(possibleRefiners), MetaModelRefiner.class);
+ }
+
+ //endregion
+
+ // region > metaModel validity
+ public boolean isMetaModelValid() {
+ return IsisContext.getMetaModelInvalidExceptionIfAny() == null;
+ }
+ //endregion
+
+
+}