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/16 10:41:52 UTC
[01/50] [abbrv] isis git commit: ISIS-1247: simplifying
IsisInjectModule a little,
moving InstallerLookup as a nested static class of
IsisComponentProviderUsingInstallers.
Repository: isis
Updated Branches:
refs/heads/master 7d0e296d8 -> 3dffc2d96
ISIS-1247: simplifying IsisInjectModule a little, moving InstallerLookup as a nested static class of IsisComponentProviderUsingInstallers.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9e1f2fd8
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9e1f2fd8
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9e1f2fd8
Branch: refs/heads/master
Commit: 9e1f2fd8206f5726017de4876bd7dd6febdc9654
Parents: a639d0f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Jun 7 23:44:09 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Jun 7 23:53:46 2016 +0100
----------------------------------------------------------------------
.../installerregistry/InstallerLookup.java | 162 -------------------
.../core/runtime/runner/IsisInjectModule.java | 25 +--
.../system/session/IsisSessionFactory.java | 4 +-
.../IsisComponentProvider.java | 4 +-
.../IsisComponentProviderUsingInstallers.java | 148 +++++++++++++++--
5 files changed, 146 insertions(+), 197 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9e1f2fd8/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerLookup.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerLookup.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerLookup.java
deleted file mode 100644
index 5b07625..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/InstallerLookup.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * 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.installerregistry;
-
-import java.util.List;
-
-import com.google.common.collect.Lists;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.commons.components.Installer;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.commons.ensure.Assert;
-import org.apache.isis.core.commons.factory.InstanceCreationClassException;
-import org.apache.isis.core.commons.factory.InstanceCreationException;
-import org.apache.isis.core.commons.factory.InstanceUtil;
-import org.apache.isis.core.commons.factory.UnavailableClassException;
-import org.apache.isis.core.commons.lang.ObjectExtensions;
-import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
-import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
-import org.apache.isis.core.runtime.system.IsisSystem;
-import org.apache.isis.core.runtime.system.SystemConstants;
-
-/**
- * Looks up authorization and authentication implementations.
- *
- * Previously this class was used to lookup the top-level components of
- * {@link IsisSystem} (persistence, authentication, authorization, reflector and so on),
- * each being looked up from a file called <tt>installer-registry.properties</tt>.
- * Of these responsibilities, only the support for authentication and authorization remains,
- * the remainder have only a single implementation. The implementation has been
- * substantially simplified.
- *
- * Note that it <i>is</i> possible to use other {@link Installer} implementations;
- * just specify the {@link Installer}'s fully qualified class name.
- *
- * @deprecated - intention is to replace in future using CDI
- */
-@Deprecated
-public class InstallerLookup implements ApplicationScopedComponent {
-
- private static final Logger LOG = LoggerFactory.getLogger(InstallerLookup.class);
-
- //region > constructor, fields
-
- private final IsisConfigurationDefault isisConfiguration;
- private final List<Installer> installerList = Lists.newArrayList();
-
- public InstallerLookup(final IsisConfigurationDefault isisConfiguration) throws InstanceCreationException {
- this.isisConfiguration = isisConfiguration;
-
- final List<String> installerClassNames = Lists.newArrayList(
- "org.apache.isis.core.security.authentication.BypassAuthenticationManagerInstaller", // bypass
- "org.apache.isis.security.shiro.authentication.ShiroAuthenticationManagerInstaller", // shiro
- "org.apache.isis.core.security.authorization.BypassAuthorizationManagerInstaller", // bypass
- "org.apache.isis.security.shiro.authorization.ShiroAuthorizationManagerInstaller" // shiro
- );
-
- for (String className : installerClassNames) {
- if (className.length() == 0 || className.startsWith("#")) {
- continue;
- }
- try {
- final Installer object = (Installer) InstanceUtil.createInstance(className, isisConfiguration);
- LOG.debug("created component installer: " + object.getName() + " - " + className);
- installerList.add(object);
- } catch (final UnavailableClassException e) {
- LOG.info("component installer not found; it will not be available: " + className);
- } catch (final InstanceCreationClassException e) {
- LOG.info("instance creation exception: " + e.getMessage());
- }
- }
- }
-
- public IsisConfigurationDefault getConfiguration() {
- return isisConfiguration;
- }
-
- //endregion
-
- //region > framework
-
- public AuthenticationManagerInstaller authenticationManagerInstaller(final String requested) {
-
- return getInstaller(
- AuthenticationManagerInstaller.class,
- requested,
- SystemConstants.AUTHENTICATION_INSTALLER_KEY,
- SystemConstants.AUTHENTICATION_DEFAULT);
- }
-
- public AuthorizationManagerInstaller authorizationManagerInstaller(final String requested) {
- return getInstaller(
- AuthorizationManagerInstaller.class, requested,
- SystemConstants.AUTHORIZATION_INSTALLER_KEY,
- SystemConstants.AUTHORIZATION_DEFAULT);
- }
-
- //endregion
-
- //region > helpers
- @SuppressWarnings("unchecked")
- private <T extends Installer> T getInstaller(final Class<T> cls, final String implName) {
- Assert.assertNotNull("No name specified", implName);
- for (final Installer installer : installerList) {
- if (cls.isAssignableFrom(installer.getClass()) && installer.getName().equals(implName)) {
- return (T) installer;
- }
- }
- return (T) getInstaller(implName);
- }
-
- @SuppressWarnings("unchecked")
- public Installer getInstaller(final String implClassName) {
- try {
- return ObjectExtensions.asT(InstanceUtil.createInstance(implClassName));
- } catch (final UnavailableClassException e) {
- return null;
- }
- }
-
- private <T extends Installer> T getInstaller(
- final Class<T> requiredType,
- String reqImpl,
- final String key,
- final String defaultImpl) {
- if (reqImpl == null) {
- reqImpl = getConfiguration().getString(key, defaultImpl);
- }
- if (reqImpl == null) {
- return null;
- }
- final T installer = getInstaller(requiredType, reqImpl);
- if (installer == null) {
- throw new InstanceCreationException(
- "Failed to load installer; named/class:'" + reqImpl + "' (of type " + requiredType.getName() + ")");
- }
- return installer;
- }
-
- //endregion
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/9e1f2fd8/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 8262131..4e420bf 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
@@ -31,7 +31,6 @@ import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.fixturescripts.FixtureScript;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.runtime.installerregistry.InstallerLookup;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProviderUsingInstallers;
@@ -42,8 +41,8 @@ public class IsisInjectModule extends AbstractModule {
* Placeholder for no {@link AppManifest}.
*
* <p>
- * This is bound in by default in <tt>IsisWicketModule</tt>, but is replaced with
- * null when the system is {@link #provideIsisSystem(DeploymentType, InstallerLookup, AppManifest) created} .
+ * This is bound in by default in <tt>IsisWicketModule</tt>, but is replaced with null when the system is
+ * {@link #provideIsisSystem(DeploymentType, IsisConfiguration, AppManifest) created} .
* </p>
*/
private static final AppManifest APP_MANIFEST_NOOP = new AppManifest() {
@@ -72,13 +71,11 @@ public class IsisInjectModule extends AbstractModule {
};
private final DeploymentType deploymentType;
- private final InstallerLookup installerLookup;
- private final IsisConfiguration isisConfiguration;
+ private final IsisConfigurationDefault isisConfiguration;
public IsisInjectModule(
final DeploymentType deploymentType,
final IsisConfigurationDefault isisConfiguration) {
- this.installerLookup = new InstallerLookup(isisConfiguration);
this.isisConfiguration = isisConfiguration;
this.deploymentType = deploymentType;
}
@@ -103,22 +100,11 @@ public class IsisInjectModule extends AbstractModule {
return isisConfiguration;
}
- /**
- * As passed in or defaulted by the constructors.
- */
- @SuppressWarnings("unused")
- @Provides
- @Singleton
- @Inject
- private InstallerLookup providesInstallerLookup() {
- return installerLookup;
- }
@Override
protected void configure() {
requireBinding(DeploymentType.class);
requireBinding(IsisConfiguration.class);
- requireBinding(InstallerLookup.class);
bind(AppManifest.class).toInstance(APP_MANIFEST_NOOP);
}
@@ -128,7 +114,7 @@ public class IsisInjectModule extends AbstractModule {
@Singleton
protected IsisSystem provideIsisSystem(
final DeploymentType deploymentType,
- final InstallerLookup installerLookup,
+ final IsisConfiguration isisConfiguration,
final AppManifest appManifestIfAny) {
final IsisComponentProviderUsingInstallers componentProvider =
@@ -136,7 +122,8 @@ public class IsisInjectModule extends AbstractModule {
deploymentType,
appManifestIfAny == APP_MANIFEST_NOOP
? null
- : appManifestIfAny, installerLookup);
+ : appManifestIfAny,
+ isisConfiguration);
final IsisSystem system = new IsisSystem(componentProvider);
http://git-wip-us.apache.org/repos/asf/isis/blob/9e1f2fd8/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 bb30f78..74d01ee 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
@@ -33,10 +33,10 @@ import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
-import org.apache.isis.core.runtime.installerregistry.InstallerLookup;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProviderUsingInstallers;
/**
* Analogous (and in essence a wrapper for) a JDO <code>PersistenceManagerFactory</code>
@@ -47,7 +47,7 @@ import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory
* components that make up that {@link IsisSession}.
*
* <p>
- * The idea is that one subclass can use the {@link InstallerLookup} design to
+ * The idea is that one subclass can use the {@link IsisComponentProviderUsingInstallers.InstallerLookup} design to
* lookup installers for components (and hence create the components
* themselves), whereas another subclass might simply use Spring (or another DI
* container) to inject in the components according to some Spring-configured
http://git-wip-us.apache.org/repos/asf/isis/blob/9e1f2fd8/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
index 3fff772..22a946f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
@@ -85,11 +85,11 @@ public abstract class IsisComponentProvider {
public IsisComponentProvider(
final DeploymentType deploymentType,
final AppManifest appManifestIfAny,
- final IsisConfigurationDefault configuration) {
+ final IsisConfiguration configuration) {
this.deploymentType = deploymentType;
this.appManifestIfAny = appManifestIfAny;
- this.configuration = configuration;
+ this.configuration = (IsisConfigurationDefault) configuration; // REVIEW: HACKY
if(appManifestIfAny != null) {
http://git-wip-us.apache.org/repos/asf/isis/blob/9e1f2fd8/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
index 192750c..1db3e52 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
@@ -21,17 +21,29 @@ package org.apache.isis.core.runtime.systemusinginstallers;
import java.util.List;
+import com.google.common.collect.Lists;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.fixturescripts.FixtureScript;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
+import org.apache.isis.core.commons.components.ApplicationScopedComponent;
+import org.apache.isis.core.commons.components.Installer;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.ensure.Assert;
+import org.apache.isis.core.commons.factory.InstanceCreationClassException;
+import org.apache.isis.core.commons.factory.InstanceCreationException;
import org.apache.isis.core.commons.factory.InstanceUtil;
+import org.apache.isis.core.commons.factory.UnavailableClassException;
+import org.apache.isis.core.commons.lang.ObjectExtensions;
import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
import org.apache.isis.core.runtime.fixtures.FixturesInstallerFromConfiguration;
-import org.apache.isis.core.runtime.installerregistry.InstallerLookup;
import org.apache.isis.core.runtime.services.ServicesInstaller;
import org.apache.isis.core.runtime.services.ServicesInstallerFromConfigurationAndAnnotation;
import org.apache.isis.core.runtime.system.DeploymentType;
+import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.SystemConstants;
import static org.apache.isis.core.commons.ensure.Ensure.ensureThatState;
@@ -45,10 +57,18 @@ public class IsisComponentProviderUsingInstallers extends IsisComponentProvider
public IsisComponentProviderUsingInstallers(
final DeploymentType deploymentType,
final AppManifest appManifestIfAny,
+ final IsisConfiguration configuration) {
+ this(deploymentType, appManifestIfAny, configuration, new InstallerLookup(configuration));
+ }
+
+ private IsisComponentProviderUsingInstallers(
+ final DeploymentType deploymentType,
+ final AppManifest appManifestIfAny,
+ final IsisConfiguration configuration,
final InstallerLookup installerLookup) {
super(deploymentType,
- appManifestIfAny(appManifestIfAny, installerLookup),
- configurationFrom(installerLookup));
+ appManifestIfAny(appManifestIfAny, configuration),
+ configuration);
if(getAppManifestIfAny() != null) {
@@ -98,28 +118,132 @@ public class IsisComponentProviderUsingInstallers extends IsisComponentProvider
*/
private static AppManifest appManifestIfAny(
final AppManifest appManifestFromConstructor,
- final InstallerLookup installerLookup) {
+ final IsisConfiguration configuration) {
if(appManifestFromConstructor != null) {
return appManifestFromConstructor;
}
- final IsisConfigurationDefault configuration = configurationFrom(installerLookup);
final String appManifestFromConfiguration = configuration.getString(SystemConstants.APP_MANIFEST_KEY);
return appManifestFromConfiguration != null
? InstanceUtil.createInstance(appManifestFromConfiguration, AppManifest.class)
: null;
}
-
//endregion
+ /**
+ * Looks up authorization and authentication implementations.
+ *
+ * Previously this class was used to lookup the top-level components of
+ * {@link IsisSystem} (persistence, authentication, authorization, reflector and so on),
+ * each being looked up from a file called <tt>installer-registry.properties</tt>.
+ * Of these responsibilities, only the support for authentication and authorization remains,
+ * the remainder have only a single implementation. The implementation has been
+ * substantially simplified.
+ *
+ * Note that it <i>is</i> possible to use other {@link Installer} implementations;
+ * just specify the {@link Installer}'s fully qualified class name.
+ *
+ * @deprecated - intention is to replace in future using CDI
+ */
+ @Deprecated
+ static class InstallerLookup implements ApplicationScopedComponent {
+
+ private static final Logger LOG = LoggerFactory.getLogger(InstallerLookup.class);
+
+ //region > constructor, fields
+
+ private final IsisConfiguration isisConfiguration;
+ private final List<Installer> installerList = Lists.newArrayList();
+
+ public InstallerLookup(final IsisConfiguration isisConfiguration) throws InstanceCreationException {
+ this.isisConfiguration = isisConfiguration;
+
+ final List<String> installerClassNames = Lists.newArrayList(
+ "org.apache.isis.core.security.authentication.BypassAuthenticationManagerInstaller", // bypass
+ "org.apache.isis.security.shiro.authentication.ShiroAuthenticationManagerInstaller", // shiro
+ "org.apache.isis.core.security.authorization.BypassAuthorizationManagerInstaller", // bypass
+ "org.apache.isis.security.shiro.authorization.ShiroAuthorizationManagerInstaller" // shiro
+ );
+
+ for (String className : installerClassNames) {
+ if (className.length() == 0 || className.startsWith("#")) {
+ continue;
+ }
+ try {
+ final Installer object = (Installer) InstanceUtil.createInstance(className, isisConfiguration);
+ LOG.debug("created component installer: " + object.getName() + " - " + className);
+ installerList.add(object);
+ } catch (final UnavailableClassException e) {
+ LOG.info("component installer not found; it will not be available: " + className);
+ } catch (final InstanceCreationClassException e) {
+ LOG.info("instance creation exception: " + e.getMessage());
+ }
+ }
+ }
- //region > helpers
+ //endregion
- private static IsisConfigurationDefault configurationFrom(final InstallerLookup installerLookup) {
- return installerLookup.getConfiguration();
- }
+ //region > framework
- //endregion
+ public AuthenticationManagerInstaller authenticationManagerInstaller(final String requested) {
+
+ return getInstaller(
+ AuthenticationManagerInstaller.class,
+ requested,
+ SystemConstants.AUTHENTICATION_INSTALLER_KEY,
+ SystemConstants.AUTHENTICATION_DEFAULT);
+ }
+
+ public AuthorizationManagerInstaller authorizationManagerInstaller(final String requested) {
+ return getInstaller(
+ AuthorizationManagerInstaller.class, requested,
+ SystemConstants.AUTHORIZATION_INSTALLER_KEY,
+ SystemConstants.AUTHORIZATION_DEFAULT);
+ }
+
+ //endregion
+
+ //region > helpers
+ @SuppressWarnings("unchecked")
+ private <T extends Installer> T getInstaller(final Class<T> cls, final String implName) {
+ Assert.assertNotNull("No name specified", implName);
+ for (final Installer installer : installerList) {
+ if (cls.isAssignableFrom(installer.getClass()) && installer.getName().equals(implName)) {
+ return (T) installer;
+ }
+ }
+ return (T) getInstaller(implName);
+ }
+
+ @SuppressWarnings("unchecked")
+ public Installer getInstaller(final String implClassName) {
+ try {
+ return ObjectExtensions.asT(InstanceUtil.createInstance(implClassName));
+ } catch (final UnavailableClassException e) {
+ return null;
+ }
+ }
+ private <T extends Installer> T getInstaller(
+ final Class<T> requiredType,
+ String reqImpl,
+ final String key,
+ final String defaultImpl) {
+ if (reqImpl == null) {
+ reqImpl = isisConfiguration.getString(key, defaultImpl);
+ }
+ if (reqImpl == null) {
+ return null;
+ }
+ final T installer = getInstaller(requiredType, reqImpl);
+ if (installer == null) {
+ throw new InstanceCreationException(
+ "Failed to load installer; named/class:'" + reqImpl + "' (of type " + requiredType.getName() + ")");
+ }
+ return installer;
+ }
+
+ //endregion
+ }
}
[04/50] [abbrv] isis git commit: ISIS-1428: removing
PersistenceMechanismInstaller and implementation, inlining code
Posted by da...@apache.org.
ISIS-1428: removing PersistenceMechanismInstaller and implementation, inlining code
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bcb5bc61
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bcb5bc61
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bcb5bc61
Branch: refs/heads/master
Commit: bcb5bc61db02a14056d6b023db6317c736eaceb7
Parents: d02540d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 8 06:58:18 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 8 06:58:18 2016 +0100
----------------------------------------------------------------------
.../integtestsupport/IsisSystemForTest.java | 19 -----
.../PersistenceMechanismInstaller.java | 7 --
.../isis/core/runtime/system/IsisSystem.java | 3 +-
.../core/runtime/system/SystemConstants.java | 11 ---
.../persistence/PersistenceSessionFactory.java | 9 +-
.../IsisComponentProvider.java | 13 ---
.../CreateSchemaObjectFromClassMetadata.java | 2 +-
...ataNucleusPersistenceMechanismInstaller.java | 88 --------------------
8 files changed, 8 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/bcb5bc61/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 2c0642c..15b61f9 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,6 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
@@ -53,7 +52,6 @@ import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.fixtures.FixturesInstaller;
import org.apache.isis.core.runtime.fixtures.FixturesInstallerDelegate;
-import org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstaller;
import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
import org.apache.isis.core.runtime.services.ServicesInstaller;
import org.apache.isis.core.runtime.services.ServicesInstallerFromAnnotation;
@@ -167,7 +165,6 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
private AppManifest appManifestIfAny;
private MetaModelValidator metaModelValidatorOverride;
- private ProgrammingModel programmingModelOverride;
private final List<Object> services = Lists.newArrayList();
private final List<InstallableFixture> fixtures = Lists.newArrayList();
@@ -181,27 +178,11 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
return this;
}
- /**
- * @deprecated - this is now a no-op because there is now only a single implementation of {@link PersistenceMechanismInstaller}, so this is redundant.
- */
- @Deprecated
- public Builder with(PersistenceMechanismInstaller persistenceMechanismInstaller) {
- return this;
- }
-
public Builder with(MetaModelValidator metaModelValidator) {
this.metaModelValidatorOverride = metaModelValidator;
return this;
}
- /**
- * @deprecated - this is now a no-op because there is now only a single implementation of {@link ProgrammingModel}, so this is redundant.
- */
- @Deprecated
- public Builder with(ProgrammingModel programmingModel) {
- return this;
- }
-
public Builder with(AuthenticationRequest authenticationRequest) {
this.authenticationRequest = authenticationRequest;
return this;
http://git-wip-us.apache.org/repos/asf/isis/blob/bcb5bc61/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java
index 15552b1..fb9ed27 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java
@@ -20,10 +20,7 @@
package org.apache.isis.core.runtime.installerregistry.installerapi;
import org.apache.isis.core.commons.components.Installer;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
/**
* Installs a {@link PersistenceSession} during system start up.
@@ -32,8 +29,4 @@ public interface PersistenceMechanismInstaller extends Installer {
static String TYPE = "persistor";
- PersistenceSessionFactory createPersistenceSessionFactory(
- final DeploymentCategory deploymentCategory,
- final ServicesInjector servicesInjector);
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/bcb5bc61/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 4e81765..0276e0e 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
@@ -167,8 +167,7 @@ public class IsisSystem implements ApplicationScopedComponent {
servicesInjector.addFallbackIfRequired(SpecificationLoader.class, specificationLoader);
// persistenceSessionFactory
- final PersistenceSessionFactory persistenceSessionFactory =
- componentProvider.providePersistenceSessionFactory(deploymentCategory, servicesInjector);
+ final PersistenceSessionFactory persistenceSessionFactory = new PersistenceSessionFactory(configuration);
servicesInjector.addFallbackIfRequired(PersistenceSessionFactory.class, persistenceSessionFactory);
// wire up components and components into services...
http://git-wip-us.apache.org/repos/asf/isis/blob/bcb5bc61/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
index b6402ae..efb231f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
@@ -41,17 +41,6 @@ public final class SystemConstants {
- /**
- * Key used to lookup {@link org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory persistor} in
- * {@link IsisConfiguration}, and root for any
- * {@link PersistenceMechanismInstaller persistor}-specific configuration
- * keys.
- *
- * @deprecated
- */
- @Deprecated
- public final static String OBJECT_PERSISTOR_INSTALLER_KEY = ConfigurationConstants.ROOT + PersistenceMechanismInstaller.TYPE;
-
/**
* Key used to lookup {@link AppManifest} (if any) from the {@link IsisConfiguration}.
http://git-wip-us.apache.org/repos/asf/isis/blob/bcb5bc61/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
index 90fcbc4..50d957e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
@@ -36,7 +36,6 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.persistence.FixturesInstalledFlag;
-import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller;
import org.apache.isis.objectstore.jdo.datanucleus.JDOStateManagerForIsis;
import org.apache.isis.objectstore.jdo.service.RegisterEntities;
@@ -65,6 +64,10 @@ public class PersistenceSessionFactory implements ApplicationScopedComponent, Fi
//region > init, createDataNucleusApplicationComponents
+ public static final String JDO_OBJECTSTORE_CONFIG_PREFIX = "isis.persistor.datanucleus"; // specific to the JDO objectstore
+ public static final String DATANUCLEUS_CONFIG_PREFIX = "isis.persistor.datanucleus.impl"; // reserved for datanucleus' own config props
+
+
private DataNucleusApplicationComponents applicationComponents;
@Programmatic
@@ -78,9 +81,9 @@ public class PersistenceSessionFactory implements ApplicationScopedComponent, Fi
if (applicationComponents == null || applicationComponents.isStale()) {
final IsisConfiguration jdoObjectstoreConfig = configuration.createSubset(
- DataNucleusPersistenceMechanismInstaller. JDO_OBJECTSTORE_CONFIG_PREFIX);
+ JDO_OBJECTSTORE_CONFIG_PREFIX);
- final IsisConfiguration dataNucleusConfig = configuration.createSubset(DataNucleusPersistenceMechanismInstaller.DATANUCLEUS_CONFIG_PREFIX);
+ final IsisConfiguration dataNucleusConfig = configuration.createSubset(DATANUCLEUS_CONFIG_PREFIX);
final Map<String, String> datanucleusProps = dataNucleusConfig.asMap();
addDataNucleusPropertiesIfRequired(datanucleusProps);
http://git-wip-us.apache.org/repos/asf/isis/blob/bcb5bc61/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
index 6cd91ce..7c35995 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
@@ -56,13 +56,10 @@ import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.fixtures.FixturesInstaller;
import org.apache.isis.core.runtime.fixtures.FixturesInstallerFromConfiguration;
-import org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstaller;
import org.apache.isis.core.runtime.services.ServicesInstallerFromAnnotation;
import org.apache.isis.core.runtime.services.ServicesInstallerFromConfiguration;
import org.apache.isis.core.runtime.system.IsisSystemException;
import org.apache.isis.core.runtime.system.SystemConstants;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
-import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller;
import org.apache.isis.objectstore.jdo.service.RegisterEntities;
import org.apache.isis.progmodels.dflt.JavaReflectorInstaller;
@@ -276,16 +273,6 @@ public abstract class IsisComponentProvider {
return reflectorInstaller.createReflector(deploymentCategory, metaModelRefiners, servicesInjector);
}
- public PersistenceSessionFactory providePersistenceSessionFactory(
- final DeploymentCategory deploymentCategory,
- final ServicesInjector servicesInjector) {
- final PersistenceMechanismInstaller persistenceMechanismInstaller =
- new DataNucleusPersistenceMechanismInstaller(getConfiguration());
-
- return persistenceMechanismInstaller.createPersistenceSessionFactory(
- deploymentCategory, servicesInjector);
- }
-
//endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/bcb5bc61/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java
index 317ffc7..b5fe0ea 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/CreateSchemaObjectFromClassMetadata.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
*/
public class CreateSchemaObjectFromClassMetadata implements MetaDataListener, DataNucleusPropertiesAware {
- private static final Logger LOG = LoggerFactory.getLogger(DataNucleusPersistenceMechanismInstaller.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CreateSchemaObjectFromClassMetadata.class);
//region > persistenceManagerFactory, properties
http://git-wip-us.apache.org/repos/asf/isis/blob/bcb5bc61/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
deleted file mode 100644
index f5d9850..0000000
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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.objectstore.jdo.datanucleus;
-
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.isis.core.commons.components.InstallerAbstract;
-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.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstaller;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
-
-/**
- * With respect to configuration, all properties under {@value #DATANUCLEUS_CONFIG_PREFIX} prefix are passed
- * through verbatim to the DataNucleus runtime. For example:
- * <table>
- * <tr><th>Isis Property</th><th>DataNucleus Property</th></tr>
- * <tr><td><tt>isis.persistor.datanucleus.impl.datanucleus.foo.Bar</tt></td><td><tt>datanucleus.foo.Bar</tt></td></tr>
- * </table>
- *
- */
-public class DataNucleusPersistenceMechanismInstaller extends InstallerAbstract implements PersistenceMechanismInstaller {
-
- private static final Logger LOG = LoggerFactory.getLogger(DataNucleusPersistenceMechanismInstaller.class);
-
- public static final String NAME = "datanucleus";
-
- public static final String JDO_OBJECTSTORE_CONFIG_PREFIX = "isis.persistor.datanucleus"; // specific to the JDO objectstore
- public static final String DATANUCLEUS_CONFIG_PREFIX = "isis.persistor.datanucleus.impl"; // reserved for datanucleus' own config props
-
- /**
- * @deprecated - this will be ignored...
- */
- @Deprecated
- public DataNucleusPersistenceMechanismInstaller() {
- super(PersistenceMechanismInstaller.TYPE, NAME, null);
- }
-
- public DataNucleusPersistenceMechanismInstaller(final IsisConfigurationDefault isisConfiguration) {
- super(PersistenceMechanismInstaller.TYPE, NAME, isisConfiguration);
- }
-
- //region > createPersistenceSessionFactory
- @Override
- public PersistenceSessionFactory createPersistenceSessionFactory(
- final DeploymentCategory deploymentCategory,
- final ServicesInjector servicesInjector) {
-
- return new PersistenceSessionFactory(getConfiguration());
- }
- //endregion
-
- //region > dependencies
-
- protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSpecificationLoader();
- }
-
- //endregion
-
- @Override
- public List<Class<?>> getTypes() {
- return listOf(PersistenceSessionFactory.class);
- }
-
-}
[49/50] [abbrv] isis git commit: ISIS-1444: marks
FixtureScript.Execution methods as @Programmatic
Posted by da...@apache.org.
ISIS-1444: marks FixtureScript.Execution methods as @Programmatic
So that these are excluded from the metamodel (eg those beginning with
reserved words, such as clearXxx())
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/90828ab1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/90828ab1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/90828ab1
Branch: refs/heads/master
Commit: 90828ab11bec20137d27871e1fe2e1058b96250f
Parents: 3bae84e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jun 16 10:44:05 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jun 16 10:44:24 2016 +0100
----------------------------------------------------------------------
.../applib/fixturescripts/FixtureScript.java | 52 +++++++++++++++++++-
1 file changed, 50 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/90828ab1/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
index b905ebc..7cfa308 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
@@ -307,148 +307,182 @@ public abstract class FixtureScript
return ExecutionParameters.asKeyValueMap(parameters);
}
+ @Programmatic
public String getParameters() {
return executionParameters.getParameters();
}
+ @Programmatic
public Map<String,String> getParameterMap() {
return executionParameters.getParameterMap();
}
+ @Programmatic
public String getParameter(final String parameterName) {
return executionParameters.getParameter(parameterName);
}
+ @Programmatic
public <T> T getParameterAsT(final String parameterName, final Class<T> cls) {
return executionParameters.getParameterAsT(parameterName,cls);
}
+ @Programmatic
public Boolean getParameterAsBoolean(final String parameterName) {
return executionParameters.getParameterAsBoolean(parameterName);
}
+ @Programmatic
public Byte getParameterAsByte(final String parameterName) {
return executionParameters.getParameterAsByte(parameterName);
}
+ @Programmatic
public Short getParameterAsShort(final String parameterName) {
return executionParameters.getParameterAsShort(parameterName);
}
+ @Programmatic
public Integer getParameterAsInteger(final String parameterName) {
return executionParameters.getParameterAsInteger(parameterName);
}
+ @Programmatic
public Long getParameterAsLong(final String parameterName) {
return executionParameters.getParameterAsLong(parameterName);
}
+ @Programmatic
public Float getParameterAsFloat(final String parameterName) {
return executionParameters.getParameterAsFloat(parameterName);
}
+ @Programmatic
public Double getParameterAsDouble(final String parameterName) {
return executionParameters.getParameterAsDouble(parameterName);
}
+ @Programmatic
public Character getParameterAsCharacter(final String parameterName) {
return executionParameters.getParameterAsCharacter(parameterName);
}
+ @Programmatic
public BigInteger getParameterAsBigInteger(final String parameterName) {
return executionParameters.getParameterAsBigInteger(parameterName);
}
+ @Programmatic
public BigDecimal getParameterAsBigDecimal(final String parameterName) {
return executionParameters.getParameterAsBigDecimal(parameterName);
}
+ @Programmatic
public LocalDate getParameterAsLocalDate(final String parameterName) {
return executionParameters.getParameterAsLocalDate(parameterName);
}
+ @Programmatic
public LocalDateTime getParameterAsLocalDateTime(final String parameterName) {
return executionParameters.getParameterAsLocalDateTime(parameterName);
}
+ @Programmatic
public <T extends Enum<T>> T getParameterAsEnum(final String parameterName, final Class<T> enumClass) {
return executionParameters.getParameterAsEnum(parameterName, enumClass);
}
-
+ @Programmatic
public void setParameterIfNotPresent(final String parameterName, final String parameterValue) {
executionParameters.setParameterIfNotPresent(parameterName, parameterValue);
}
+ @Programmatic
public void setParameter(final String parameterName, final Boolean parameterValue) {
executionParameters.setParameter(parameterName, parameterValue);
}
+ @Programmatic
public void setParameter(final String parameterName, final Byte parameterValue) {
executionParameters.setParameter(parameterName, parameterValue);
}
+ @Programmatic
public void setParameter(final String parameterName, final Short parameterValue) {
executionParameters.setParameter(parameterName, parameterValue);
}
+ @Programmatic
public void setParameter(final String parameterName, final Integer parameterValue) {
executionParameters.setParameter(parameterName, parameterValue);
}
+ @Programmatic
public void setParameter(final String parameterName, final Long parameterValue) {
executionParameters.setParameter(parameterName, parameterValue);
}
+ @Programmatic
public void setParameter(final String parameterName, final Float parameterValue) {
executionParameters.setParameter(parameterName, parameterValue);
}
+ @Programmatic
public void setParameter(final String parameterName, final Double parameterValue) {
executionParameters.setParameter(parameterName, parameterValue);
}
+ @Programmatic
public void setParameter(final String parameterName, final Character parameterValue) {
executionParameters.setParameter(parameterName, parameterValue);
}
+ @Programmatic
public void setParameter(final String parameterName, final BigInteger parameterValue) {
executionParameters.setParameter(parameterName, parameterValue);
}
+ @Programmatic
public void setParameter(final String parameterName, final java.util.Date parameterValue) {
executionParameters.setParameter(parameterName, parameterValue);
}
+ @Programmatic
public void setParameter(final String parameterName, final java.sql.Date parameterValue) {
executionParameters.setParameter(parameterName, parameterValue);
}
+ @Programmatic
public void setParameter(final String parameterName, final LocalDate parameterValue) {
executionParameters.setParameter(parameterName, parameterValue);
}
+ @Programmatic
public void setParameter(final String parameterName, final LocalDateTime parameterValue) {
executionParameters.setParameter(parameterName, parameterValue);
}
+ @Programmatic
public void setParameter(final String parameterName, final org.joda.time.DateTime parameterValue) {
executionParameters.setParameter(parameterName, parameterValue);
}
+ @Programmatic
public void setParameter(final String parameterName, final BigDecimal parameterValue) {
executionParameters.setParameter(parameterName, parameterValue);
}
+ @Programmatic
public void setParameter(final String parameterName, final Enum<?> parameterValue) {
executionParameters.setParameter(parameterName, parameterValue);
}
+ @Programmatic
public void setParameter(final String parameterName, final String parameterValue) {
executionParameters.setParameter(parameterName, parameterValue);
}
-
+ @Programmatic
public List<FixtureResult> getResults() {
return fixtureResultList.getResults();
}
@@ -457,10 +491,12 @@ public abstract class FixtureScript
* @deprecated - use {@link #addResult(FixtureScript, Object)} instead.
*/
@Deprecated
+ @Programmatic
public <T> T add(final FixtureScript script, final T object) {
return addResult(script, object);
}
+ @Programmatic
public <T> T addResult(final FixtureScript script, final T object) {
fixtureResultList.add(script, object);
return object;
@@ -469,16 +505,19 @@ public abstract class FixtureScript
/**
* @deprecated - use {@link #addResult(FixtureScript, String, Object)} instead.
*/
+ @Programmatic
@Deprecated
public <T> T add(final FixtureScript script, final String key, final T object) {
return addResult(script, key, object);
}
+ @Programmatic
public <T> T addResult(final FixtureScript script, final String key, final T object) {
fixtureResultList.add(script, key, object);
return object;
}
+ @Programmatic
public <T> T lookup(final String key, final Class<T> cls) {
return fixtureResultList.lookup(key, cls);
}
@@ -488,6 +527,7 @@ public abstract class FixtureScript
* that are {@link org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
* uses a key that is derived from the fixture's class name.
*/
+ @Programmatic
public void executeChild(final FixtureScript callingFixtureScript, final FixtureScript childFixtureScript) {
executeChildT(callingFixtureScript, childFixtureScript);
}
@@ -499,6 +539,7 @@ public abstract class FixtureScript
*
* @return the child fixture script.
*/
+ @Programmatic
public <T extends FixtureScript> T executeChildT(final FixtureScript callingFixtureScript, final T childFixtureScript) {
return executeChildT(callingFixtureScript, null, childFixtureScript);
}
@@ -508,6 +549,7 @@ public abstract class FixtureScript
* that are {@link org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext#addResult(FixtureScript, Object)} added),
* uses a key that overriding the default name of the fixture script with one more meaningful in the context of this fixture.
*/
+ @Programmatic
public void executeChild(final FixtureScript callingFixtureScript, final String localNameOverride, final FixtureScript childFixtureScript) {
executeChildT(callingFixtureScript, localNameOverride, childFixtureScript);
@@ -520,6 +562,7 @@ public abstract class FixtureScript
*
* @return the child fixture script.
*/
+ @Programmatic
public <T extends FixtureScript> T executeChildT(final FixtureScript callingFixtureScript, final String localNameOverride, final T childFixtureScript) {
childFixtureScript.setParentPath(callingFixtureScript.pathWith(""));
@@ -544,6 +587,7 @@ public abstract class FixtureScript
* @deprecated - should not be called directly, but has <code>public</code> visibility so there is scope for confusion. Replaced by method with private visibility.
*/
@Deprecated
+ @Programmatic
public void executeIfNotAlready(final FixtureScript fixtureScript) {
executeChildIfNotAlready(fixtureScript);
}
@@ -631,6 +675,7 @@ public abstract class FixtureScript
private int traceHighwatermark = 40;
private PrintStream tracePrintStream;
+ @Programmatic
public ExecutionContext withTracing(final PrintStream tracePrintStream) {
this.tracePrintStream = tracePrintStream;
return this;
@@ -672,12 +717,15 @@ public abstract class FixtureScript
private Map<Class, Object> userData = Maps.newHashMap();
+ @Programmatic
public void setUserData(final Object object) {
userData.put(object.getClass(), object);
}
+ @Programmatic
public <T> T getUserData(final Class<T> cls) {
return (T) userData.get(cls);
}
+ @Programmatic
public <T> T clearUserData(final Class<T> cls) {
return (T) userData.remove(cls);
}
[41/50] [abbrv] isis git commit: ISIS-1291: adds @Programmatic where
necessary for new and internal domain services
Posted by da...@apache.org.
ISIS-1291: adds @Programmatic where necessary for new and internal domain services
... so that this stuff isn't unnecessarily loaded into themetamodel.
In a similar vein, aAlso change IsisConfiguration so that it doesn't implement Iterable, because otherwise the default interface methods (spliterator, forEach) show up in the metamodel. Instead, extend to provide an "asIterable()" method.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e2e206c3
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e2e206c3
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e2e206c3
Branch: refs/heads/master
Commit: e2e206c3e5e4e21a9c19864bef7417aacfe58945
Parents: 51143d1
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 15 16:37:29 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 15 16:40:11 2016 +0100
----------------------------------------------------------------------
.../applib/fixturescripts/FixtureScript.java | 6 ++--
.../isis/applib/services/iactn/Interaction.java | 29 ++++++++++++++++++--
.../core/commons/config/IsisConfiguration.java | 29 +++++++++++++++++---
.../config/IsisConfigurationDefault.java | 18 ++++++++----
.../metamodel/facetapi/MetaModelRefiner.java | 4 ++-
.../ConfigurationServiceInternal.java | 3 ++
.../PersistenceSessionServiceInternal.java | 4 +--
.../persistence/PersistenceSessionFactory.java | 1 +
.../system/session/IsisSessionFactory.java | 1 +
.../scenarios/RecreateSimpleObjects.java | 2 ++
10 files changed, 80 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
index 08a1d3f..b905ebc 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScript.java
@@ -176,7 +176,7 @@ public abstract class FixtureScript
* Will always be populated, initially by the default name, but can be
* {@link #setLocalName(String) overridden}.
*/
- @PropertyLayout(hidden = Where.EVERYWHERE)
+ @Programmatic
public String getLocalName() {
return localName;
}
@@ -235,7 +235,7 @@ public abstract class FixtureScript
* {@link FixtureScript}s are {@link Discoverability#NON_DISCOVERABLE not}. This can be overridden in the
* constructor, however or by calling the {@link #withDiscoverability(org.apache.isis.applib.fixturescripts.FixtureScript.Discoverability) setter}.
*/
- @PropertyLayout(hidden = Where.EVERYWHERE)
+ @Programmatic
public boolean isDiscoverable() {
return discoverability == Discoverability.DISCOVERABLE;
}
@@ -784,6 +784,7 @@ public abstract class FixtureScript
/**
* Use instead {@link org.apache.isis.applib.fixturescripts.FixtureScript.ExecutionContext#lookup(String, Class)} directly.
*/
+ @Programmatic
@Deprecated
public <T> T lookup(final String key, final Class<T> cls) {
if(executionContext == null) {
@@ -866,6 +867,7 @@ public abstract class FixtureScript
//region > (legacy) InstallableFixture impl
@Override
+ @Programmatic
public FixtureType getType() {
return FixtureType.DOMAIN_OBJECTS;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
index 92ca09c..25a1e45 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
@@ -27,8 +27,6 @@ import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.inject.Inject;
-
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -85,11 +83,13 @@ public class Interaction implements HasTransactionId {
private UUID transactionId;
+ @Programmatic
@Override
public UUID getTransactionId() {
return transactionId;
}
+ @Programmatic
@Override
public void setTransactionId(final UUID transactionId) {
this.transactionId = transactionId;
@@ -106,6 +106,7 @@ public class Interaction implements HasTransactionId {
/**
* The execution that preceded the current one.
*/
+ @Programmatic
public Execution getPriorExecution() {
return priorExecution;
}
@@ -118,6 +119,7 @@ public class Interaction implements HasTransactionId {
* by which the framework actually performs the interaction.
*/
public interface MemberExecutor<T extends Execution> {
+ @Programmatic
Object execute(final T currentExecution);
}
@@ -129,6 +131,7 @@ public class Interaction implements HasTransactionId {
* {@link ActionInvocation} capturing the details of said action.
* </p>
*/
+ @Programmatic
public Object execute(
final MemberExecutor<ActionInvocation> memberExecutor,
final ActionInvocation actionInvocation) {
@@ -146,6 +149,7 @@ public class Interaction implements HasTransactionId {
* {@link PropertyEdit} capturing the details of said property edit.
* </p>
*/
+ @Programmatic
public Object execute(
final MemberExecutor<PropertyEdit> memberExecutor,
final PropertyEdit propertyEdit) {
@@ -355,14 +359,17 @@ public class Interaction implements HasTransactionId {
//region > via constructor: interaction, interactionType, memberId, target, targetMember, targetClass
+ @Programmatic
public Interaction getInteraction() {
return interaction;
}
+ @Programmatic
public InteractionType getInteractionType() {
return interactionType;
}
+ @Programmatic
public String getMemberIdentifier() {
return memberIdentifier;
}
@@ -371,6 +378,7 @@ public class Interaction implements HasTransactionId {
* The target of the action invocation. If this interaction is for a mixin action, then will be the
* mixed-in target (not the transient mixin itself).
*/
+ @Programmatic
public Object getTarget() {
return target;
}
@@ -378,6 +386,7 @@ public class Interaction implements HasTransactionId {
/**
* A human-friendly description of the class of the target object.
*/
+ @Programmatic
public String getTargetClass() {
return targetClass;
}
@@ -385,6 +394,7 @@ public class Interaction implements HasTransactionId {
/**
* The human-friendly name of the action invoked/property edited on the target object.
*/
+ @Programmatic
public String getTargetMember() {
return targetMember;
}
@@ -399,6 +409,7 @@ public class Interaction implements HasTransactionId {
/**
* The action/property that invoked this action/property edit (if any).
*/
+ @Programmatic
public Execution<?,?> getParent() {
return parent;
}
@@ -406,6 +417,7 @@ public class Interaction implements HasTransactionId {
/**
* <b>NOT API</b>: intended to be called only by the framework.
*/
+ @Programmatic
public void setParent(final Execution<?,?> parent) {
this.parent = parent;
if(parent != null) {
@@ -416,6 +428,7 @@ public class Interaction implements HasTransactionId {
/**
* The actions/property edits made in turn via the {@link WrapperFactory}.
*/
+ @Programmatic
public List<Execution<?,?>> getChildren() {
return Collections.unmodifiableList(children);
}
@@ -435,6 +448,7 @@ public class Interaction implements HasTransactionId {
* {@link AbstractDomainEvent.Phase#EXECUTING executing} phase.
* </p>
*/
+ @Programmatic
public E getEvent() {
return event;
}
@@ -442,6 +456,7 @@ public class Interaction implements HasTransactionId {
/**
* <b>NOT API</b>: intended to be called only by the framework.
*/
+ @Programmatic
public void setEvent(final E event) {
this.event = event;
}
@@ -455,10 +470,12 @@ public class Interaction implements HasTransactionId {
/**
* The date/time at which this execution started.
*/
+ @Programmatic
public Timestamp getStartedAt() {
return startedAt;
}
+ @Programmatic
public void setStartedAt(final Timestamp startedAt) {
syncMetrics(When.BEFORE, startedAt);
}
@@ -467,6 +484,7 @@ public class Interaction implements HasTransactionId {
/**
* The date/time at which this execution completed.
*/
+ @Programmatic
public Timestamp getCompletedAt() {
return completedAt;
}
@@ -494,6 +512,7 @@ public class Interaction implements HasTransactionId {
* For <tt>void</tt> methods and for actions returning collections, the value
* will be <tt>null</tt>.
*/
+ @Programmatic
public Object getReturned() {
return returned;
}
@@ -501,6 +520,7 @@ public class Interaction implements HasTransactionId {
/**
* <b>NOT API</b>: intended to be called only by the framework.
*/
+ @Programmatic
public void setReturned(Object returned) {
this.returned = returned;
}
@@ -514,6 +534,7 @@ public class Interaction implements HasTransactionId {
/**
* <b>NOT API</b>: intended to be called only by the framework.
*/
+ @Programmatic
public void setThrew(Exception threw) {
this.threw = threw;
}
@@ -534,6 +555,7 @@ public class Interaction implements HasTransactionId {
* {@link Execution#getReturned()}) will (obviously) still be null.
* </p>
*/
+ @Programmatic
public T getDto() {
return dto;
}
@@ -541,6 +563,7 @@ public class Interaction implements HasTransactionId {
/**
* Set by framework (implementation of {@link MemberExecutor})
*/
+ @Programmatic
public void setDto(final T executionDto) {
this.dto = executionDto;
}
@@ -649,6 +672,7 @@ public class Interaction implements HasTransactionId {
this.args = args;
}
+ @Programmatic
public List<Object> getArgs() {
return args;
}
@@ -669,6 +693,7 @@ public class Interaction implements HasTransactionId {
this.newValue = newValue;
}
+ @Programmatic
public Object getNewValue() {
return newValue;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfiguration.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfiguration.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfiguration.java
index 12a0c11..9530a66 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfiguration.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfiguration.java
@@ -24,6 +24,7 @@ import java.awt.Font;
import java.util.Iterator;
import java.util.Map;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
import org.apache.isis.core.commons.resource.ResourceStreamSource;
@@ -42,7 +43,7 @@ import org.apache.isis.core.commons.resource.ResourceStreamSource;
* Thus the {@link IsisConfiguration} held by different components may vary, but
* with each being a possible superset of the previous.
*/
-public interface IsisConfiguration extends Iterable<String>, ApplicationScopedComponent {
+public interface IsisConfiguration extends ApplicationScopedComponent {
/**
* Creates a new IsisConfiguration containing the properties starting with
@@ -52,6 +53,7 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
*
* @see #getProperties(String)
*/
+ @Programmatic
IsisConfiguration createSubset(String prefix);
/**
@@ -62,6 +64,7 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
* @param name
* the property name
*/
+ @Programmatic
boolean getBoolean(String name);
/**
@@ -74,6 +77,7 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
* @param defaultValue
* the value to use as a default
*/
+ @Programmatic
boolean getBoolean(String name, boolean defaultValue);
/**
@@ -83,6 +87,7 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
* @param name
* the property name
*/
+ @Programmatic
Color getColor(String name);
/**
@@ -94,6 +99,7 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
* @param defaultValue
* the value to use as a default
*/
+ @Programmatic
Color getColor(String name, Color defaultValue);
/**
@@ -103,6 +109,7 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
* @param name
* the property name
*/
+ @Programmatic
Font getFont(String name);
/**
@@ -114,6 +121,7 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
* @param defaultValue
* the color to use as a default
*/
+ @Programmatic
Font getFont(String name, Font defaultValue);
/**
@@ -123,12 +131,14 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
* <p>
* If there is no matching property then returns an empty array.
*/
+ @Programmatic
String[] getList(String name);
/**
* Returns a list of entries for the single configuration property with the
* specified name.
*/
+ @Programmatic
String[] getList(String name, String defaultListAsCommaSeparatedArray);
/**
@@ -138,6 +148,7 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
* @param name
* the property name
*/
+ @Programmatic
int getInteger(String name);
/**
@@ -149,6 +160,7 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
* @param defaultValue
* the value to use as a default
*/
+ @Programmatic
int getInteger(String name, int defaultValue);
/**
@@ -160,39 +172,48 @@ public interface IsisConfiguration extends Iterable<String>, ApplicationScopedCo
*
* @see #createSubset(String)
*/
+ @Programmatic
IsisConfiguration getProperties(String withPrefix);
/**
* Returns the configuration property with the specified name. If there is
* no matching property then null is returned.
*/
+ @Programmatic
String getString(String name);
+ @Programmatic
String getString(String name, String defaultValue);
+ @Programmatic
boolean hasProperty(String name);
+ @Programmatic
boolean isEmpty();
/**
* Iterates over the property names of this configuration.
*/
- @Override
+ @Programmatic
Iterator<String> iterator();
+ @Programmatic
+ Iterable<String> asIterable();
+
+ @Programmatic
int size();
/**
* The {@link ResourceStreamSource} that was used to build this
* configuration.
- *
- * @see IsisConfigurationBuilder#getResourceStreamSource()
*/
+ @Programmatic
ResourceStreamSource getResourceStreamSource();
/**
* A mutable copy of the current set of properties (name/values) held in this configuration.
*/
+ @Programmatic
Map<String, String> asMap();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
index d671c76..011c37d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
@@ -34,10 +34,11 @@ import com.google.common.collect.Maps;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.resource.ResourceStreamSource;
-import org.apache.isis.core.metamodel.services.configinternal.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.configinternal.ConfigurationServiceInternal;
/**
* This object will typically be registered as the implementation of the {@link ConfigurationServiceInternal}
@@ -111,6 +112,7 @@ public class IsisConfigurationDefault implements ConfigurationServiceInternal {
/**
* Add the properties from an existing Properties object.
*/
+ @Programmatic
public void add(final Properties properties, final ContainsPolicy containsPolicy) {
for(Object key: properties.keySet()) {
Object value = properties.get(key);
@@ -125,6 +127,7 @@ public class IsisConfigurationDefault implements ConfigurationServiceInternal {
* @see #addPerPolicy(String, String, ContainsPolicy)
* @see #put(String, String)
*/
+ @Programmatic
public void add(final String key, final String value) {
addPerPolicy(key, value, ContainsPolicy.IGNORE);
}
@@ -136,6 +139,7 @@ public class IsisConfigurationDefault implements ConfigurationServiceInternal {
* @see #add(String, String)
* @see #addPerPolicy(String, String, ContainsPolicy)
*/
+ @Programmatic
public void put(final String key, final String value) {
addPerPolicy(key, value, ContainsPolicy.OVERWRITE);
}
@@ -419,7 +423,12 @@ public class IsisConfigurationDefault implements ConfigurationServiceInternal {
@Override
public Iterator<String> iterator() {
- return properties.stringPropertyNames().iterator();
+ return asIterable().iterator();
+ }
+
+ @Override
+ public Iterable<String> asIterable() {
+ return properties.stringPropertyNames();
}
/**
@@ -448,7 +457,7 @@ public class IsisConfigurationDefault implements ConfigurationServiceInternal {
@Override
public Map<String,String> asMap() {
final Map<String, String> map = Maps.newHashMap();
- for(String propertyName: this) {
+ for(String propertyName: this.asIterable()) {
final String propertyValue = this.getPropertyElseNull(propertyName);
map.put(propertyName, propertyValue);
}
@@ -472,7 +481,7 @@ public class IsisConfigurationDefault implements ConfigurationServiceInternal {
private Properties deriveApplicationProperties() {
final Properties applicationProperties = new Properties();
final IsisConfiguration applicationConfiguration = getProperties("application");
- for (final String key : applicationConfiguration) {
+ for (final String key : applicationConfiguration.asIterable()) {
final String value = applicationConfiguration.getString(key);
final String newKey = key.substring("application.".length());
applicationProperties.setProperty(newKey, value);
@@ -492,5 +501,4 @@ public class IsisConfigurationDefault implements ConfigurationServiceInternal {
}
//endregion
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MetaModelRefiner.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MetaModelRefiner.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MetaModelRefiner.java
index 541795f..7e9320b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MetaModelRefiner.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facetapi/MetaModelRefiner.java
@@ -19,6 +19,7 @@
package org.apache.isis.core.metamodel.facetapi;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
@@ -31,7 +32,8 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
* @see MetaModelValidatorRefiner
*/
public interface MetaModelRefiner extends MetaModelValidatorRefiner {
-
+
+ @Programmatic
void refineProgrammingModel(ProgrammingModel programmingModel, IsisConfiguration configuration);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/configinternal/ConfigurationServiceInternal.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/configinternal/ConfigurationServiceInternal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/configinternal/ConfigurationServiceInternal.java
index cbb8be4..499c07e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/configinternal/ConfigurationServiceInternal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/configinternal/ConfigurationServiceInternal.java
@@ -18,12 +18,15 @@ package org.apache.isis.core.metamodel.services.configinternal;
import java.util.List;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.config.IsisConfiguration;
public interface ConfigurationServiceInternal extends IsisConfiguration {
+ @Programmatic
String getProperty(String name);
+ @Programmatic
List<String> getPropertyNames();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
index 87c289a..d1e5853 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/persistsession/PersistenceSessionServiceInternal.java
@@ -109,6 +109,7 @@ public interface PersistenceSessionServiceInternal extends AdapterManager {
@Programmatic
void commit();
+ @Programmatic
Transaction currentTransaction();
//endregion
@@ -160,7 +161,4 @@ public interface PersistenceSessionServiceInternal extends AdapterManager {
//endregion
-
-
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
index 8d45740..d5e1118 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
@@ -157,6 +157,7 @@ public class PersistenceSessionFactory implements ApplicationScopedComponent, Fi
//endregion
//region > shutdown
+ @Programmatic
public final void shutdown() {
// no-op
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/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 b81ec1d..80bc088 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
@@ -228,6 +228,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
* {@link DeploymentType#SERVER_PROTOTYPE prototype} deployments (saves logging
* in). Should be <i>ignored</i> in other {@link DeploymentType}s.
*/
+ @Programmatic
public LogonFixture getLogonFixture() {
return logonFixture;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/e2e206c3/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java b/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
index 55b9045..944ace7 100644
--- a/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
+++ b/example/application/simpleapp/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
@@ -25,6 +25,7 @@ import java.util.List;
import com.google.common.collect.Lists;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.fixturescripts.FixtureScript;
import domainapp.dom.simple.SimpleObject;
@@ -62,6 +63,7 @@ public class RecreateSimpleObjects extends FixtureScript {
/**
* The simpleobjects created by this fixture (output).
*/
+ @Programmatic
public List<SimpleObject> getSimpleObjects() {
return simpleObjects;
}
[36/50] [abbrv] isis git commit: ISIS-1256: adds capability to use a
configured encryption key for 'rememberMe'.
Posted by da...@apache.org.
ISIS-1256: adds capability to use a configured encryption key for 'rememberMe'.
We don't actually use Shiro's 'rememberMe' capability, instead it is baked
into the Wicket login page we subclass from. But the vulnerability in that
Shiro ticket would also seem to be there for Wicket, so this commit adds
the capability to allow the developer to specify their own (private)
encryption key - and will use a different random key each time the app is
restarted otherwise
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e944de3b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e944de3b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e944de3b
Branch: refs/heads/master
Commit: e944de3b2352bad4dd78113d1f1a3b2a0a2d54a5
Parents: df8cad2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 15 04:32:28 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 15 04:32:28 2016 +0100
----------------------------------------------------------------------
.../guides/_ugvw_configuration-properties.adoc | 21 ++++++++++++
.../wicket/viewer/IsisWicketApplication.java | 34 ++++++++++++++++++++
.../webapp/WEB-INF/viewer_wicket.properties | 20 ++++++++++++
3 files changed, 75 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e944de3b/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc
index 11d7a4c..0c08bdb 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc
@@ -115,6 +115,27 @@ for further details).
| Ignored for 1.8.0+; in earlier versions forced regular case rather than title case in the UI
|`isis.viewer.wicket.` +
+`rememberMe.cookieKey`
+| ascii chars (`_isisWicketRememberMe_`)
+| (`1.13.0-SNAPSHOT`) Cookie key holding the (encrypted) 'rememberMe' user/password. There is generally no need to
+change this. +
+
+Valid values as per link:http://stackoverflow.com/a/1969339/56880[this StackOverflow answer].
+
+|`isis.viewer.wicket.` +
+`rememberMe.encryptionKey`
+| any string (a random UUID each time)
+| (`1.13.0-SNAPSHOT`) Encryption key is used to encrypt the rememberMe user/password. +
+
+It should be set to a unique and private value. If a hard-coded and publicly known value is used, then it would be
+possible for rememberMe user/password to be intercepted and decrypted, compromising access.
+
+If no value is set then (for safety) a random UUID will be used as the encryption key. The net effect of this
+default is that 'rememberMe' will work, but only until the webapp is restarted (after which the end-user will have
+to log in again).
+
+
+|`isis.viewer.wicket.` +
`stripWicketTags`
| `true`,`false` (`_true_`)
| Whether to force Wicket tags to be stripped in prototype/development mode. See discussion xref:ugvw.adoc#_ugvw_configuration-properties_stripped-wicket-tags[below].
http://git-wip-us.apache.org/repos/asf/isis/blob/e944de3b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index a591de7..46ed84d 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.List;
import java.util.ServiceLoader;
import java.util.Set;
+import java.util.UUID;
import com.google.common.base.Function;
import com.google.common.collect.Lists;
@@ -37,6 +38,8 @@ import org.apache.wicket.IConverterLocator;
import org.apache.wicket.Page;
import org.apache.wicket.RuntimeConfigurationType;
import org.apache.wicket.SharedResources;
+import org.apache.wicket.authentication.IAuthenticationStrategy;
+import org.apache.wicket.authentication.strategy.DefaultAuthenticationStrategy;
import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.core.request.mapper.MountedMapper;
@@ -141,6 +144,9 @@ public class IsisWicketApplication
private static final String WICKET_SOURCE_PLUGIN_KEY = "isis.viewer.wicket.wicketSourcePlugin";
private static final boolean WICKET_SOURCE_PLUGIN_DEFAULT = false;
+ private static final String WICKET_REMEMBER_ME_COOKIE_KEY = "isis.viewer.wicket.rememberMe.cookieKey";
+ private static final String WICKET_REMEMBER_ME_COOKIE_KEY_DEFAULT = "isisWicketRememberMe";
+ private static final String WICKET_REMEMBER_ME_ENCRYPTION_KEY = "isis.viewer.wicket.rememberMe.encryptionKey";
private final IsisLoggingConfigurer loggingConfigurer = new IsisLoggingConfigurer();
@@ -279,6 +285,8 @@ public class IsisWicketApplication
this.getMarkupSettings().setStripWicketTags(determineStripWicketTags(configuration));
+ configureSecurity(configuration);
+
getDebugSettings().setAjaxDebugModeEnabled(determineAjaxDebugModeEnabled(configuration));
// must be done after injected componentFactoryRegistry into the app itself
@@ -310,6 +318,32 @@ public class IsisWicketApplication
}
}
+ /**
+ * protected visibility to allow ad-hoc overriding of some other authentication strategy.
+ */
+ protected void configureSecurity(final IsisConfiguration configuration) {
+ getSecuritySettings().setAuthenticationStrategy(newAuthenticationStrategy(configuration));
+ }
+
+ /**
+ * protected visibility to allow ad-hoc overriding of some other authentication strategy.
+ */
+ protected IAuthenticationStrategy newAuthenticationStrategy(final IsisConfiguration configuration) {
+ final String cookieKey = configuration.getString(WICKET_REMEMBER_ME_COOKIE_KEY,
+ WICKET_REMEMBER_ME_COOKIE_KEY_DEFAULT);
+ final String encryptionKey = configuration.getString(WICKET_REMEMBER_ME_ENCRYPTION_KEY, defaultEncryptionKeyIfNotConfigured());
+ return new DefaultAuthenticationStrategy(cookieKey, encryptionKey);
+ }
+
+ /**
+ * As called by {@link #newAuthenticationStrategy(IsisConfiguration)}; if an encryption key for the 'rememberMe'
+ * cookie hasn't been configured, then use a different encryption key for the 'rememberMe' cookie each time the
+ * app is restarted.
+ */
+ protected String defaultEncryptionKeyIfNotConfigured() {
+ return UUID.randomUUID().toString();
+ }
+
private void log(final List<String> validationErrors) {
log("");
logBanner();
http://git-wip-us.apache.org/repos/asf/isis/blob/e944de3b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
index e08b33d..1235fe9 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
@@ -90,3 +90,23 @@ isis.viewer.wicket.themes.showChooser=true
# enable liveReload. For example, use with gradle -t -b liveReload.gradle --offline &
#
isis.viewer.wicket.liveReloadUrl=http://localhost:35729/livereload.js?snipver=1
+
+
+
+#
+# cookie key holding the (encrypted) 'rememberMe' user/password.
+# If not specified then the cookie key 'isisWicketRememberMe' will be used; there is generally no need to change this.
+#
+#isis.viewer.wicket.rememberMe.cookieKey=isisWicketRememberMe
+
+
+#
+# Encryption key is used to encrypt the rememberMe user/password. It should be set to a unique and private value.
+# If a hard-coded and publicly known value is used, then it would be possible for rememberMe user/password to be
+# intercepted and decrypted, compromising access.
+#
+# If no value is set then (for safety) a random UUID will be used as the encryption key. The net effect of this
+# default is that 'rememberMe' will work, but only until the webapp is restarted (after which the end-user will
+# have to log in again).
+#
+#isis.viewer.wicket.rememberMe.encryptionKey=myEncryptionKey
[38/50] [abbrv] isis git commit: ISIS-1429: removes ExplorationFacet,
uses PrototypeFacet instead.
Posted by da...@apache.org.
ISIS-1429: removes ExplorationFacet, uses PrototypeFacet instead.
There should be no impact for developers: actions annotated with @Exploration or prefixed 'exploration' will be treated the same as prototype actions.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/512d2d26
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/512d2d26
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/512d2d26
Branch: refs/heads/master
Commit: 512d2d262c188152e0521e9939cbde13e7166d1f
Parents: adca856
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 15 05:03:07 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 15 05:03:07 2016 +0100
----------------------------------------------------------------------
.../actions/exploration/ExplorationFacet.java | 38 ------
.../exploration/ExplorationFacetAbstract.java | 55 ---------
.../annotation/ExplorationFacetAnnotation.java | 36 ------
.../ExplorationFacetAnnotationFactory.java | 73 -----------
.../PrototypeFacetForExplorationAnnotation.java | 36 ++++++
...ypeFacetForExplorationAnnotationFactory.java | 71 +++++++++++
...ActionNamedDebugExplorationFacetFactory.java | 121 -------------------
.../ActionNamedExplorationFacetFactory.java | 121 +++++++++++++++++++
.../ExplorationFacetViaNamingConvention.java | 37 ------
...cetViaExplorationPrefixNamingConvention.java | 37 ++++++
.../services/swagger/internal/Util.java | 2 +-
.../isis/core/metamodel/spec/ActionType.java | 6 +-
.../metamodel/spec/feature/ObjectAction.java | 6 +-
.../specimpl/ObjectActionDefault.java | 12 +-
.../dflt/ProgrammingModelFacetsJava5.java | 4 +-
.../actions/ActionMethodsFacetFactoryTest.java | 12 +-
.../ExplorationFacetAnnotationFactoryTest.java | 66 ----------
...acetForExplorationAnnotationFactoryTest.java | 68 +++++++++++
.../core/metamodel/spec/ActionTypeTest.java | 34 ------
.../viewer/wicket/model/links/LinkAndLabel.java | 2 +-
.../entityactions/EntityActionUtil.java | 2 -
.../actionmenu/serviceactions/CssMenuItem.java | 2 +-
.../collection/bulk/BulkActionsHelper.java | 4 +-
23 files changed, 354 insertions(+), 491 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacet.java
deleted file mode 100644
index 0793441..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacet.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.metamodel.facets.actions.exploration;
-
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.interactions.HidingInteractionAdvisor;
-
-/**
- * Indicates that the action should only be available in a special
- * <i>exploration</i> mode.
- *
- * <p>
- * In the standard Apache Isis Programming Model, corresponds to annotating the
- * action method using <tt>@Exploration</tt>.
- *
- * @deprecated
- */
-@Deprecated
-public interface ExplorationFacet extends Facet, HidingInteractionAdvisor {
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java
deleted file mode 100644
index 3094c4e..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAbstract.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.metamodel.facets.actions.exploration;
-
-import org.apache.isis.applib.events.VisibilityEvent;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
-import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-
-/**
- * @deprecated
- */
-@Deprecated
-public abstract class ExplorationFacetAbstract extends MarkerFacetAbstract implements ExplorationFacet {
-
- private final DeploymentCategory deploymentCategory;
-
- public static Class<? extends Facet> type() {
- return ExplorationFacet.class;
- }
-
- public ExplorationFacetAbstract(final FacetHolder holder, final DeploymentCategory deploymentCategory) {
- super(type(), holder);
- this.deploymentCategory = deploymentCategory;
- }
-
- @Override
- public String hides(
- VisibilityContext<? extends VisibilityEvent> ic) {
- return getDeploymentCategory().isExploring()? null: "Not visible";
- }
-
- protected DeploymentCategory getDeploymentCategory() {
- return deploymentCategory;
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotation.java
deleted file mode 100644
index e6fba56..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.metamodel.facets.actions.exploration.annotation;
-
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class ExplorationFacetAnnotation extends ExplorationFacetAbstract {
-
- public ExplorationFacetAnnotation(final FacetHolder holder, final DeploymentCategory deploymentCategory) {
- super(holder, deploymentCategory);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotationFactory.java
deleted file mode 100644
index f6d13f0..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/ExplorationFacetAnnotationFactory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.metamodel.facets.actions.exploration.annotation;
-
-import org.apache.isis.applib.annotation.Exploration;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
-import org.apache.isis.core.metamodel.facets.Annotations;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
-import org.apache.isis.core.metamodel.progmodel.DeprecatedMarker;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
-
-/**
- * {@link ExplorationFacet} can also be installed via a naming convention, see
- * {@link org.apache.isis.core.metamodel.facets.actions.interaction.ActionNamedDebugExplorationFacetFactory}.
- *
- * @deprecated
- */
-@Deprecated
-public class ExplorationFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, DeprecatedMarker {
-
- private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Exploration.class);
-
- public ExplorationFacetAnnotationFactory() {
- super(FeatureType.ACTIONS_ONLY);
- }
-
- @Override
- public void process(final ProcessMethodContext processMethodContext) {
- final Exploration annotation = Annotations.getAnnotation(processMethodContext.getMethod(), Exploration.class);
- final ExplorationFacet facet = create(annotation, processMethodContext.getFacetHolder());
- FacetUtil.addFacet(validator.flagIfPresent(facet, processMethodContext));
- }
-
- private ExplorationFacet create(final Exploration annotation, final FacetHolder holder) {
- return annotation == null ? null : new ExplorationFacetAnnotation(holder, getDeploymentCategory());
- }
-
- @Override
- public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(validator);
- }
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- super.setServicesInjector(servicesInjector);
- validator.setConfiguration(servicesInjector.getConfigurationServiceInternal());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/PrototypeFacetForExplorationAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/PrototypeFacetForExplorationAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/PrototypeFacetForExplorationAnnotation.java
new file mode 100644
index 0000000..484936e
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/PrototypeFacetForExplorationAnnotation.java
@@ -0,0 +1,36 @@
+/*
+ * 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.metamodel.facets.actions.exploration.annotation;
+
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacetAbstract;
+
+/**
+ * @deprecated
+ */
+@Deprecated
+public class PrototypeFacetForExplorationAnnotation extends PrototypeFacetAbstract {
+
+ public PrototypeFacetForExplorationAnnotation(final FacetHolder holder, final DeploymentCategory deploymentCategory) {
+ super(holder, deploymentCategory);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/PrototypeFacetForExplorationAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/PrototypeFacetForExplorationAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/PrototypeFacetForExplorationAnnotationFactory.java
new file mode 100644
index 0000000..c8fd42a
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/exploration/annotation/PrototypeFacetForExplorationAnnotationFactory.java
@@ -0,0 +1,71 @@
+/*
+ * 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.metamodel.facets.actions.exploration.annotation;
+
+import org.apache.isis.applib.annotation.Exploration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
+import org.apache.isis.core.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.actions.interaction.ActionNamedExplorationFacetFactory;
+import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
+import org.apache.isis.core.metamodel.progmodel.DeprecatedMarker;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
+
+/**
+ * {@link PrototypeFacet} can also be installed via a naming convention, see
+ * {@link ActionNamedExplorationFacetFactory}.
+ */
+public class PrototypeFacetForExplorationAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner, DeprecatedMarker {
+
+ private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Exploration.class);
+
+ public PrototypeFacetForExplorationAnnotationFactory() {
+ super(FeatureType.ACTIONS_ONLY);
+ }
+
+ @Override
+ public void process(final ProcessMethodContext processMethodContext) {
+ final Exploration annotation = Annotations.getAnnotation(processMethodContext.getMethod(), Exploration.class);
+ final PrototypeFacet facet = create(annotation, processMethodContext.getFacetHolder());
+ FacetUtil.addFacet(validator.flagIfPresent(facet, processMethodContext));
+ }
+
+ private PrototypeFacet create(final Exploration annotation, final FacetHolder holder) {
+ return annotation == null ? null : new PrototypeFacetForExplorationAnnotation(holder, getDeploymentCategory());
+ }
+
+ @Override
+ public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
+ metaModelValidator.add(validator);
+ }
+
+ @Override
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ validator.setConfiguration(servicesInjector.getConfigurationServiceInternal());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java
deleted file mode 100644
index e9356e9..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * 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.metamodel.facets.actions.interaction;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.lang.StringExtensions;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
-import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
-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.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
-
-/**
- * Sets up {@link org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionDomainEventFacet} and also an {@link org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet}, along with a number of supporting
- * facets that are based on the action's name.
- *
- * <p>
- * The supporting methods are: {@link ExplorationFacet}. In addition a {@link NamedFacet} is inferred from the
- * name (taking into account the above well-known prefixes).
- *
- * @deprecated
- */
-@Deprecated
-public class ActionNamedDebugExplorationFacetFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
-
- private static final String EXPLORATION_PREFIX = "Exploration";
-
- private final MetaModelValidatorForDeprecatedMethodPrefix explorationValidator = new MetaModelValidatorForDeprecatedMethodPrefix(EXPLORATION_PREFIX);
-
- private static final String[] PREFIXES = { EXPLORATION_PREFIX };
-
- public ActionNamedDebugExplorationFacetFactory() {
- super(FeatureType.ACTIONS_ONLY, OrphanValidation.VALIDATE, PREFIXES);
- }
-
- // ///////////////////////////////////////////////////////
- // Actions
- // ///////////////////////////////////////////////////////
-
- @Override
- public void process(final ProcessMethodContext processMethodContext) {
-
- // DebugFacet, ExplorationFacet
- attachExplorationFacetIfActionMethodNamePrefixed(processMethodContext);
-
- // inferred name
- // (must be called after the attachinvocationFacet methods)
- attachNamedFacetInferredFromMethodName(processMethodContext);
- }
-
-
- private void attachExplorationFacetIfActionMethodNamePrefixed(final ProcessMethodContext processMethodContext) {
-
- final Method actionMethod = processMethodContext.getMethod();
- final String capitalizedName = StringExtensions.asCapitalizedName(actionMethod.getName());
- if (!capitalizedName.startsWith(EXPLORATION_PREFIX)) {
- return;
- }
- final FacetHolder facetedMethod = processMethodContext.getFacetHolder();
- final Facet facet = new ExplorationFacetViaNamingConvention(facetedMethod, getDeploymentCategory());
- FacetUtil.addFacet(explorationValidator.flagIfPresent(facet, processMethodContext));
- }
-
- /**
- * Must be called after added the debug, exploration etc facets.
- */
- private void attachNamedFacetInferredFromMethodName(final ProcessMethodContext processMethodContext) {
-
- final Method method = processMethodContext.getMethod();
- final String capitalizedName = StringExtensions.asCapitalizedName(method.getName());
-
- // this is nasty...
- String name = capitalizedName;
- name = StringExtensions.removePrefix(name, EXPLORATION_PREFIX);
- name = StringExtensions.asNaturalName2(name);
-
- final FacetHolder facetedMethod = processMethodContext.getFacetHolder();
- FacetUtil.addFacet(new NamedFacetInferred(name, facetedMethod));
- }
-
-
- @Override
- public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(explorationValidator);
- }
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal();
- explorationValidator.setConfiguration(configuration);
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedExplorationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedExplorationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedExplorationFacetFactory.java
new file mode 100644
index 0000000..b14ceee
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedExplorationFacetFactory.java
@@ -0,0 +1,121 @@
+/*
+ * 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.metamodel.facets.actions.interaction;
+
+import java.lang.reflect.Method;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.lang.StringExtensions;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facetapi.FacetUtil;
+import org.apache.isis.core.metamodel.facetapi.FeatureType;
+import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
+import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
+import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
+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.services.ServicesInjector;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedMethodPrefix;
+
+/**
+ * Sets up {@link org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionDomainEventFacet} and also an {@link org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet}, along with a number of supporting
+ * facets that are based on the action's name.
+ *
+ * <p>
+ * The supporting methods are: {@link PrototypeFacet}. In addition a {@link NamedFacet} is inferred from the
+ * name (taking into account the above well-known prefixes).
+ *
+ * @deprecated
+ */
+@Deprecated
+public class ActionNamedExplorationFacetFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
+
+ private static final String EXPLORATION_PREFIX = "Exploration";
+
+ private final MetaModelValidatorForDeprecatedMethodPrefix explorationValidator = new MetaModelValidatorForDeprecatedMethodPrefix(EXPLORATION_PREFIX);
+
+ private static final String[] PREFIXES = { EXPLORATION_PREFIX };
+
+ public ActionNamedExplorationFacetFactory() {
+ super(FeatureType.ACTIONS_ONLY, OrphanValidation.VALIDATE, PREFIXES);
+ }
+
+ // ///////////////////////////////////////////////////////
+ // Actions
+ // ///////////////////////////////////////////////////////
+
+ @Override
+ public void process(final ProcessMethodContext processMethodContext) {
+
+ // DebugFacet, ExplorationFacet
+ attachExplorationFacetIfActionMethodNamePrefixed(processMethodContext);
+
+ // inferred name
+ // (must be called after the attachinvocationFacet methods)
+ attachNamedFacetInferredFromMethodName(processMethodContext);
+ }
+
+
+ private void attachExplorationFacetIfActionMethodNamePrefixed(final ProcessMethodContext processMethodContext) {
+
+ final Method actionMethod = processMethodContext.getMethod();
+ final String capitalizedName = StringExtensions.asCapitalizedName(actionMethod.getName());
+ if (!capitalizedName.startsWith(EXPLORATION_PREFIX)) {
+ return;
+ }
+ final FacetHolder facetedMethod = processMethodContext.getFacetHolder();
+ final Facet facet = new PrototypeFacetViaExplorationPrefixNamingConvention(facetedMethod, getDeploymentCategory());
+ FacetUtil.addFacet(explorationValidator.flagIfPresent(facet, processMethodContext));
+ }
+
+ /**
+ * Must be called after added the debug, exploration etc facets.
+ */
+ private void attachNamedFacetInferredFromMethodName(final ProcessMethodContext processMethodContext) {
+
+ final Method method = processMethodContext.getMethod();
+ final String capitalizedName = StringExtensions.asCapitalizedName(method.getName());
+
+ // this is nasty...
+ String name = capitalizedName;
+ name = StringExtensions.removePrefix(name, EXPLORATION_PREFIX);
+ name = StringExtensions.asNaturalName2(name);
+
+ final FacetHolder facetedMethod = processMethodContext.getFacetHolder();
+ FacetUtil.addFacet(new NamedFacetInferred(name, facetedMethod));
+ }
+
+
+ @Override
+ public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
+ metaModelValidator.add(explorationValidator);
+ }
+
+ @Override
+ public void setServicesInjector(final ServicesInjector servicesInjector) {
+ super.setServicesInjector(servicesInjector);
+ IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal();
+ explorationValidator.setConfiguration(configuration);
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ExplorationFacetViaNamingConvention.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ExplorationFacetViaNamingConvention.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ExplorationFacetViaNamingConvention.java
deleted file mode 100644
index a638ed4..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ExplorationFacetViaNamingConvention.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.metamodel.facets.actions.interaction;
-
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class ExplorationFacetViaNamingConvention extends ExplorationFacetAbstract {
-
- public ExplorationFacetViaNamingConvention(
- final FacetHolder holder, final DeploymentCategory deploymentCategory) {
- super(holder, deploymentCategory);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/PrototypeFacetViaExplorationPrefixNamingConvention.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/PrototypeFacetViaExplorationPrefixNamingConvention.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/PrototypeFacetViaExplorationPrefixNamingConvention.java
new file mode 100644
index 0000000..7ce457a
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/PrototypeFacetViaExplorationPrefixNamingConvention.java
@@ -0,0 +1,37 @@
+/*
+ * 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.metamodel.facets.actions.interaction;
+
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacetAbstract;
+
+/**
+ * @deprecated
+ */
+@Deprecated
+public class PrototypeFacetViaExplorationPrefixNamingConvention extends PrototypeFacetAbstract {
+
+ public PrototypeFacetViaExplorationPrefixNamingConvention(
+ final FacetHolder holder, final DeploymentCategory deploymentCategory) {
+ super(holder, deploymentCategory);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java
index a0effef..7bf2f2a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java
@@ -165,7 +165,7 @@ public final class Util {
case PRIVATE:
return Arrays.asList(ActionType.USER);
case PRIVATE_WITH_PROTOTYPING:
- return Arrays.asList(ActionType.USER, ActionType.EXPLORATION, ActionType.PROTOTYPE);
+ return Arrays.asList(ActionType.USER, ActionType.PROTOTYPE);
}
throw new IllegalArgumentException("Unrecognized type '" + visibility + "'");
}
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ActionType.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ActionType.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ActionType.java
index 626ed40..2921833 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ActionType.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ActionType.java
@@ -23,16 +23,12 @@ import java.util.Arrays;
import java.util.List;
public enum ActionType {
- EXPLORATION, PROTOTYPE, USER;
+ PROTOTYPE, USER;
public String getName() {
return name();
}
- public boolean isExploration() {
- return this == EXPLORATION;
- }
-
public boolean isPrototype() {
return this == PROTOTYPE;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
index a8552b2..9348f3e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
@@ -234,10 +234,6 @@ public interface ObjectAction extends ObjectMember {
return blobOrClob;
}
- public static boolean isExplorationOrPrototype(final ObjectAction action) {
- return action.getType().isExploration() || action.getType().isPrototype();
- }
-
public static String actionIdentifierFor(final ObjectAction action) {
@SuppressWarnings("unused")
final Identifier identifier = action.getIdentifier();
@@ -273,6 +269,8 @@ public interface ObjectAction extends ObjectMember {
}
+ boolean isPrototype();
+
// //////////////////////////////////////////////////////
// Predicates
// //////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
index 0b464d1..2041d01 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
@@ -52,7 +52,6 @@ import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInv
import org.apache.isis.core.metamodel.facets.actions.action.invocation.CommandUtil;
import org.apache.isis.core.metamodel.facets.actions.bulk.BulkFacet;
import org.apache.isis.core.metamodel.facets.actions.defaults.ActionDefaultsFacet;
-import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
import org.apache.isis.core.metamodel.facets.actions.semantics.ActionSemanticsFacet;
import org.apache.isis.core.metamodel.facets.param.choices.ActionChoicesFacet;
@@ -155,11 +154,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
}
private static ActionType getType(final FacetHolder facetHolder) {
- Facet facet = facetHolder.getFacet(ExplorationFacet.class);
- if (facet != null) {
- return ActionType.EXPLORATION;
- }
- facet = facetHolder.getFacet(PrototypeFacet.class);
+ Facet facet = facetHolder.getFacet(PrototypeFacet.class);
if (facet != null) {
return ActionType.PROTOTYPE;
}
@@ -584,6 +579,11 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
}
}
+ @Override
+ public boolean isPrototype() {
+ return getType().isPrototype();
+ }
+
/**
* Internal API, called by the various implementations of {@link ObjectAction} ({@link ObjectActionDefault default},
* {@link ObjectActionMixedIn mixed-in} and {@link ObjectActionContributee contributee}).
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
index 63714b7..0faa1c3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
@@ -22,7 +22,7 @@ import org.apache.isis.core.metamodel.facets.actions.action.ActionAnnotationFace
import org.apache.isis.core.metamodel.facets.actions.contributing.maxlenannot.MaxLengthFacetOnActionAnnotationFactory;
import org.apache.isis.core.metamodel.facets.actions.contributing.paged.PagedFacetOnActionFactory;
import org.apache.isis.core.metamodel.facets.actions.defaults.method.ActionDefaultsFacetViaMethodFactory;
-import org.apache.isis.core.metamodel.facets.actions.exploration.annotation.ExplorationFacetAnnotationFactory;
+import org.apache.isis.core.metamodel.facets.actions.exploration.annotation.PrototypeFacetForExplorationAnnotationFactory;
import org.apache.isis.core.metamodel.facets.actions.homepage.annotation.HomePageFacetAnnotationFactory;
import org.apache.isis.core.metamodel.facets.actions.layout.ActionLayoutFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.notcontributed.annotation.NotContributedFacetAnnotationFactory;
@@ -335,7 +335,7 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
addFactory(new DisabledFacetOnMemberFromPropertiesFactory());
addFactory(new EncodableFacetAnnotationElseConfigurationFactory());
- addFactory(new ExplorationFacetAnnotationFactory());
+ addFactory(new PrototypeFacetForExplorationAnnotationFactory());
addFactory(new NotContributedFacetAnnotationFactory());
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
index f25f438..a4df50a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
@@ -43,8 +43,8 @@ import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.actions.defaults.ActionDefaultsFacet;
import org.apache.isis.core.metamodel.facets.actions.defaults.method.ActionDefaultsFacetViaMethod;
import org.apache.isis.core.metamodel.facets.actions.defaults.method.ActionDefaultsFacetViaMethodFactory;
-import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
-import org.apache.isis.core.metamodel.facets.actions.interaction.ActionNamedDebugExplorationFacetFactory;
+import org.apache.isis.core.metamodel.facets.actions.interaction.ActionNamedExplorationFacetFactory;
+import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
import org.apache.isis.core.metamodel.facets.actions.validate.ActionValidationFacet;
import org.apache.isis.core.metamodel.facets.actions.validate.method.ActionValidationFacetViaMethod;
import org.apache.isis.core.metamodel.facets.actions.validate.method.ActionValidationFacetViaMethodFactory;
@@ -151,7 +151,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
}
public void testProvidesDefaultNameForActionButIgnoresAnyNamedAnnotation() {
- final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
+ final ActionNamedExplorationFacetFactory facetFactory = new ActionNamedExplorationFacetFactory();
facetFactory.setServicesInjector(mockServicesInjector);
@@ -177,7 +177,7 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testPicksUpExplorationPrefixAndSetsNameAppropriatelyAlso() {
- final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
+ final ActionNamedExplorationFacetFactory facetFactory = new ActionNamedExplorationFacetFactory();
facetFactory.setServicesInjector(mockServicesInjector);
@@ -192,9 +192,9 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final Method method = findMethod(Customer.class, "explorationAnActionWithExplorationPrefix");
facetFactory.process(new ProcessMethodContext(Customer.class, null, null, method, methodRemover, facetedMethod));
- Facet facet = facetedMethod.getFacet(ExplorationFacet.class);
+ Facet facet = facetedMethod.getFacet(PrototypeFacet.class);
assertNotNull(facet);
- assertTrue(facet instanceof ExplorationFacet);
+ assertTrue(facet instanceof PrototypeFacet);
facet = facetedMethod.getFacet(NamedFacet.class);
assertNotNull(facet);
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAnnotationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAnnotationFactoryTest.java
deleted file mode 100644
index a39c5fe..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAnnotationFactoryTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.metamodel.facets.actions.exploration;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.applib.annotation.Exploration;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.actions.exploration.annotation.ExplorationFacetAnnotationFactory;
-
-public class ExplorationFacetAnnotationFactoryTest extends AbstractFacetFactoryTest {
-
- private ExplorationFacetAnnotationFactory facetFactory;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- facetFactory = new ExplorationFacetAnnotationFactory();
- facetFactory.setServicesInjector(stubServicesInjector);
- }
-
- @Override
- protected void tearDown() throws Exception {
- facetFactory = null;
- super.tearDown();
- }
-
- public void testExplorationAnnotationPickedUp() {
- class Customer {
- @SuppressWarnings("unused")
- @Exploration
- public void someAction() {
- }
- }
- final Method actionMethod = findMethod(Customer.class, "someAction");
-
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(ExplorationFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof ExplorationFacetAbstract);
-
- assertNoMethodsRemoved();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/PrototypeFacetForPrototypeFacetForExplorationAnnotationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/PrototypeFacetForPrototypeFacetForExplorationAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/PrototypeFacetForPrototypeFacetForExplorationAnnotationFactoryTest.java
new file mode 100644
index 0000000..6f127c4
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/PrototypeFacetForPrototypeFacetForExplorationAnnotationFactoryTest.java
@@ -0,0 +1,68 @@
+/*
+ * 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.metamodel.facets.actions.exploration;
+
+import java.lang.reflect.Method;
+
+import org.apache.isis.applib.annotation.Exploration;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
+import org.apache.isis.core.metamodel.facets.actions.exploration.annotation.PrototypeFacetForExplorationAnnotationFactory;
+import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
+import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacetAbstract;
+
+public class PrototypeFacetForPrototypeFacetForExplorationAnnotationFactoryTest extends AbstractFacetFactoryTest {
+
+ private PrototypeFacetForExplorationAnnotationFactory facetFactory;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ facetFactory = new PrototypeFacetForExplorationAnnotationFactory();
+ facetFactory.setServicesInjector(stubServicesInjector);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ facetFactory = null;
+ super.tearDown();
+ }
+
+ public void testExplorationAnnotationPickedUp() {
+ class Customer {
+ @SuppressWarnings("unused")
+ @Exploration
+ public void someAction() {
+ }
+ }
+ final Method actionMethod = findMethod(Customer.class, "someAction");
+
+ facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
+
+ final Facet facet = facetedMethod.getFacet(PrototypeFacet.class);
+ assertNotNull(facet);
+ assertTrue(facet instanceof PrototypeFacetAbstract);
+
+ assertNoMethodsRemoved();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ActionTypeTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ActionTypeTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ActionTypeTest.java
deleted file mode 100644
index 96a0986..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ActionTypeTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.metamodel.spec;
-
-import junit.framework.TestCase;
-
-public class ActionTypeTest extends TestCase {
-
- public void testEquals() {
- assertTrue(ActionType.EXPLORATION.equals(ActionType.EXPLORATION));
- }
-
- public void testHashCode() {
- assertEquals(ActionType.EXPLORATION.hashCode(), ActionType.EXPLORATION.hashCode());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java
index c728a63..25f5705 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/links/LinkAndLabel.java
@@ -50,7 +50,7 @@ public class LinkAndLabel implements Serializable {
final String name = ObjectAction.Utils.nameFor(objectAction);
- final boolean explorationOrPrototype = ObjectAction.Utils.isExplorationOrPrototype(objectAction);
+ final boolean explorationOrPrototype = objectAction.isPrototype();
final String actionIdentifier = ObjectAction.Utils.actionIdentifierFor(objectAction);
final String description = ObjectAction.Utils.descriptionOf(objectAction);
final String cssClass = ObjectAction.Utils.cssClassFor(objectAction, objectAdapter);
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java
index d9d6f2f..9b4627f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java
@@ -90,7 +90,6 @@ public final class EntityActionUtil {
addActions(ActionType.USER, entityModel, association, associatedActions);
if(deploymentCategory.isPrototyping()) {
- addActions(ActionType.EXPLORATION, entityModel, association, associatedActions);
addActions(ActionType.PROTOTYPE, entityModel, association, associatedActions);
}
@@ -183,7 +182,6 @@ public final class EntityActionUtil {
addTopLevelActions(adapter, ActionType.USER, topLevelActions);
if(deploymentCategory.isPrototyping()) {
- addTopLevelActions(adapter, ActionType.EXPLORATION, topLevelActions);
addTopLevelActions(adapter, ActionType.PROTOTYPE, topLevelActions);
}
return topLevelActions;
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
index 69f2f9c..3b7e44e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
@@ -346,7 +346,7 @@ class CssMenuItem implements Serializable {
.describedAs(descriptionIfAny)
.enabled(reasonDisabledIfAny)
.returnsBlobOrClob(ObjectAction.Utils.returnsBlobOrClob(objectAction))
- .prototyping(ObjectAction.Utils.isExplorationOrPrototype(objectAction))
+ .prototyping(objectAction.isPrototype())
.requiresSeparator(separator)
.withActionIdentifier(ObjectAction.Utils.actionIdentifierFor(objectAction))
.withCssClass(ObjectAction.Utils.cssClassFor(objectAction, adapter))
http://git-wip-us.apache.org/repos/asf/isis/blob/512d2d26/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
index 42627e0..723f85b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
@@ -62,9 +62,7 @@ public class BulkActionsHelper implements Serializable {
final DeploymentCategory deploymentCategory = isisSessionFactory.getDeploymentCategory();
if ( !deploymentCategory.isProduction()) {
- List<ObjectAction> explorationActions = typeSpec.getObjectActions(ActionType.EXPLORATION, Contributed.INCLUDED, Filters.<ObjectAction>any());
- List<ObjectAction> prototypeActions = typeSpec.getObjectActions(ActionType.PROTOTYPE, Contributed.INCLUDED, Filters.<ObjectAction>any());
- objectActions.addAll(explorationActions);
+ List<ObjectAction> prototypeActions = typeSpec.getObjectActions(ActionType.PROTOTYPE, Contributed.INCLUDED, Filters.<ObjectAction>any());
objectActions.addAll(prototypeActions);
}
[30/50] [abbrv] 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 convenienc
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
index 6c6262a..ee2f65e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
@@ -32,7 +32,6 @@ import org.apache.isis.applib.services.HasTransactionId;
import org.apache.isis.applib.services.WithTransactionScope;
import org.apache.isis.applib.services.xactn.Transaction;
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.TransactionScopedComponent;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -165,6 +164,7 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
private final UUID interactionId;
private final int sequence;
+ private final AuthenticationSession authenticationSession;
private final List<PersistenceCommand> persistenceCommands = Lists.newArrayList();
private final IsisTransactionManager transactionManager;
@@ -177,16 +177,20 @@ public class IsisTransaction implements TransactionScopedComponent, Transaction
private IsisException abortCause;
public IsisTransaction(
- final UUID interactionId, final int sequence, final ServicesInjector servicesInjector) {
+ final UUID interactionId,
+ final int sequence,
+ final AuthenticationSession authenticationSession,
+ final ServicesInjector servicesInjector) {
this.interactionId = interactionId;
this.sequence = sequence;
+ this.authenticationSession = authenticationSession;
final PersistenceSessionServiceInternalDefault persistenceSessionService = servicesInjector
.lookupServiceElseFail(PersistenceSessionServiceInternalDefault.class);
this.transactionManager = persistenceSessionService.getTransactionManager();
- this.messageBroker = servicesInjector.getMessageBroker();
+ this.messageBroker = authenticationSession.getMessageBroker();
this.publishingServiceInternal = servicesInjector.lookupServiceElseFail(PublishingServiceInternal.class);
this.auditingServiceInternal = servicesInjector.lookupServiceElseFail(AuditingServiceInternal.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
index 8a6ed29..4d1f123 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
@@ -53,6 +53,7 @@ public class IsisTransactionManager implements SessionScopedComponent {
//region > constructor, fields
private final PersistenceSession persistenceSession;
+ private final AuthenticationSession authenticationSession;
private final ServicesInjector servicesInjector;
private final CommandContext commandContext;
@@ -60,9 +61,11 @@ public class IsisTransactionManager implements SessionScopedComponent {
public IsisTransactionManager(
final PersistenceSession persistenceSession,
+ final AuthenticationSession authenticationSession,
final ServicesInjector servicesInjector) {
this.persistenceSession = persistenceSession;
+ this.authenticationSession = authenticationSession;
this.servicesInjector = servicesInjector;
this.commandContext = this.servicesInjector.lookupServiceElseFail(CommandContext.class);
@@ -238,7 +241,7 @@ public class IsisTransactionManager implements SessionScopedComponent {
final UUID transactionId = command.getTransactionId();
this.currentTransaction = new IsisTransaction(transactionId,
- interaction.next(Interaction.Sequence.TRANSACTION.id()), servicesInjector);
+ interaction.next(Interaction.Sequence.TRANSACTION.id()), authenticationSession, servicesInjector);
transactionLevel = 0;
persistenceSession.startTransaction();
@@ -411,16 +414,6 @@ public class IsisTransactionManager implements SessionScopedComponent {
public void addCommand(final PersistenceCommand command) {
getCurrentTransaction().addCommand(command);
}
-
//endregion
-
- /**
- * Called back by {@link IsisTransaction}.
- */
- protected AuthenticationSession getAuthenticationSession() {
- return servicesInjector.getAuthenticationSession();
- }
-
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
index de65a71..aa009b9 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
@@ -41,7 +41,7 @@ import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
-import org.apache.isis.core.runtime.system.IsisSystem;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
import org.apache.isis.core.runtime.system.SystemConstants;
public class IsisComponentProviderUsingInstallers extends IsisComponentProvider {
@@ -131,7 +131,7 @@ public class IsisComponentProviderUsingInstallers extends IsisComponentProvider
* Looks up authorization and authentication implementations.
*
* Previously this class was used to lookup the top-level components of
- * {@link IsisSystem} (persistence, authentication, authorization, reflector and so on),
+ * {@link IsisSessionFactoryBuilder} (persistence, authentication, authorization, reflector and so on),
* each being looked up from a file called <tt>installer-registry.properties</tt>.
* Of these responsibilities, only the support for authentication and authorization remains,
* the remainder have only a single implementation. The implementation has been
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
index f36e89e..603d44e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
@@ -40,12 +40,13 @@ import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
import org.apache.isis.core.runtime.runner.IsisInjectModule;
import org.apache.isis.core.runtime.runner.opts.OptionHandlerInitParameters;
import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.IsisSystem;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
import org.apache.isis.core.runtime.system.SystemConstants;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.webapp.config.ResourceStreamSourceForWebInf;
/**
- * Initialize the {@link IsisSystem} when the web application starts, and
+ * Initialize the {@link IsisSessionFactoryBuilder} when the web application starts, and
* destroys it when it ends.
* <p>
* Implementation note: we use a number of helper builders to keep this class as
@@ -57,14 +58,17 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
private static final Logger LOG = LoggerFactory.getLogger(IsisWebAppBootstrapper.class);
private final IsisLoggingConfigurer loggingConfigurer = new IsisLoggingConfigurer();
- private Injector injector;
+
+ @com.google.inject.Inject
+ private IsisSessionFactory isisSessionFactory;
+
/**
- * Convenience for servlets that need to obtain the {@link IsisSystem}.
+ * Convenience for servlets that need to obtain the {@link IsisSessionFactoryBuilder}.
*/
- public static IsisSystem getSystemBoundTo(final ServletContext servletContext) {
- final Object system = servletContext.getAttribute(WebAppConstants.ISIS_SYSTEM_KEY);
- return (IsisSystem) system;
+ public static IsisSessionFactoryBuilder getSystemBoundTo(final ServletContext servletContext) {
+ final Object system = servletContext.getAttribute(WebAppConstants.ISIS_SESSION_FACTORY);
+ return (IsisSessionFactoryBuilder) system;
}
// /////////////////////////////////////////////////////
@@ -91,11 +95,10 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
final IsisConfigurationDefault isisConfiguration = isisConfigurationBuilder.getConfiguration();
final DeploymentCategory deploymentCategory = deploymentType.getDeploymentCategory();
final IsisInjectModule isisModule = new IsisInjectModule(deploymentCategory, isisConfiguration);
- this.injector = Guice.createInjector(isisModule);
-
- final IsisSystem system = injector.getInstance(IsisSystem.class);
+ final Injector injector = Guice.createInjector(isisModule);
+ injector.injectMembers(this);
- servletContext.setAttribute(WebAppConstants.ISIS_SYSTEM_KEY, system);
+ servletContext.setAttribute(WebAppConstants.ISIS_SESSION_FACTORY, isisSessionFactory);
} catch (final RuntimeException e) {
LOG.error("startup failed", e);
@@ -214,13 +217,13 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
final ServletContext servletContext = ev.getServletContext();
try {
- final IsisSystem isisSystem = (IsisSystem) servletContext.getAttribute(WebAppConstants.ISIS_SYSTEM_KEY);
- if (isisSystem != null) {
+ final IsisSessionFactory isisSessionFactory = (IsisSessionFactory) servletContext.getAttribute(WebAppConstants.ISIS_SESSION_FACTORY);
+ if (isisSessionFactory != null) {
LOG.info("calling system shutdown");
- isisSystem.getSessionFactory().destroyServicesAndShutdown();
+ isisSessionFactory.destroyServicesAndShutdown();
}
} finally {
- servletContext.removeAttribute(WebAppConstants.ISIS_SYSTEM_KEY);
+ servletContext.removeAttribute(WebAppConstants.ISIS_SESSION_FACTORY);
LOG.info("server shut down");
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/runtime/src/main/java/org/apache/isis/core/webapp/WebAppConstants.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/WebAppConstants.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/WebAppConstants.java
index ea308d1..d825337 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/WebAppConstants.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/WebAppConstants.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.webapp;
import org.apache.isis.applib.fixtures.LogonFixture;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.IsisSystem;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
public final class WebAppConstants {
@@ -44,10 +44,10 @@ public final class WebAppConstants {
public static final String CONFIGURATION_BUILDER_KEY = "isis.configurationBuilder";
/**
- * Key under which the {@link IsisSystem} is bound as a servlet context
+ * Key under which the {@link IsisSessionFactoryBuilder} is bound as a servlet context
* attribute ( <tt>ServletContext#getAttribute(String)</tt>).
*/
- public final static String ISIS_SYSTEM_KEY = WebAppConstants.class.getPackage().getName() + ".isisSystem";
+ public final static String ISIS_SESSION_FACTORY = WebAppConstants.class.getPackage().getName() + ".isisSessionFactory";
/**
* Key under which the {@link AuthenticationSession} is bound as a session
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
index 4b218fd..3f8f708 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.exploration.AuthenticationRequestExploration;
import org.apache.isis.core.runtime.fixtures.authentication.AuthenticationRequestLogonFixture;
-import org.apache.isis.core.runtime.system.IsisSystem;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.webapp.WebAppConstants;
/**
@@ -71,15 +71,15 @@ public class AuthenticationSessionStrategyDefault extends AuthenticationSessionS
// otherwise, look for LogonFixture and try to authenticate
final ServletContext servletContext = getServletContext(httpServletRequest);
- final IsisSystem system = (IsisSystem) servletContext.getAttribute(WebAppConstants.ISIS_SYSTEM_KEY);
- if (system == null) {
- // not expected to happen...
+ final IsisSessionFactory sessionFactory = (IsisSessionFactory) servletContext.getAttribute(WebAppConstants.ISIS_SESSION_FACTORY);
+ if (sessionFactory == null) {
+ // not expected to happen (is set up either by IsisWebAppBootstrapper or in IsisWicketApplication).
return null;
}
- final LogonFixture logonFixture = system.getSessionFactory().getLogonFixture();
+ final LogonFixture logonFixture = sessionFactory.getLogonFixture();
// see if exploration is supported
- if (system.getDeploymentCategory().isExploring()) {
+ if (sessionFactory.getDeploymentCategory().isExploring()) {
authSession = authenticationManager.authenticate(new AuthenticationRequestExploration(logonFixture));
if (authSession != null) {
return authSession;
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java
index 004b72e..5a59752 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java
@@ -17,9 +17,7 @@
package org.apache.isis.viewer.restfulobjects.rendering.domainobjects;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.rendering.LinkBuilder;
@@ -60,7 +58,7 @@ public class DomainObjectLinkTo implements ObjectAdapterLinkTo {
*/
protected StringBuilder linkRef(StringBuilder buf) {
String domainType = OidUtils.getDomainType(objectAdapter);
- String instanceId = OidUtils.getInstanceId(rendererContext, objectAdapter);
+ String instanceId = OidUtils.getInstanceId(objectAdapter);
return buf.append("objects/").append(domainType).append("/").append(instanceId);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
index 9962214..4263b83 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
@@ -19,7 +19,6 @@ package org.apache.isis.viewer.restfulobjects.rendering.domainobjects;
import java.util.List;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.facets.object.notpersistable.NotPersistableFacet;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
@@ -30,7 +29,6 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
@@ -48,7 +46,7 @@ public class DomainObjectReprRenderer extends ReprRendererAbstract<DomainObjectR
public static LinkBuilder newLinkToBuilder(final RendererContext rendererContext, final Rel rel, final ObjectAdapter objectAdapter) {
String domainType = OidUtils.getDomainType(objectAdapter);
- String instanceId = OidUtils.getInstanceId(rendererContext, objectAdapter);
+ String instanceId = OidUtils.getInstanceId(objectAdapter);
final String url = "objects/" + domainType + "/" + instanceId;
return LinkBuilder.newBuilder(rendererContext, rel.getName(), RepresentationType.DOMAIN_OBJECT, url).withTitle(objectAdapter.titleString(null));
}
@@ -220,11 +218,11 @@ public class DomainObjectReprRenderer extends ReprRendererAbstract<DomainObjectR
}
private String getInstanceId() {
- return org.apache.isis.viewer.restfulobjects.rendering.util.OidUtils.getInstanceId(rendererContext, objectAdapter);
+ return org.apache.isis.viewer.restfulobjects.rendering.util.OidUtils.getInstanceId(objectAdapter);
}
private String getOidStr() {
- return org.apache.isis.viewer.restfulobjects.rendering.util.OidUtils.getOidStr(rendererContext, objectAdapter);
+ return org.apache.isis.viewer.restfulobjects.rendering.util.OidUtils.getOidStr(objectAdapter);
}
private DomainObjectReprRenderer withMembers(final ObjectAdapter objectAdapter) {
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/OidUtils.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/OidUtils.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/OidUtils.java
index 148bd45..19dd1d0 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/OidUtils.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/OidUtils.java
@@ -22,10 +22,11 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.viewer.restfulobjects.rendering.RendererContext;
public final class OidUtils {
+ private static final OidMarshaller OID_MARSHALLER = OidMarshaller.INSTANCE;
+
private OidUtils() {
}
@@ -38,24 +39,20 @@ public final class OidUtils {
return rootOid.getObjectSpecId().asString();
}
- public static String getInstanceId(final RendererContext renderContext, final ObjectAdapter objectAdapter) {
- String oidStr = getOidStr(renderContext, objectAdapter);
+ public static String getInstanceId(final ObjectAdapter objectAdapter) {
+ String oidStr = getOidStr(objectAdapter);
// REVIEW: it's a bit hokey to join these together just to split them out again.
- return oidStr != null ? getOidMarshaller().splitInstanceId(oidStr): null;
+ return oidStr != null ? OID_MARSHALLER.splitInstanceId(oidStr): null;
}
- public static String getOidStr(final RendererContext renderContext, final ObjectAdapter objectAdapter) {
+ public static String getOidStr(final ObjectAdapter objectAdapter) {
final Oid oid = objectAdapter.getOid();
if (!(oid instanceof RootOid)) {
throw new IllegalArgumentException("objectAdapter must be a root adapter");
}
- return oid.enStringNoVersion(getOidMarshaller());
+ return oid.enStringNoVersion();
}
- private static OidMarshaller getOidMarshaller() {
- return new OidMarshaller();
- }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
index cf51d0c..415f243 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.HttpHeaders;
@@ -47,6 +48,7 @@ import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.core.webapp.WebAppConstants;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.DomainModel;
@@ -97,8 +99,6 @@ public class ResourceContext implements RendererContext6 {
final HttpServletRequest httpServletRequest,
final HttpServletResponse httpServletResponse,
final SecurityContext securityContext,
- final IsisConfiguration configuration,
- final ServicesInjector servicesInjector,
final InteractionInitiatedBy interactionInitiatedBy) {
this.httpHeaders = httpHeaders;
@@ -110,15 +110,18 @@ public class ResourceContext implements RendererContext6 {
this.urlUnencodedQueryString = urlUnencodedQueryStringIfAny;
this.httpServletRequest = httpServletRequest;
this.httpServletResponse = httpServletResponse;
+
this.securityContext = securityContext;
- this.servicesInjector = servicesInjector;
- this.configuration = configuration;
- this.authenticationSession = servicesInjector.getAuthenticationSession();
- this.specificationLoader = servicesInjector.getSpecificationLoader();
- this.deploymentCategory = servicesInjector.getDeploymentCategory();
+ final ServletContext servletContext = httpServletRequest.getServletContext();
+ final IsisSessionFactory isisSessionFactory = (IsisSessionFactory)servletContext.getAttribute(WebAppConstants.ISIS_SESSION_FACTORY);
+
+ this.servicesInjector = isisSessionFactory.getServicesInjector();
+ this.configuration = isisSessionFactory.getConfiguration();
- final IsisSessionFactory isisSessionFactory = servicesInjector.lookupServiceElseFail(IsisSessionFactory.class);
+ this.authenticationSession = isisSessionFactory.getCurrentSession().getAuthenticationSession();
+ this.specificationLoader = isisSessionFactory.getSpecificationLoader();
+ this.deploymentCategory = isisSessionFactory.getDeploymentCategory();
this.persistenceSession = isisSessionFactory.getCurrentSession().getPersistenceSession();
this.interactionInitiatedBy = interactionInitiatedBy;
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper.java
index 15a65da..aebdd39 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/JsonParserHelper.java
@@ -36,6 +36,8 @@ import org.apache.isis.viewer.restfulobjects.server.util.OidUtils;
*/
public class JsonParserHelper {
+ private final static OidMarshaller OID_MARSHALLER = OidMarshaller.INSTANCE;
+
private final static Pattern OBJECT_OID = Pattern.compile(".*objects\\/([^/]+)\\/(.+)");
private final RendererContext rendererContext;
@@ -145,7 +147,7 @@ public class JsonParserHelper {
}
String domainType = matcher.group(1);
String instanceId = matcher.group(2);
- return getOidMarshaller().joinAsOid(domainType, instanceId);
+ return OID_MARSHALLER.joinAsOid(domainType, instanceId);
}
private static String resourceFor(final ObjectSpecification objectSpec) {
@@ -154,8 +156,5 @@ public class JsonParserHelper {
return objectSpec.getFullIdentifier();
}
- private static OidMarshaller getOidMarshaller() {
- return new OidMarshaller();
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
index a17cded..9911d63 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
@@ -121,8 +121,6 @@ public abstract class ResourceAbstract {
this.resourceContext = new ResourceContext(
representationType, httpHeaders, providers, uriInfo, request, where, intent, urlUnencodedQueryString, httpServletRequest, httpServletResponse,
securityContext,
- getConfiguration(),
- getServicesInjector(),
InteractionInitiatedBy.USER);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
index e344dba..f79e320 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/util/OidUtils.java
@@ -26,6 +26,8 @@ import org.apache.isis.viewer.restfulobjects.rendering.RendererContext;
public final class OidUtils {
+ private static final OidMarshaller OID_MARSHALLER = OidMarshaller.INSTANCE;
+
private OidUtils() {
}
@@ -36,7 +38,7 @@ public final class OidUtils {
final RendererContext rendererContext,
final String domainType, final String instanceIdEncoded) {
final String instanceIdUnencoded = UrlDecoderUtils.urlDecode(instanceIdEncoded);
- String oidStrUnencoded = getOidMarshaller().joinAsOid(domainType, instanceIdUnencoded);
+ String oidStrUnencoded = OID_MARSHALLER.joinAsOid(domainType, instanceIdUnencoded);
return getObjectAdapter(rendererContext, oidStrUnencoded);
}
@@ -53,15 +55,11 @@ public final class OidUtils {
private static ObjectAdapter getObjectAdapter(
final RendererContext rendererContext,
final String oidStrUnencoded) {
- RootOid rootOid = RootOid.deString(oidStrUnencoded, getOidMarshaller());
+ RootOid rootOid = RootOid.deString(oidStrUnencoded);
final PersistenceSession persistenceSession = rendererContext.getPersistenceSession();
return persistenceSession.adapterForAny(rootOid);
}
- private static OidMarshaller getOidMarshaller() {
- return new OidMarshaller();
- }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java
index 9164f20..6157373 100644
--- a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java
+++ b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java
@@ -162,7 +162,7 @@ public class ResourceContextTest_ensureCompatibleAcceptHeader {
private ResourceContext instantiateResourceContext(
final RepresentationType representationType) {
return new ResourceContext(representationType, httpHeaders, null, null, null, null, null, null, httpServletRequest, null, null,
- null, null, null);
+ null);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
index d886275..8e20191 100644
--- a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
+++ b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
@@ -57,7 +57,7 @@ public class ResourceContextTest_getArg {
givenServletRequestParameterMapEmpty();
resourceContext = new ResourceContext(null, null, null, null, null, null, null, (String)null, httpServletRequest, null, null,
- null, null, null) {
+ null) {
@Override
void init(final RepresentationType representationType) {
//
@@ -74,7 +74,7 @@ public class ResourceContextTest_getArg {
givenServletRequestParameterMapEmpty();
resourceContext = new ResourceContext(null, null, null, null, null, null, null, (String)null, httpServletRequest, null, null,
- null, null, null) {
+ null) {
@Override
void init(final RepresentationType representationType) {
//
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 21bb367..a591de7 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -69,6 +69,7 @@ import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.webapp.IsisWebAppBootstrapper;
+import org.apache.isis.core.webapp.WebAppConstants;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
@@ -268,6 +269,7 @@ public class IsisWicketApplication
injector.injectMembers(this); // populates this.isisSessionFactory
+ getServletContext().setAttribute(WebAppConstants.ISIS_SESSION_FACTORY, this.isisSessionFactory);
if (requestCycleListenerForIsis instanceof WebRequestCycleForIsis) {
@@ -645,6 +647,7 @@ public class IsisWicketApplication
if (isisSessionFactory != null) {
isisSessionFactory.destroyServicesAndShutdown();
}
+ getServletContext().setAttribute(WebAppConstants.ISIS_SESSION_FACTORY, null);
super.onDestroy();
} catch(final RuntimeException ex) {
// symmetry with #init()
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
index 077b947..e07cdc4 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
@@ -25,7 +25,6 @@ import org.apache.wicket.util.convert.IConverter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -39,15 +38,13 @@ public class ConverterForObjectAdapter implements IConverter<ObjectAdapter> {
private static final long serialVersionUID = 1L;
- private static final OidMarshaller OID_MARSHALLER = new OidMarshaller();
-
/**
* Converts string representation of {@link Oid} to
* {@link ObjectAdapter}.
*/
@Override
public ObjectAdapter convertToObject(final String value, final Locale locale) {
- final Oid oid = RootOid.deStringEncoded(value, OID_MARSHALLER);
+ final Oid oid = RootOid.deStringEncoded(value);
return getPersistenceSession().getAdapterFor(oid);
}
@@ -62,7 +59,7 @@ public class ConverterForObjectAdapter implements IConverter<ObjectAdapter> {
return null;
}
- return oid.enString(OID_MARSHALLER);
+ return oid.enString();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
index 1a35039..21cebae 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
@@ -28,7 +28,6 @@ import org.apache.wicket.util.convert.IConverter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
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.RootOid;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
@@ -45,8 +44,6 @@ public class ConverterForObjectAdapterMemento implements IConverter<ObjectAdapte
private static final long serialVersionUID = 1L;
- private static final OidMarshaller OID_MARSHALLER = new OidMarshaller();
-
/**
* Converts string representation of {@link Oid} to
* {@link ObjectAdapterMemento}.
@@ -56,7 +53,7 @@ public class ConverterForObjectAdapterMemento implements IConverter<ObjectAdapte
if (Strings.isNullOrEmpty(value)) {
return null;
}
- final Oid oid = RootOid.deStringEncoded(value, OID_MARSHALLER);
+ final Oid oid = RootOid.deStringEncoded(value);
final ObjectAdapter adapter = getPersistenceSession().getAdapterFor(oid);
return ObjectAdapterMemento.createOrNull(adapter);
}
@@ -77,7 +74,7 @@ public class ConverterForObjectAdapterMemento implements IConverter<ObjectAdapte
// REVIEW: is this right?
return memento.toString();
}
- return oid.enString(OID_MARSHALLER);
+ return oid.enString();
}
// //////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicket_providers.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicket_providers.java b/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicket_providers.java
index 8150859..a23b54c 100644
--- a/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicket_providers.java
+++ b/core/viewer-wicket-impl/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicket_providers.java
@@ -32,7 +32,7 @@ import org.junit.Test;
import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.IsisSystem;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactoryBuilder;
public class IsisWicket_providers {
@@ -63,7 +63,7 @@ public class IsisWicket_providers {
// need to handle config
@Test
public void isisSystem() {
- final IsisSystem instance = injector.getInstance(IsisSystem.class);
+ final IsisSessionFactoryBuilder instance = injector.getInstance(IsisSessionFactoryBuilder.class);
assertThat(instance, is(notNullValue()));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
index a6e8a88..4333cf4 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
@@ -47,7 +47,8 @@ import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
public class ObjectAdapterMemento implements Serializable {
private static final long serialVersionUID = 1L;
- public static final OidMarshaller OID_MARSHALLER = new OidMarshaller();
+
+ public static final OidMarshaller OID_MARSHALLER = OidMarshaller.INSTANCE;
/**
* Factory method
@@ -131,7 +132,7 @@ public class ObjectAdapterMemento implements Serializable {
// we copy this updated oid string into our memento so that, if we retry,
// we will succeed second time around
- oam.persistentOidStr = oid.enString(OID_MARSHALLER);
+ oam.persistentOidStr = oid.enString();
}
}
@@ -144,7 +145,7 @@ public class ObjectAdapterMemento implements Serializable {
final ObjectAdapter adapter = recreateAdapter(
oam, ConcurrencyChecking.NO_CHECK, persistenceSession, specificationLoader);
Oid oid = adapter.getOid();
- oam.persistentOidStr = oid.enString(OID_MARSHALLER);
+ oam.persistentOidStr = oid.enString();
}
@Override
@@ -265,7 +266,7 @@ public class ObjectAdapterMemento implements Serializable {
assert !rootOid.isTransient();
- this.persistentOidStr = rootOid.enString(OID_MARSHALLER);
+ this.persistentOidStr = rootOid.enString();
this.bookmark = rootOid.asBookmark();
this.objectSpecId = rootOid.getObjectSpecId();
this.type = Type.PERSISTENT;
@@ -299,7 +300,7 @@ public class ObjectAdapterMemento implements Serializable {
return;
}
- persistentOidStr = oid.enString(OID_MARSHALLER);
+ persistentOidStr = oid.enString();
bookmark = oid.asBookmark();
type = Type.PERSISTENT;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index 2188b70..7822bdb 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -52,6 +52,7 @@ import org.apache.isis.applib.services.routing.RoutingService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.applib.value.NamedWithMimeType;
+import org.apache.isis.core.commons.authentication.MessageBroker;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
@@ -82,9 +83,10 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
private static final long serialVersionUID = 1L;
+ private static final OidMarshaller OID_MARSHALLER = OidMarshaller.INSTANCE;
+
private static final String NULL_ARG = "$nullArg$";
private static final Pattern KEY_VALUE_PATTERN = Pattern.compile("([^=]+)=(.+)");
- public static final OidMarshaller OID_MARSHALLER = new OidMarshaller();
/**
* Whether we are obtaining arguments (eg in a dialog), or displaying the
@@ -135,8 +137,8 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
final PageParameters pageParameters = PageParametersUtils.newPageParameters();
final String oidStr = concurrencyChecking == ConcurrencyChecking.CHECK?
- adapter.getOid().enString(OID_MARSHALLER):
- adapter.getOid().enStringNoVersion(OID_MARSHALLER);
+ adapter.getOid().enString():
+ adapter.getOid().enStringNoVersion();
PageParameterNames.OBJECT_OID.addStringTo(pageParameters, oidStr);
final ActionType actionType = objectAction.getType();
@@ -398,7 +400,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
return encodeable.toEncodedString(adapter);
}
- return adapter.getOid().enStringNoVersion(OID_MARSHALLER);
+ return adapter.getOid().enStringNoVersion();
}
private ObjectAdapter decodeArg(final ObjectSpecification objSpec, final String encoded) {
@@ -412,7 +414,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
}
try {
- final RootOid oid = RootOid.deStringEncoded(encoded, OID_MARSHALLER);
+ final RootOid oid = RootOid.deStringEncoded(encoded);
return getPersistenceSession().adapterFor(oid);
} catch (final Exception e) {
return null;
@@ -575,7 +577,8 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
// equivalent to calling DomainObjectContainer#raiseError(...)
final RecoverableException appEx = getApplicationExceptionIfAny(ex);
if (appEx != null) {
- getServicesInjector().getMessageBroker().setApplicationError(appEx.getMessage());
+ final MessageBroker messageBroker = getCurrentSession().getAuthenticationSession().getMessageBroker();
+ messageBroker.setApplicationError(appEx.getMessage());
// there's no need to set the abort cause on the transaction, it will have already been done
// (in IsisTransactionManager#executeWithinTransaction(...)).
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
index 14c05d7..8be9bbf 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
@@ -40,7 +40,7 @@ public class BookmarkTreeNode implements Serializable {
private static final long serialVersionUID = 1L;
- private static final OidMarshaller OID_MARSHALLER = new OidMarshaller();
+ private static final OidMarshaller OID_MARSHALLER = OidMarshaller.INSTANCE;
private final List<BookmarkTreeNode> children = Lists.newArrayList();
private final int depth;
@@ -212,7 +212,7 @@ public class BookmarkTreeNode implements Serializable {
if(possibleParentOid == null) {
continue;
}
- final String possibleParentOidStr = possibleParentOid.enStringNoVersion(OID_MARSHALLER);
+ final String possibleParentOidStr = possibleParentOid.enStringNoVersion();
if(Objects.equal(this.oidNoVerStr, possibleParentOidStr)) {
this.addChild(candidateBookmarkableModel);
whetherAdded = true;
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
index 37cac0b..8cb4726 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
@@ -61,7 +61,7 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> implements UiH
private static final long serialVersionUID = 1L;
- private static OidMarshaller oidMarshaller = new OidMarshaller();
+ private static final OidMarshaller OID_MARSHALLER = OidMarshaller.INSTANCE;
// //////////////////////////////////////////////////////////
// factory methods for PageParameters
@@ -78,7 +78,7 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> implements UiH
final Boolean persistent = adapter != null && adapter.representsPersistent();
if (persistent) {
- final String oidStr = adapter.getOid().enStringNoVersion(oidMarshaller);
+ final String oidStr = adapter.getOid().enStringNoVersion();
PageParameterNames.OBJECT_OID.addStringTo(pageParameters, oidStr);
} else {
// don't do anything; instead the page should be redirected back to
@@ -175,7 +175,7 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> implements UiH
}
private static RootOid rootOidFrom(final PageParameters pageParameters) {
- return oidMarshaller.unmarshal(oidStr(pageParameters), RootOid.class);
+ return OID_MARSHALLER.unmarshal(oidStr(pageParameters), RootOid.class);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
index 7e5b744..4a99c7a 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
@@ -244,7 +244,7 @@ public final class BulkActionsLinkFactory implements ActionLinkFactory {
}
public AuthenticationSession getAuthenticationSession() {
- return getServicesInjector().getAuthenticationSession();
+ return getIsisSessionFactory().getCurrentSession().getAuthenticationSession();
}
protected MessageBroker getMessageBroker() {
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
index 99842ae..ef21a30 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
@@ -27,6 +27,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.ResourceModel;
+import org.apache.isis.core.commons.authentication.MessageBroker;
import org.apache.isis.core.commons.ensure.Ensure;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.viewer.wicket.model.hints.IsisPropertyEditCompletedEvent;
@@ -140,7 +141,9 @@ public class PropertyEditFormPanel extends PanelAbstract<ScalarModel> {
// ensure any jGrowl errors are shown
// (normally would be flushed when traverse to next page).
- String errorMessagesIfAny = JGrowlUtil.asJGrowlCalls(getServicesInjector().getMessageBroker());
+ final MessageBroker messageBroker = getIsisSessionFactory().getCurrentSession()
+ .getAuthenticationSession().getMessageBroker();
+ String errorMessagesIfAny = JGrowlUtil.asJGrowlCalls(messageBroker);
builder.append(errorMessagesIfAny);
// append the JS to the response.
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
index 4eb77e6..cdc2250 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
@@ -132,7 +132,7 @@ public abstract class ObjectAdapterMementoProviderAbstract extends TextChoicePro
if(NULL_PLACEHOLDER.equals(input)) {
return null;
}
- final RootOid oid = RootOid.deString(input, ObjectAdapterMemento.OID_MARSHALLER);
+ final RootOid oid = RootOid.deString(input);
return ObjectAdapterMemento.createPersistent(oid);
}
};
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
index 599211e..8311498 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
@@ -37,7 +37,8 @@ public class BreadcrumbModel implements Serializable {
private static final long serialVersionUID = 1L;
private static final int MAX_SIZE = 5;
- public static final OidMarshaller OID_MARSHALLER = new OidMarshaller();
+
+ private static final OidMarshaller OID_MARSHALLER = OidMarshaller.INSTANCE;
private final Map<String, EntityModel> entityModelByOidStr = Maps.newHashMap();
private final Map<EntityModel, String> oidStrByEntityModel = Maps.newHashMap();
@@ -74,7 +75,7 @@ public class BreadcrumbModel implements Serializable {
}
try {
final RootOid unmarshal = OID_MARSHALLER.unmarshal(oidStr, RootOid.class);
- return unmarshal.enStringNoVersion(OID_MARSHALLER);
+ return unmarshal.enStringNoVersion();
} catch(Exception ex) {
return null;
}
@@ -119,7 +120,7 @@ public class BreadcrumbModel implements Serializable {
try {
final PageParameters pageParameters = choice.getPageParameters();
final String oidStr = PageParameterNames.OBJECT_OID.getStringFrom(pageParameters);
- return RootOid.deString(oidStr, OID_MARSHALLER);
+ return RootOid.deString(oidStr);
} catch (Exception ex) {
remove(choice);
return null;
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index d831804..07be860 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@ -103,7 +103,8 @@ public class BreadcrumbPanel extends PanelAbstract<IModel<Void>> {
final String oidStr = breadcrumbChoice.getInput();
final EntityModel selectedModel = breadcrumbModel.lookup(oidStr);
if(selectedModel == null) {
- final MessageBroker messageBroker = getServicesInjector().getMessageBroker();
+ final MessageBroker messageBroker = getIsisSessionFactory().getCurrentSession()
+ .getAuthenticationSession().getMessageBroker();
messageBroker.addWarning("Cannot find object");
String feedbackMsg = JGrowlUtil.asJGrowlCalls(messageBroker);
target.appendJavaScript(feedbackMsg);
http://git-wip-us.apache.org/repos/asf/isis/blob/b1287594/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index bf27fcd..a7ce4bb 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -30,10 +30,11 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-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;
+import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
@@ -134,7 +135,7 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel
* @return
*/
public AuthenticationSession getAuthenticationSession() {
- return getServicesInjector().getAuthenticationSession();
+ return getIsisSessionFactory().getCurrentSession().getAuthenticationSession();
}
@@ -173,7 +174,7 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel
ConfirmationConfig confirmationConfig = new ConfirmationConfig();
- final String context = IsisSystem.class.getName();
+ final String context = IsisSessionFactoryBuilder.class.getName();
final String areYouSure = translationService.translate(context, IsisSystem.MSG_ARE_YOU_SURE);
final String confirm = translationService.translate(context, IsisSystem.MSG_CONFIRM);
final String cancel = translationService.translate(context, IsisSystem.MSG_CANCEL);
@@ -191,7 +192,7 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel
public DeploymentCategory getDeploymentCategory() {
- return getServicesInjector().getDeploymentCategory();
+ return getIsisSessionFactory().getDeploymentCategory();
}
[09/50] [abbrv] isis git commit: ISIS-1428: rationalizing and
simplifying IsisComponentProvider hierarchy. Removing ability to override
services and installable fixtures within IsisSystemForTest.Builder. Making
AppManifest mandatory.
Posted by da...@apache.org.
ISIS-1428: rationalizing and simplifying IsisComponentProvider hierarchy. Removing ability to override services and installable fixtures within IsisSystemForTest.Builder. Making AppManifest mandatory.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ccfcfe79
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ccfcfe79
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ccfcfe79
Branch: refs/heads/master
Commit: ccfcfe79cda641dfbdbcbfadb4a940a1d45ca186
Parents: 698493f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 8 19:30:04 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 8 19:30:04 2016 +0100
----------------------------------------------------------------------
.../IsisComponentProviderDefault.java | 6 +-
.../integtestsupport/IsisSystemForTest.java | 22 ----
.../core/runtime/runner/IsisInjectModule.java | 2 +-
.../isis/core/runtime/system/IsisSystem.java | 11 +-
.../IsisComponentProvider.java | 80 ++++++--------
.../IsisComponentProviderDefault2.java | 57 +++++-----
.../IsisComponentProviderUsingInstallers.java | 105 ++++++++++---------
7 files changed, 122 insertions(+), 161 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ccfcfe79/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java
index 2aef23e..87518b2 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java
@@ -19,10 +19,7 @@
package org.apache.isis.core.integtestsupport;
-import java.util.List;
-
import org.apache.isis.applib.AppManifest;
-import org.apache.isis.applib.fixtures.InstallableFixture;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProviderDefault2;
@@ -30,9 +27,8 @@ public class IsisComponentProviderDefault extends IsisComponentProviderDefault2
public IsisComponentProviderDefault(
final AppManifest appManifestIfAny,
- final List<InstallableFixture> fixturesOverride,
final IsisConfiguration configurationOverride) {
- super(appManifestIfAny, fixturesOverride, configurationOverride);
+ super(appManifestIfAny, configurationOverride);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ccfcfe79/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 546b2f7..9d47ee9 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
@@ -19,11 +19,9 @@
package org.apache.isis.core.integtestsupport;
-import java.util.Arrays;
import java.util.List;
import java.util.Set;
-import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import org.junit.After;
@@ -52,9 +50,6 @@ import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.fixtures.FixturesInstaller;
import org.apache.isis.core.runtime.fixtures.FixturesInstallerDelegate;
import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
-import org.apache.isis.core.runtime.services.ServicesInstaller;
-import org.apache.isis.core.runtime.services.ServicesInstallerFromAnnotation;
-import org.apache.isis.core.runtime.services.ServicesInstallerFromConfigurationAndAnnotation;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -184,18 +179,6 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
return this;
}
- /**
- * @deprecated - prefer to use {@link org.apache.isis.applib.fixturescripts.FixtureScript}s API instead.
- */
- @Deprecated
- public Builder withFixtures(InstallableFixture... fixtures) {
- if(appManifestIfAny != null) {
- throw new IllegalStateException("An appManifest has already been provided");
- }
- this.fixtures.addAll(Arrays.asList(fixtures));
- return this;
- }
-
public Builder withLoggingAt(org.apache.log4j.Level level) {
this.level = level;
return this;
@@ -206,7 +189,6 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
new IsisSystemForTest(
appManifestIfAny,
configuration,
- fixtures,
authenticationRequest,
listeners);
if(level != null) {
@@ -259,7 +241,6 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
// these fields 'xxxForComponentProvider' are used to initialize the IsisComponentProvider, but shouldn't be used thereafter.
private final AppManifest appManifestIfAny;
private final IsisConfiguration configurationOverride;
- private final List<InstallableFixture> fixturesIfAny;
private final AuthenticationRequest authenticationRequestIfAny;
private AuthenticationSession authenticationSession;
@@ -268,12 +249,10 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
private IsisSystemForTest(
final AppManifest appManifestIfAny,
final IsisConfiguration configurationOverride,
- final List<InstallableFixture> fixturesIfAny,
final AuthenticationRequest authenticationRequestIfAny,
final List<Listener> listeners) {
this.appManifestIfAny = appManifestIfAny;
this.configurationOverride = configurationOverride;
- this.fixturesIfAny = fixturesIfAny;
this.authenticationRequestIfAny = authenticationRequestIfAny;
this.listeners = listeners;
}
@@ -332,7 +311,6 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
componentProvider = new IsisComponentProviderDefault(
appManifestIfAny,
- fixturesIfAny,
configurationOverride
);
http://git-wip-us.apache.org/repos/asf/isis/blob/ccfcfe79/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 d676e69..62cd1d0 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
@@ -96,7 +96,7 @@ public class IsisInjectModule extends AbstractModule {
final AppManifest appManifest = appManifestIfAny != APP_MANIFEST_NOOP ? appManifestIfAny : null;
final IsisComponentProviderUsingInstallers componentProvider =
- new IsisComponentProviderUsingInstallers(isisConfiguration, appManifest);
+ new IsisComponentProviderUsingInstallers(appManifest, isisConfiguration);
final IsisSystem system = new IsisSystem(componentProvider, deploymentCategory);
http://git-wip-us.apache.org/repos/asf/isis/blob/ccfcfe79/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 2d0a8d0..88b73f0 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
@@ -56,6 +56,7 @@ 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.IsisSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManagerException;
@@ -85,8 +86,8 @@ public class IsisSystem implements ApplicationScopedComponent {
private final IsisTimeZoneInitializer timeZoneInitializer;
public IsisSystem(final AppManifest manifest) {
- this(new IsisComponentProviderDefault2(
- manifest, null, null), DeploymentCategory.PRODUCTION);
+ this(new IsisComponentProviderDefault2(manifest, null),
+ DeploymentCategory.PRODUCTION);
}
public IsisSystem(final IsisComponentProvider componentProvider, final DeploymentCategory deploymentCategory) {
@@ -318,9 +319,8 @@ public class IsisSystem implements ApplicationScopedComponent {
}
// call @PreDestroy (in a session)
- IsisTransactionManager transactionManager = getCurrentSessionTransactionManager();
-
IsisContext.openSession(new InitialisationSession());
+ IsisTransactionManager transactionManager = getCurrentSessionTransactionManager();
try {
transactionManager.startTransaction();
try {
@@ -364,7 +364,8 @@ public class IsisSystem implements ApplicationScopedComponent {
}
IsisTransactionManager getCurrentSessionTransactionManager() {
- return sessionFactory.getCurrentSession().getPersistenceSession().getTransactionManager();
+ final IsisSession currentSession = sessionFactory.getCurrentSession();
+ return currentSession.getPersistenceSession().getTransactionManager();
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/ccfcfe79/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
index e95386b..b4f57e2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
@@ -62,17 +62,13 @@ import org.apache.isis.core.runtime.fixtures.FixturesInstaller;
import org.apache.isis.core.runtime.fixtures.FixturesInstallerFromConfiguration;
import org.apache.isis.core.runtime.services.ServicesInstallerFromAnnotation;
import org.apache.isis.core.runtime.services.ServicesInstallerFromConfiguration;
+import org.apache.isis.core.runtime.services.ServicesInstallerFromConfigurationAndAnnotation;
import org.apache.isis.core.runtime.system.IsisSystemException;
import org.apache.isis.core.runtime.system.SystemConstants;
import org.apache.isis.objectstore.jdo.service.RegisterEntities;
import org.apache.isis.progmodels.dflt.JavaReflectorHelper;
import org.apache.isis.progmodels.dflt.ProgrammingModelFacetsJava5;
-import static org.apache.isis.core.commons.ensure.Ensure.ensureThatState;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-
/**
*
*/
@@ -80,28 +76,42 @@ public abstract class IsisComponentProvider {
//region > constructor, fields
- private final AppManifest appManifestIfAny;
+ private final AppManifest appManifest;
private final IsisConfigurationDefault configuration;
+ protected final List<Object> services;
+ protected final AuthenticationManager authenticationManager;
+ protected final AuthorizationManager authorizationManager;
public IsisComponentProvider(
- final AppManifest appManifestIfAny,
- final IsisConfiguration configuration) {
+ final AppManifest appManifest,
+ final IsisConfiguration configuration,
+ final AuthenticationManager authenticationManager,
+ final AuthorizationManager authorizationManager){
+
+ if(appManifest == null) {
+ throw new IllegalArgumentException("AppManifest is required");
+ }
- this.appManifestIfAny = appManifestIfAny;
+ this.appManifest = appManifest;
this.configuration = (IsisConfigurationDefault) configuration; // REVIEW: HACKY
- if(appManifestIfAny != null) {
+ putAppManifestKey(appManifest);
+ findAndRegisterTypes(appManifest);
+ specifyServicesAndRegisteredEntitiesUsing(appManifest);
- putAppManifestKey(appManifestIfAny);
- findAndRegisterTypes(appManifestIfAny);
- specifyServicesAndRegisteredEntitiesUsing(appManifestIfAny);
+ overrideConfigurationUsing(appManifest);
- overrideConfigurationUsing(appManifestIfAny);
- }
+ this.services = new ServicesInstallerFromConfigurationAndAnnotation(getConfiguration()).getServices();
+
+ final String fixtureClassNamesCsv = classNamesFrom(getAppManifest().getFixtures());
+ putConfigurationProperty(FixturesInstallerFromConfiguration.FIXTURES, fixtureClassNamesCsv);
+
+ this.authenticationManager = authenticationManager;
+ this.authorizationManager = authorizationManager;
}
- public AppManifest getAppManifestIfAny() {
- return appManifestIfAny;
+ public AppManifest getAppManifest() {
+ return appManifest;
}
public IsisConfigurationDefault getConfiguration() {
@@ -110,7 +120,6 @@ public abstract class IsisComponentProvider {
//endregion
-
//region > helpers (appManifest)
private void putAppManifestKey(final AppManifest appManifest) {
@@ -221,34 +230,7 @@ public abstract class IsisComponentProvider {
//endregion
- //region > services, configuration, authenticationManager, authorizationManager (populated by subclass)
-
- /**
- * populated by subclass, in its constructor.
- */
- protected List<Object> services;
- /**
- * populated by subclass, in its constructor.
- */
- protected AuthenticationManager authenticationManager;
- /**
- * populated by subclass, in its constructor.
- */
- protected AuthorizationManager authorizationManager;
-
-
- /**
- * Provided for subclasses to call to ensure that they have correctly populated all fields.
- */
- protected void ensureInitialized() {
- ensureThatState(authenticationManager, is(not(nullValue())));
- ensureThatState(authorizationManager, is(not(nullValue())));
- ensureThatState(services, is(not(nullValue())));
- ensureThatState(configuration, is(not(nullValue())));
- }
- //endregion
-
- //region > provide*
+ //region > provideAuth*
public AuthenticationManager provideAuthenticationManager() {
return authenticationManager;
@@ -260,7 +242,7 @@ public abstract class IsisComponentProvider {
//endregion
- //region > provide*
+ //region > provideServiceInjector
public ServicesInjector provideServiceInjector(final IsisConfiguration configuration) {
return new ServicesInjector(services, configuration);
@@ -268,7 +250,7 @@ public abstract class IsisComponentProvider {
//endregion
- //region > provide*
+ //region > provideFixturesInstaller
public FixturesInstaller provideFixturesInstaller() {
return new FixturesInstallerFromConfiguration(getConfiguration());
@@ -276,7 +258,7 @@ public abstract class IsisComponentProvider {
//endregion
- //region > provide*
+ //region > provideSpecificationLoader
public SpecificationLoader provideSpecificationLoader(
final DeploymentCategory deploymentCategory,
http://git-wip-us.apache.org/repos/asf/isis/blob/ccfcfe79/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
index 9bdd96b..a2c0ea9 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
@@ -19,10 +19,7 @@
package org.apache.isis.core.runtime.systemusinginstallers;
-import java.util.List;
-
import org.apache.isis.applib.AppManifest;
-import org.apache.isis.applib.fixtures.InstallableFixture;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;
@@ -30,36 +27,40 @@ import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandard;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.authorization.standard.AuthorizationManagerStandard;
-import org.apache.isis.core.runtime.fixtures.FixturesInstallerFromConfiguration;
-import org.apache.isis.core.runtime.services.ServicesInstallerFromConfiguration;
-import org.apache.isis.core.runtime.services.ServicesInstallerFromConfigurationAndAnnotation;
public class IsisComponentProviderDefault2 extends IsisComponentProvider {
+ //region > constructors
public IsisComponentProviderDefault2(
- final AppManifest appManifestIfAny,
- final List<InstallableFixture> fixturesOverride,
+ final AppManifest appManifest,
final IsisConfiguration configurationOverride) {
- super(appManifestIfAny, elseDefault(configurationOverride));
-
- final IsisConfigurationDefault configuration = getConfiguration();
-
- this.services = appManifestIfAny != null
- ? new ServicesInstallerFromConfigurationAndAnnotation(configuration).getServices()
- : new ServicesInstallerFromConfiguration(configuration).getServices();
+ this(elseDefault(configurationOverride), appManifest);
- final String fixtureClassNamesCsv = classNamesFrom(
- appManifestIfAny != null ? appManifestIfAny.getFixtures() : fixturesOverride);
-
- putConfigurationProperty(FixturesInstallerFromConfiguration.FIXTURES, fixtureClassNamesCsv);
+ }
- // integration tests ignore appManifest for authentication and authorization.
- this.authenticationManager = createAuthenticationManager();
- this.authorizationManager = createAuthorizationManager();
+ private IsisComponentProviderDefault2(
+ final IsisConfigurationDefault configuration,
+ final AppManifest appManifest
+ ) {
+ this(configuration, appManifest,
+ // integration tests ignore appManifest for authentication and authorization.
+ authenticationManagerWithBypass(configuration),
+ new AuthorizationManagerStandard(configuration));
+ }
+ private IsisComponentProviderDefault2(
+ final IsisConfigurationDefault configuration,
+ final AppManifest appManifest,
+ final AuthenticationManager authenticationManager,
+ final AuthorizationManager authorizationManager
+ ) {
+ super(appManifest, configuration, authenticationManager, authorizationManager);
}
+ //endregion
+
+ //region > constructor helpers (factories)
/**
* Default will read <tt>isis.properties</tt> (and other optional property files) from the "config"
* package on the current classpath.
@@ -73,16 +74,12 @@ public class IsisComponentProviderDefault2 extends IsisComponentProvider {
/**
* The standard authentication manager, configured with the 'bypass' authenticator (allows all requests through).
*/
- private AuthenticationManager createAuthenticationManager() {
- final AuthenticationManagerStandard authenticationManager =
- new AuthenticationManagerStandard(getConfiguration());
- authenticationManager.addAuthenticator(new AuthenticatorBypass(getConfiguration()));
+ private static AuthenticationManager authenticationManagerWithBypass(final IsisConfiguration configuration ) {
+ final AuthenticationManagerStandard authenticationManager = new AuthenticationManagerStandard(configuration);
+ authenticationManager.addAuthenticator(new AuthenticatorBypass(configuration));
return authenticationManager;
}
-
- private AuthorizationManager createAuthorizationManager() {
- return new AuthorizationManagerStandard(getConfiguration());
- }
+ //endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/ccfcfe79/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
index 90caf2e..de65a71 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
@@ -27,86 +27,62 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.applib.AppManifest;
-import org.apache.isis.applib.fixturescripts.FixtureScript;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.components.Installer;
import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.factory.InstanceCreationClassException;
import org.apache.isis.core.commons.factory.InstanceCreationException;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.commons.factory.UnavailableClassException;
import org.apache.isis.core.commons.lang.ObjectExtensions;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
+import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
-import org.apache.isis.core.runtime.fixtures.FixturesInstallerFromConfiguration;
-import org.apache.isis.core.runtime.services.ServicesInstaller;
-import org.apache.isis.core.runtime.services.ServicesInstallerFromConfigurationAndAnnotation;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.SystemConstants;
-import static org.apache.isis.core.commons.ensure.Ensure.ensureThatState;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-
public class IsisComponentProviderUsingInstallers extends IsisComponentProvider {
+ //region > constructors
public IsisComponentProviderUsingInstallers(
- final IsisConfiguration configuration, final AppManifest appManifestIfAny) {
- this(appManifestIfAny, configuration, new InstallerLookup(configuration));
+ final AppManifest appManifestIfAny,
+ final IsisConfiguration configuration) {
+ this(appManifestFrom(appManifestIfAny, configuration),
+ (IsisConfigurationDefault) configuration, // REVIEW: HACKY
+ new InstallerLookup(configuration));
}
private IsisComponentProviderUsingInstallers(
- final AppManifest appManifestIfAny,
- final IsisConfiguration configuration,
+ final AppManifest appManifest,
+ final IsisConfigurationDefault configuration,
final InstallerLookup installerLookup) {
- super(
- appManifestIfAny(appManifestIfAny, configuration),
- configuration);
-
- if(getAppManifestIfAny() != null) {
-
- final String authenticationMechanism = getAppManifestIfAny().getAuthenticationMechanism();
- putConfigurationProperty(SystemConstants.AUTHENTICATION_INSTALLER_KEY, authenticationMechanism);
-
- final String authorizationMechanism = getAppManifestIfAny().getAuthorizationMechanism();
- putConfigurationProperty(SystemConstants.AUTHORIZATION_INSTALLER_KEY, authorizationMechanism);
- }
-
- if(getAppManifestIfAny() != null) {
- List<Class<? extends FixtureScript>> fixtureClasses = getAppManifestIfAny().getFixtures();
- final String fixtureClassNamesCsv = classNamesFrom(fixtureClasses);
- putConfigurationProperty(FixturesInstallerFromConfiguration.FIXTURES, fixtureClassNamesCsv);
- }
-
- // loading installers causes the configuration to be appended to successively
- final String requestedAuthencn = getConfiguration().getString(SystemConstants.AUTHENTICATION_INSTALLER_KEY);
- AuthenticationManagerInstaller authenticationInstaller =
- installerLookup.authenticationManagerInstaller(requestedAuthencn);
-
- final String requestedAuthorzn = getConfiguration().getString(SystemConstants.AUTHORIZATION_INSTALLER_KEY);
- AuthorizationManagerInstaller authorizationInstaller =
- installerLookup.authorizationManagerInstaller(requestedAuthorzn);
-
- ServicesInstaller servicesInstaller = new ServicesInstallerFromConfigurationAndAnnotation(getConfiguration());
+ this(configuration, appManifest,
+ lookupAuthenticationManager(appManifest, installerLookup, configuration),
+ lookupAuthorizationManager(appManifest, installerLookup, configuration));
+ }
- // eagerly calculate
- authenticationManager = authenticationInstaller.createAuthenticationManager();
- authorizationManager = authorizationInstaller.createAuthorizationManager();
+ private IsisComponentProviderUsingInstallers(
+ final IsisConfiguration configuration,
+ final AppManifest appManifest,
+ final AuthenticationManager authenticationManager,
+ final AuthorizationManager authorizationManager){
+ super(appManifest, configuration, authenticationManager, authorizationManager);
+ }
- services = servicesInstaller.getServices();
+ //endregion
- ensureInitialized();
- }
+ //region > constructor helpers (factories)
/**
* If an {@link AppManifest} was explicitly provided (eg from the Guice <tt>IsisWicketModule</tt> when running
* unde the Wicket viewer) then use that; otherwise read the <tt>isis.properties</tt> config file and look
* for an <tt>isis.appManifest</tt> entry instead.
*/
- private static AppManifest appManifestIfAny(
+ private static AppManifest appManifestFrom(
final AppManifest appManifestFromConstructor,
final IsisConfiguration configuration) {
if(appManifestFromConstructor != null) {
@@ -118,6 +94,37 @@ public class IsisComponentProviderUsingInstallers extends IsisComponentProvider
: null;
}
+ private static AuthenticationManager lookupAuthenticationManager(
+ final AppManifest appManifest, final InstallerLookup installerLookup,
+ final IsisConfigurationDefault configuration) {
+
+ final String authenticationMechanism = appManifest.getAuthenticationMechanism();
+ final AuthenticationManagerInstaller authenticationInstaller =
+ installerLookup.authenticationManagerInstaller(authenticationMechanism);
+
+ // no longer used, could probably remove
+ configuration.put(SystemConstants.AUTHENTICATION_INSTALLER_KEY, authenticationMechanism);
+
+ return authenticationInstaller.createAuthenticationManager();
+ }
+
+ private static AuthorizationManager lookupAuthorizationManager(
+ final AppManifest appManifest, final InstallerLookup installerLookup,
+ final IsisConfigurationDefault configuration) {
+
+ final String authorizationMechanism = appManifest.getAuthorizationMechanism();
+
+
+ AuthorizationManagerInstaller authorizationInstaller =
+ installerLookup.authorizationManagerInstaller(authorizationMechanism);
+
+ // no longer used, could probably remove
+ configuration.put(SystemConstants.AUTHORIZATION_INSTALLER_KEY, authorizationMechanism);
+
+ return authorizationInstaller.createAuthorizationManager();
+ }
+
+
//endregion
/**
[08/50] [abbrv] isis git commit: ISIS-1428: removing the ability to
override services in IsisSystemForTest (instead, use AppManifest).
Posted by da...@apache.org.
ISIS-1428: removing the ability to override services in IsisSystemForTest (instead, use AppManifest).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/698493f6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/698493f6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/698493f6
Branch: refs/heads/master
Commit: 698493f6ce80a45ee4e23a9406380385787c8b66
Parents: 7ac476c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 8 07:48:16 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 8 07:48:16 2016 +0100
----------------------------------------------------------------------
.../IsisComponentProviderDefault.java | 3 +-
.../integtestsupport/IsisSystemForTest.java | 38 +-------------------
.../isis/core/runtime/system/IsisSystem.java | 2 +-
.../IsisComponentProvider.java | 13 ++++++-
.../IsisComponentProviderDefault2.java | 11 +++---
.../IsisComponentProviderUsingInstallers.java | 6 ----
6 files changed, 19 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/698493f6/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java
index a99835d..2aef23e 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java
@@ -30,10 +30,9 @@ public class IsisComponentProviderDefault extends IsisComponentProviderDefault2
public IsisComponentProviderDefault(
final AppManifest appManifestIfAny,
- final List<Object> servicesOverride,
final List<InstallableFixture> fixturesOverride,
final IsisConfiguration configurationOverride) {
- super(appManifestIfAny, servicesOverride, fixturesOverride, configurationOverride);
+ super(appManifestIfAny, fixturesOverride, configurationOverride);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/698493f6/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 43ed591..546b2f7 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
@@ -184,38 +184,6 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
return this;
}
- public Builder withServicesIn(String... packagePrefixes ) {
- if(appManifestIfAny != null) {
- throw new IllegalStateException("An appManifest has already been provided; instead use AppManifest#getAdditionalServices()");
- }
- if(packagePrefixes.length == 0) {
- throw new IllegalArgumentException("Specify packagePrefixes to search for @DomainService-annotated services");
- }
-
- configuration.put(
- ServicesInstallerFromAnnotation.PACKAGE_PREFIX_KEY,
- Joiner.on(",").join(packagePrefixes)
- );
-
- final ServicesInstaller installer = new ServicesInstallerFromConfigurationAndAnnotation(configuration);
-
- //installer.setConfiguration(configuration);
-
- final List<Object> serviceList = installer.getServices();
- this.services.addAll(serviceList);
-
- installer.init();
- return this;
- }
-
- public Builder withServices(Object... services) {
- if(appManifestIfAny != null) {
- throw new IllegalStateException("An appManifest has already been provided");
- }
- this.services.addAll(Arrays.asList(services));
- return this;
- }
-
/**
* @deprecated - prefer to use {@link org.apache.isis.applib.fixturescripts.FixtureScript}s API instead.
*/
@@ -238,7 +206,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
new IsisSystemForTest(
appManifestIfAny,
configuration,
- services, fixtures,
+ fixtures,
authenticationRequest,
listeners);
if(level != null) {
@@ -291,7 +259,6 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
// these fields 'xxxForComponentProvider' are used to initialize the IsisComponentProvider, but shouldn't be used thereafter.
private final AppManifest appManifestIfAny;
private final IsisConfiguration configurationOverride;
- private final List<Object> servicesIfAny;
private final List<InstallableFixture> fixturesIfAny;
private final AuthenticationRequest authenticationRequestIfAny;
@@ -301,13 +268,11 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
private IsisSystemForTest(
final AppManifest appManifestIfAny,
final IsisConfiguration configurationOverride,
- final List<Object> servicesIfAny,
final List<InstallableFixture> fixturesIfAny,
final AuthenticationRequest authenticationRequestIfAny,
final List<Listener> listeners) {
this.appManifestIfAny = appManifestIfAny;
this.configurationOverride = configurationOverride;
- this.servicesIfAny = servicesIfAny;
this.fixturesIfAny = fixturesIfAny;
this.authenticationRequestIfAny = authenticationRequestIfAny;
this.listeners = listeners;
@@ -367,7 +332,6 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
componentProvider = new IsisComponentProviderDefault(
appManifestIfAny,
- servicesIfAny,
fixturesIfAny,
configurationOverride
);
http://git-wip-us.apache.org/repos/asf/isis/blob/698493f6/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 d3d872d..2d0a8d0 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
@@ -86,7 +86,7 @@ public class IsisSystem implements ApplicationScopedComponent {
public IsisSystem(final AppManifest manifest) {
this(new IsisComponentProviderDefault2(
- manifest, null, null, null), DeploymentCategory.PRODUCTION);
+ manifest, null, null), DeploymentCategory.PRODUCTION);
}
public IsisSystem(final IsisComponentProvider componentProvider, final DeploymentCategory deploymentCategory) {
http://git-wip-us.apache.org/repos/asf/isis/blob/698493f6/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
index 8bceef1..e95386b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
@@ -98,7 +98,6 @@ public abstract class IsisComponentProvider {
overrideConfigurationUsing(appManifestIfAny);
}
-
}
public AppManifest getAppManifestIfAny() {
@@ -259,14 +258,26 @@ public abstract class IsisComponentProvider {
return authorizationManager;
}
+ //endregion
+
+ //region > provide*
+
public ServicesInjector provideServiceInjector(final IsisConfiguration configuration) {
return new ServicesInjector(services, configuration);
}
+ //endregion
+
+ //region > provide*
+
public FixturesInstaller provideFixturesInstaller() {
return new FixturesInstallerFromConfiguration(getConfiguration());
}
+ //endregion
+
+ //region > provide*
+
public SpecificationLoader provideSpecificationLoader(
final DeploymentCategory deploymentCategory,
final ServicesInjector servicesInjector,
http://git-wip-us.apache.org/repos/asf/isis/blob/698493f6/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
index 11970e8..9bdd96b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
@@ -37,20 +37,17 @@ import org.apache.isis.core.runtime.services.ServicesInstallerFromConfigurationA
public class IsisComponentProviderDefault2 extends IsisComponentProvider {
-
-
public IsisComponentProviderDefault2(
final AppManifest appManifestIfAny,
- final List<Object> servicesOverride,
final List<InstallableFixture> fixturesOverride,
final IsisConfiguration configurationOverride) {
super(appManifestIfAny, elseDefault(configurationOverride));
+ final IsisConfigurationDefault configuration = getConfiguration();
+
this.services = appManifestIfAny != null
- ? new ServicesInstallerFromConfigurationAndAnnotation(getConfiguration()).getServices()
- : servicesOverride != null
- ? servicesOverride
- : new ServicesInstallerFromConfiguration(getConfiguration()).getServices();
+ ? new ServicesInstallerFromConfigurationAndAnnotation(configuration).getServices()
+ : new ServicesInstallerFromConfiguration(configuration).getServices();
final String fixtureClassNamesCsv = classNamesFrom(
appManifestIfAny != null ? appManifestIfAny.getFixtures() : fixturesOverride);
http://git-wip-us.apache.org/repos/asf/isis/blob/698493f6/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
index 7137fae..90caf2e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
@@ -92,12 +92,6 @@ public class IsisComponentProviderUsingInstallers extends IsisComponentProvider
ServicesInstaller servicesInstaller = new ServicesInstallerFromConfigurationAndAnnotation(getConfiguration());
- // ensure we were able to load all components via InstallerLookup (fail fast)
- ensureThatState(authenticationInstaller, is(not(nullValue())),
- "authenticationInstaller could not be looked up");
- ensureThatState(authorizationInstaller, is(not(nullValue())),
- "authorizationInstaller could not be looked up");
-
// eagerly calculate
authenticationManager = authenticationInstaller.createAuthenticationManager();
authorizationManager = authorizationInstaller.createAuthorizationManager();
[46/50] [abbrv] isis git commit: ISIS-1443: removes markAsService
from ObjectSpecification, instead specify through the constructor.
Posted by da...@apache.org.
ISIS-1443: removes markAsService from ObjectSpecification, instead specify through the constructor.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/25149b05
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/25149b05
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/25149b05
Branch: refs/heads/master
Commit: 25149b05411fd2d88c4b02f6b8b9f13fb7850b1c
Parents: ed31863
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jun 16 10:02:49 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jun 16 10:26:04 2016 +0100
----------------------------------------------------------------------
.../metamodel/spec/ObjectSpecification.java | 1 -
.../specloader/SpecificationLoader.java | 13 ++--
.../specimpl/ObjectSpecificationAbstract.java | 13 ++--
.../dflt/ObjectSpecificationDefault.java | 71 ++++++++------------
.../ObjectSpecificationOnStandaloneList.java | 50 +++++---------
.../testspec/ObjectSpecificationStub.java | 4 --
6 files changed, 58 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/25149b05/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 ec1b856..2869f0e 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
@@ -348,7 +348,6 @@ public interface ObjectSpecification extends Specification, ObjectActionContaine
*/
boolean isService();
- public void markAsService();
// //////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/25149b05/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
index ebd988e..bc745fe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
@@ -337,7 +337,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
private synchronized ObjectSpecification loadSpecificationForSubstitutedClassSynchronized(
final Class<?> type,
- final NatureOfService nature) {
+ final NatureOfService natureOfService) {
final String typeName = type.getName();
final ObjectSpecification spec = cache.get(typeName);
@@ -345,10 +345,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
// because caller isn't synchronized.
return spec;
}
- final ObjectSpecification specification = createSpecification(type);
- if(nature != null) {
- specification.markAsService();
- }
+ final ObjectSpecification specification = createSpecification(type, natureOfService);
if (specification == null) {
throw new IsisException("Failed to create specification for class " + typeName);
}
@@ -390,7 +387,9 @@ public class SpecificationLoader implements ApplicationScopedComponent {
/**
* Creates the appropriate type of {@link ObjectSpecification}.
*/
- private ObjectSpecification createSpecification(final Class<?> cls) {
+ private ObjectSpecification createSpecification(
+ final Class<?> cls,
+ final NatureOfService natureOfServiceIfAny) {
// ... and create the specs
if (FreeStandingList.class.isAssignableFrom(cls)) {
@@ -401,7 +400,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
new FacetedMethodsBuilderContext(
this, facetProcessor, layoutMetadataReaders);
return new ObjectSpecificationDefault(cls, facetedMethodsBuilderContext,
- servicesInjector, facetProcessor);
+ servicesInjector, facetProcessor, natureOfServiceIfAny);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/25149b05/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 ceed921..52cc112 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
@@ -739,9 +739,14 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
if(contributed.isIncluded() && !contributeeAndMixedInActionsAdded) {
synchronized (this.objectActions) {
final List<ObjectAction> actions = Lists.newArrayList(this.objectActions);
- if (containsDoOpFacet(MixinFacet.class) || containsDoOpFacet(DomainServiceFacet.class)) {
+ final boolean containsMixin = containsDoOpFacet(MixinFacet.class);
+ final boolean containsDomainService = containsDoOpFacet(DomainServiceFacet.class);
+ final boolean isService = isService();
+ if (containsMixin || containsDomainService || isService) {
// don't contribute to mixins themselves!
- // don't contribute to services either (nb: can't use isService(), not necessarily setup)
+ // don't contribute to services either
+ // - isService() is sufficient check for internal services registered directly with ServicesInjector
+ // - checking for DomainServiceFacet is for application services (isService() may not have been called, for these)
} else {
actions.addAll(createContributeeActions());
actions.addAll(createMixedInActions());
@@ -970,7 +975,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
return;
}
- final List<ObjectActionDefault> mixinActions = getObjectActions(specification);
+ final List<ObjectActionDefault> mixinActions = objectActionsOf(specification);
final List<ObjectAssociation> mixedInAssociations = Lists.newArrayList(
Iterables.transform(
@@ -995,7 +1000,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
toAppendTo.addAll(mixedInAssociations);
}
- private List getObjectActions(final ObjectSpecification specification) {
+ private List objectActionsOf(final ObjectSpecification specification) {
return specification.getObjectActions(ActionType.ALL, Contributed.INCLUDED, Filters.<ObjectAction>any());
}
http://git-wip-us.apache.org/repos/asf/isis/blob/25149b05/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 769b83e..09a91bd 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
@@ -31,6 +31,7 @@ import com.google.common.collect.Maps;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.filter.Filters;
import org.apache.isis.core.commons.lang.StringExtensions;
@@ -70,18 +71,14 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
private final static Logger LOG = LoggerFactory.getLogger(ObjectSpecificationDefault.class);
- private final ClassSubstitutor classSubstitutor = new ClassSubstitutor();
+ private static final ClassSubstitutor classSubstitutor = new ClassSubstitutor();
private static String determineShortName(final Class<?> introspectedClass) {
final String name = introspectedClass.getName();
return name.substring(name.lastIndexOf('.') + 1);
}
- // //////////////////////////////////////////////////////////////
- // fields
- // //////////////////////////////////////////////////////////////
-
- private boolean isService;
+ //region > constructor, fields
/**
* Lazily built by {@link #getMember(Method)}.
@@ -89,23 +86,27 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
private Map<Method, ObjectMember> membersByMethod = null;
private final FacetedMethodsBuilder facetedMethodsBuilder;
+ private final boolean isService;
- // //////////////////////////////////////////////////////////////////////
- // Constructor
- // //////////////////////////////////////////////////////////////////////
-
public ObjectSpecificationDefault(
final Class<?> correspondingClass,
final FacetedMethodsBuilderContext facetedMethodsBuilderContext,
final ServicesInjector servicesInjector,
- final FacetProcessor facetProcessor) {
+ final FacetProcessor facetProcessor,
+ final NatureOfService natureOfServiceIfAny) {
super(correspondingClass, determineShortName(correspondingClass),
servicesInjector, facetProcessor);
+ this.isService = natureOfServiceIfAny != null;
this.facetedMethodsBuilder = new FacetedMethodsBuilder(this, facetedMethodsBuilderContext);
}
+
+
+ //endregion
+
+ //region > introspectTypeHierarchyAndMembers
@Override
public void introspectTypeHierarchyAndMembers() {
@@ -203,10 +204,9 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
}
}
- // //////////////////////////////////////////////////////////////////////
- // create associations and actions
- // //////////////////////////////////////////////////////////////////////
+ //endregion
+ //region > create associations and actions
private List<ObjectAssociation> createAssociations(Properties properties) {
final List<FacetedMethod> associationFacetedMethods = facetedMethodsBuilder.getAssociationFacetedMethods(properties);
final List<ObjectAssociation> associations = Lists.newArrayList();
@@ -251,26 +251,9 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
}
}
+ //endregion
- // //////////////////////////////////////////////////////////////////////
- // Whether a service or not
- // //////////////////////////////////////////////////////////////////////
-
- @Override
- public boolean isService() {
- return isService;
- }
-
- @Override
- public void markAsService() {
- isService = true;
- }
-
-
-
- // //////////////////////////////////////////////////////////////
- // view models and wizards
- // //////////////////////////////////////////////////////////////
+ //region > isXxx
@Override
public boolean isViewModel() {
@@ -297,10 +280,14 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
return containsFacet(WizardFacet.class);
}
+ @Override
+ public boolean isService() {
+ return isService;
+ }
- // //////////////////////////////////////////////////////////////////////
- // getObjectAction
- // //////////////////////////////////////////////////////////////////////
+ //endregion
+
+ //region > getObjectAction
@Override
public ObjectAction getObjectAction(final ActionType type, final String id, final List<ObjectSpecification> parameters) {
@@ -364,11 +351,9 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
return null;
}
+ //endregion
-
- // //////////////////////////////////////////////////////////////////////
- // getMember, catalog... (not API)
- // //////////////////////////////////////////////////////////////////////
+ //region > getMember, catalog... (not API)
public ObjectMember getMember(final Method method) {
if (membersByMethod == null) {
@@ -413,10 +398,9 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
}
}
- // //////////////////////////////////////////////////////////////////////
- // toString
- // //////////////////////////////////////////////////////////////////////
+ //endregion
+ //region > toString
@Override
public String toString() {
final ToString str = new ToString(this);
@@ -427,5 +411,6 @@ public class ObjectSpecificationDefault extends ObjectSpecificationAbstract impl
return str.toString();
}
+ //endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/25149b05/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
index 3b9079d..2234bb4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
@@ -39,23 +39,21 @@ import org.apache.isis.core.metamodel.specloader.specimpl.ObjectSpecificationAbs
*/
public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbstract {
- /**
- * Used as {@link #getShortIdentifier()}, {@link #getName()} and
- * {@link #getPluralName()}.
- */
private static final String NAME = "Instances";
private static final String DESCRIBED_AS = "Typed instances";
private static final String ICON_NAME = "instances";
+ //region > constructor
+
public ObjectSpecificationOnStandaloneList(
final ServicesInjector servicesInjector,
final FacetProcessor facetProcessor) {
super(FreeStandingList.class, NAME, servicesInjector, facetProcessor);
}
- // /////////////////////////////////////////////////////////
- // Introspection
- // /////////////////////////////////////////////////////////
+ //endregion
+
+ //region > Introspection
@Override
public void introspectTypeHierarchyAndMembers() {
@@ -72,31 +70,14 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
// don't install anything for NotPersistableFacet
}
- // /////////////////////////////////////////////////////
- // Service
- // /////////////////////////////////////////////////////
-
- /**
- * No-op.
- *
- * <p>
- * Review: is this ever called for an instance of this class? If not, then
- * no need to override.
- */
- @Override
- public void markAsService() {
- }
+ //endregion
+ //region > isXxx
@Override
public boolean isService() {
return false;
}
-
- // /////////////////////////////////////////////////////////
- // view models and wizards
- // /////////////////////////////////////////////////////////
-
@Override
public boolean isViewModel() {
return false;
@@ -117,10 +98,9 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
return false;
}
- // /////////////////////////////////////////////////////
- // Associations
- // /////////////////////////////////////////////////////
+ //endregion
+ //region > Associations
/**
* Review: is this ever called for an instance of this class? If not, then
* no need to override.
@@ -130,9 +110,9 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
return null;
}
- // /////////////////////////////////////////////////////
- // Title and Icon
- // /////////////////////////////////////////////////////
+ //endregion
+
+ //region > Title and Icon
@Override
public String getTitle(final ObjectAdapter object) {
@@ -144,10 +124,9 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
return ICON_NAME;
}
- // /////////////////////////////////////////////////////
- // Object Actions
- // /////////////////////////////////////////////////////
+ //endregion
+ //region > Object Actions
/**
* Review: is it necessary to override for this subclass?
*/
@@ -173,6 +152,7 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
}
+ //endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/25149b05/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
index a9e95f0..0ce141b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
@@ -370,10 +370,6 @@ public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSp
// /////////////////////////////////////////////////////////////
@Override
- public void markAsService() {
- }
-
- @Override
public List<ObjectAction> getObjectActions(final Contributed contributed) {
return null;
}
[16/50] [abbrv] isis git commit: ISIS-1427: fix up unit tests that
are failing...
Posted by da...@apache.org.
ISIS-1427: fix up unit tests that are failing...
... per the preceding deletion of Localization and also the IsisContext refactoring
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/eb6d4a8c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/eb6d4a8c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/eb6d4a8c
Branch: refs/heads/master
Commit: eb6d4a8c92e923078779fe4794e238ff50223d22
Parents: 83de0dc
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jun 9 18:16:19 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jun 9 18:25:19 2016 +0100
----------------------------------------------------------------------
.../ValueSemanticsProviderAndFacetAbstract.java | 5 +-
.../facets/AbstractFacetFactoryTest.java | 54 +++++-----------
...tationFacetFactoryTest_actionInvocation.java | 13 ++--
.../PrototypeFacetAnnotationFactoryTest.java | 24 +------
.../ExplorationFacetAnnotationFactoryTest.java | 38 +----------
.../CollectionFieldMethodsFacetFactoryTest.java | 61 ++++++++----------
...ectionAnnotationFacetFactoryTest_typeOf.java | 2 +-
...etFromBoundedMarkerInterfaceFactoryTest.java | 35 +----------
...esFacetFromBoundedAnnotationFactoryTest.java | 35 +----------
.../encodable/EncodableFacetFactoryTest.java | 8 +--
...tAnnotationElseConfigurationFactoryTest.java | 2 +-
...cetAnnotationOrConfigurationFactoryTest.java | 2 +-
.../PropertyMethodsFacetFactoryTest.java | 66 ++++++++++----------
.../mask/MaskAnnotationFacetFactoryTest.java | 8 +--
.../JavaSqlDateValueSemanticsProviderTest.java | 10 +--
.../JavaUtilDateValueSemanticsProviderTest.java | 9 +--
16 files changed, 106 insertions(+), 266 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/eb6d4a8c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
index 307e3ce..8022861 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
@@ -32,7 +32,6 @@ import org.apache.isis.applib.adapters.ValueSemanticsProvider;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
import org.apache.isis.core.commons.lang.LocaleUtil;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -190,10 +189,10 @@ public abstract class ValueSemanticsProviderAndFacetAbstract<T> extends FacetAbs
* parsed
*/
protected T doParse(Object context, String entry) {
- throw new UnexpectedCallException();
+ return doParse(entry, context);
}
- // REVIEW: unused? (this method used to take Localization as a third param)
+ // REVIEW: this method used to take Localization as a third param, could now inline
protected T doParse(String entry, Object context) {
return doParse(context, entry);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/eb6d4a8c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
index 45a529a..4721012 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
@@ -22,6 +22,8 @@ package org.apache.isis.core.metamodel.facets;
import java.lang.reflect.Method;
import java.util.List;
+import com.google.common.collect.Lists;
+
import org.jmock.Expectations;
import org.junit.Rule;
@@ -63,7 +65,7 @@ public abstract class AbstractFacetFactoryTest extends TestCase {
}
}
- protected ServicesInjector mockServicesInjector;
+ protected ServicesInjector stubServicesInjector;
protected TranslationService mockTranslationService;
protected DeploymentCategoryProvider mockDeploymentCategoryProvider;
protected AuthenticationSessionProvider mockAuthenticationSessionProvider;
@@ -108,7 +110,7 @@ public abstract class AbstractFacetFactoryTest extends TestCase {
mockDeploymentCategoryProvider = context.mock(DeploymentCategoryProvider.class);
mockAuthenticationSessionProvider = context.mock(AuthenticationSessionProvider.class);
- mockServicesInjector = context.mock(ServicesInjector.class);
+ stubServicesInjector = context.mock(ServicesInjector.class);
mockTranslationService = context.mock(TranslationService.class);
stubConfiguration = new IsisConfigurationDefault();
mockAuthenticationSession = context.mock(AuthenticationSession.class);
@@ -118,54 +120,26 @@ public abstract class AbstractFacetFactoryTest extends TestCase {
mockSpecificationLoader = context.mock(SpecificationLoader.class);
- context.checking(new Expectations() {{
-
- allowing(mockServicesInjector).lookupService(TranslationService.class);
- will(returnValue(mockTranslationService));
-
- allowing(mockServicesInjector).getConfigurationServiceInternal();
- will(returnValue(stubConfiguration));
-
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
+ stubServicesInjector = new ServicesInjector(Lists.newArrayList(
+ mockTransactionStateProviderInternal,
+ stubConfiguration,
+ mockAuthenticationSessionProvider,
+ mockSpecificationLoader,
+ mockDeploymentCategoryProvider,
+ mockPersistenceSessionServiceInternal
+ ), stubConfiguration);
- allowing(mockServicesInjector).getAuthenticationSessionProvider();
- will(returnValue(mockAuthenticationSessionProvider));
-
- allowing(mockServicesInjector).getAuthenticationSessionProvider();
- will(returnValue(mockAuthenticationSessionProvider));
-
- allowing(mockServicesInjector).getSpecificationLoader();
- will(returnValue(mockSpecificationLoader));
-
- allowing(mockServicesInjector).getDeploymentCategoryProvider();
- will(returnValue(mockDeploymentCategoryProvider));
-
- allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
- will(returnValue(mockDeploymentCategoryProvider));
+ context.checking(new Expectations() {{
allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
will(returnValue(DeploymentCategory.PRODUCTION));
allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
will(returnValue(mockAuthenticationSession));
-
- allowing(mockServicesInjector).getPersistenceSessionServiceInternal();
- will(returnValue(mockPersistenceSessionServiceInternal));
-
- allowing(mockServicesInjector).lookupService(TransactionStateProviderInternal.class);
- will(returnValue(mockTransactionStateProviderInternal));
-
- allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
- will(returnValue(mockAuthenticationSession));
-
- allowing(mockServicesInjector).lookupService(TranslationService.class);
- will(returnValue(mockTranslationService));
-
}});
+ }
- }
protected void allowing_specificationLoader_loadSpecification_any_willReturn(final ObjectSpecification objectSpecification) {
context.checking(new Expectations() {{
http://git-wip-us.apache.org/repos/asf/isis/blob/eb6d4a8c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_actionInvocation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_actionInvocation.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_actionInvocation.java
index 5e105a7..7965f99 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_actionInvocation.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest_actionInvocation.java
@@ -21,11 +21,6 @@ package org.apache.isis.core.metamodel.facets.actions.action;
import java.lang.reflect.Method;
-import org.jmock.Expectations;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-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.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
@@ -52,7 +47,7 @@ public class ActionAnnotationFacetFactoryTest_actionInvocation extends AbstractF
super.setUp();
this.facetFactory = new ActionAnnotationFacetFactory();;
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
}
@@ -163,13 +158,13 @@ public class ActionAnnotationFacetFactoryTest_actionInvocation extends AbstractF
final ActionParameterChoicesFacetViaMethodFactory facetFactoryForChoices = new ActionParameterChoicesFacetViaMethodFactory();
- facetFactoryForChoices.setServicesInjector(mockServicesInjector);
+ facetFactoryForChoices.setServicesInjector(stubServicesInjector);
- facetFactoryForChoices.setServicesInjector(mockServicesInjector);
+ facetFactoryForChoices.setServicesInjector(stubServicesInjector);
final DisableForContextFacetViaMethodFactory facetFactoryForDisable = new DisableForContextFacetViaMethodFactory();
- facetFactoryForDisable.setServicesInjector(mockServicesInjector);
+ facetFactoryForDisable.setServicesInjector(stubServicesInjector);
class Customer {
http://git-wip-us.apache.org/repos/asf/isis/blob/eb6d4a8c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
index 7315220..128bee6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/PrototypeFacetAnnotationFactoryTest.java
@@ -21,13 +21,7 @@ package org.apache.isis.core.metamodel.facets.actions.action;
import java.lang.reflect.Method;
-import org.jmock.Expectations;
-
import org.apache.isis.applib.annotation.Prototype;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-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.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
@@ -45,24 +39,8 @@ public class PrototypeFacetAnnotationFactoryTest extends AbstractFacetFactoryTes
protected void setUp() throws Exception {
super.setUp();
- final AuthenticationSession mockAuthenticationSession = context.mock(AuthenticationSession.class);
- context.checking(new Expectations() {{
- allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
- will(returnValue(mockAuthenticationSession));
-
- allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
- will(returnValue(mockDeploymentCategoryProvider));
-
- allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
- will(returnValue(DeploymentCategory.PRODUCTION));
-
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- }});
-
facetFactory = new ActionAnnotationFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/eb6d4a8c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAnnotationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAnnotationFactoryTest.java
index ab7ea7e..a39c5fe 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/exploration/ExplorationFacetAnnotationFactoryTest.java
@@ -21,56 +21,22 @@ package org.apache.isis.core.metamodel.facets.actions.exploration;
import java.lang.reflect.Method;
-import org.jmock.Expectations;
-
import org.apache.isis.applib.annotation.Exploration;
-import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-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.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
+import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.actions.exploration.annotation.ExplorationFacetAnnotationFactory;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class ExplorationFacetAnnotationFactoryTest extends AbstractFacetFactoryTest {
- private JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
-
private ExplorationFacetAnnotationFactory facetFactory;
- private TranslationService mockTranslationService;
-
- private DeploymentCategoryProvider mockDeploymentCategoryProvider;
- private AuthenticationSessionProvider mockAuthenticationSessionProvider;
-
@Override
protected void setUp() throws Exception {
super.setUp();
- mockDeploymentCategoryProvider = context.mock(DeploymentCategoryProvider.class);
- mockAuthenticationSessionProvider = context.mock(AuthenticationSessionProvider.class);
-
- final AuthenticationSession mockAuthenticationSession = context.mock(AuthenticationSession.class);
- context.checking(new Expectations() {{
- allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
- will(returnValue(DeploymentCategory.PRODUCTION));
-
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
- will(returnValue(mockDeploymentCategoryProvider));
-
- allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
- will(returnValue(mockAuthenticationSession));
- }});
-
-
facetFactory = new ExplorationFacetAnnotationFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/eb6d4a8c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
index 1b06fc7..cce1ea6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
@@ -24,15 +24,8 @@ import java.util.Collection;
import java.util.List;
import java.util.Set;
-import org.jmock.Expectations;
-
import org.apache.isis.applib.annotation.When;
import org.apache.isis.applib.security.UserMemento;
-import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-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.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
@@ -88,7 +81,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testPropertyAccessorFacetIsInstalledForJavaUtilCollectionAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings({ "rawtypes", "unused" })
@@ -112,7 +105,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testPropertyAccessorFacetIsInstalledForJavaUtilListAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings({ "rawtypes", "unused" })
@@ -136,7 +129,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testPropertyAccessorFacetIsInstalledForJavaUtilSetAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings({ "rawtypes", "unused" })
@@ -160,7 +153,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testPropertyAccessorFacetIsInstalledForObjectArrayAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -184,7 +177,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testPropertyAccessorFacetIsInstalledForOrderArrayAndMethodRemoved() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -211,7 +204,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testAddToFacetIsInstalledViaAccessorIfNoExplicitAddToMethodExists() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -236,7 +229,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testCannotInferTypeOfFacetIfNoExplicitAddToOrRemoveFromMethods() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -257,7 +250,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testRemoveFromFacetIsInstalledViaAccessorIfNoExplicitRemoveFromMethodExists() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -282,7 +275,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testAddToFacetIsInstalledAndMethodRemoved() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -314,7 +307,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testCanInferTypeOfFacetFromExplicitAddToMethod() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -343,7 +336,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testRemoveFromFacetIsInstalledAndMethodRemoved() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -375,7 +368,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testCanInferTypeOfFacetFromExplicitRemoveFromMethod() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -404,7 +397,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testClearFacetIsInstalledAndMethodRemoved() {
final CollectionClearFacetFactory facetFactory = new CollectionClearFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
@SuppressWarnings({ "hiding", "unused" })
class Order {
@@ -436,7 +429,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testClearFacetIsInstalledViaAccessorIfNoExplicitClearMethod() {
final CollectionClearFacetFactory facetFactory = new CollectionClearFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
@SuppressWarnings({ "hiding", "unused" })
class Order {
@@ -461,7 +454,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testValidateAddToFacetIsInstalledAndMethodRemoved() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -498,7 +491,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testValidateRemoveFromFacetIsInstalledAndMethodRemoved() {
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactory = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -535,7 +528,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testMethodFoundInSuperclass() {
final CollectionAccessorFacetViaAccessorFactory facetFactory = new CollectionAccessorFacetViaAccessorFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -564,11 +557,11 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testMethodFoundInSuperclassButHelpeMethodsFoundInSubclasses() {
final CollectionAccessorFacetViaAccessorFactory facetFactoryForAccessor = new CollectionAccessorFacetViaAccessorFactory();
- facetFactoryForAccessor.setServicesInjector(mockServicesInjector);
+ facetFactoryForAccessor.setServicesInjector(stubServicesInjector);
final CollectionAddToRemoveFromAndValidateFacetFactory facetFactoryForHelpers = new CollectionAddToRemoveFromAndValidateFacetFactory();
- facetFactoryForHelpers.setServicesInjector(mockServicesInjector);
+ facetFactoryForHelpers.setServicesInjector(stubServicesInjector);
@SuppressWarnings("hiding")
class Order {
@@ -662,7 +655,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsNamedFacetUsingNameMethodAndRemovesMethod() {
final NamedFacetStaticMethodFactory facetFactory = new NamedFacetStaticMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method nameMethod = findMethod(CustomerStatic.class, "nameOrders");
@@ -681,7 +674,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsDescribedAsFacetUsingDescriptionAndRemovesMethod() {
final DescribedAsFacetStaticMethodFactory facetFactory = new DescribedAsFacetStaticMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method descriptionMethod = findMethod(CustomerStatic.class, "descriptionOrders");
@@ -700,7 +693,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsHiddenFacetUsingAlwaysHideAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method alwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideOrders");
@@ -717,7 +710,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsHiddenFacetUsingAlwaysHideWhenNotAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOtherOrders");
final Method alwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideOtherOrders");
@@ -732,7 +725,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsDisabledFacetUsingProtectAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method protectMethod = findMethod(CustomerStatic.class, "protectOrders");
@@ -751,7 +744,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testDoesNotInstallDisabledFacetUsingProtectWhenNotAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOtherOrders");
final Method protectMethod = findMethod(CustomerStatic.class, "protectOtherOrders");
@@ -766,7 +759,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsHiddenForSessionFacetAndRemovesMethod() {
final HideForSessionFacetViaMethodFactory facetFactory = new HideForSessionFacetViaMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method hideMethod = findMethod(CustomerStatic.class, "hideOrders", new Class[] { UserMemento.class });
@@ -785,7 +778,7 @@ public class CollectionFieldMethodsFacetFactoryTest extends AbstractFacetFactory
public void testInstallsDisabledForSessionFacetAndRemovesMethod() {
final DisableForSessionFacetViaMethodFactory facetFactory = new DisableForSessionFacetViaMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final Method collectionAccessorMethod = findMethod(CustomerStatic.class, "getOrders");
final Method disableMethod = findMethod(CustomerStatic.class, "disableOrders", new Class[] { UserMemento.class });
http://git-wip-us.apache.org/repos/asf/isis/blob/eb6d4a8c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest_typeOf.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest_typeOf.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest_typeOf.java
index 8cf1358..5687eba 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest_typeOf.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/collection/CollectionAnnotationFacetFactoryTest_typeOf.java
@@ -40,7 +40,7 @@ public class CollectionAnnotationFacetFactoryTest_typeOf extends AbstractFacetFa
protected void setUp() throws Exception {
super.setUp();
facetFactory = new CollectionAnnotationFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/eb6d4a8c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/bounded/ChoicesFacetFromBoundedMarkerInterfaceFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/bounded/ChoicesFacetFromBoundedMarkerInterfaceFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/bounded/ChoicesFacetFromBoundedMarkerInterfaceFactoryTest.java
index 96d0a3f..370fe38 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/bounded/ChoicesFacetFromBoundedMarkerInterfaceFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/bounded/ChoicesFacetFromBoundedMarkerInterfaceFactoryTest.java
@@ -19,53 +19,24 @@
package org.apache.isis.core.metamodel.facets.object.bounded;
-import org.jmock.Expectations;
-
import org.apache.isis.applib.marker.Bounded;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-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.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
-import org.apache.isis.core.metamodel.facets.object.choices.boundedmarkerifc.ChoicesFacetFromBoundedMarkerInterfaceFactory;
import org.apache.isis.core.metamodel.facets.object.choices.ChoicesFacetFromBoundedAbstract;
+import org.apache.isis.core.metamodel.facets.object.choices.boundedmarkerifc.ChoicesFacetFromBoundedMarkerInterfaceFactory;
import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class ChoicesFacetFromBoundedMarkerInterfaceFactoryTest extends AbstractFacetFactoryTest {
- private JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
-
private ChoicesFacetFromBoundedMarkerInterfaceFactory facetFactory;
@Override
protected void setUp() throws Exception {
super.setUp();
- mockDeploymentCategoryProvider = context.mock(DeploymentCategoryProvider.class);
- mockAuthenticationSessionProvider = context.mock(AuthenticationSessionProvider.class);
-
- final AuthenticationSession mockAuthenticationSession = context.mock(AuthenticationSession.class);
- context.checking(new Expectations() {{
- allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
- will(returnValue(DeploymentCategory.PRODUCTION));
-
- allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
- will(returnValue(mockAuthenticationSession));
-
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
- will(returnValue(mockDeploymentCategoryProvider));
- }});
-
facetFactory = new ChoicesFacetFromBoundedMarkerInterfaceFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
-
-
+ facetFactory.setServicesInjector(stubServicesInjector);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/eb6d4a8c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ChoicesFacetFromBoundedAnnotationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ChoicesFacetFromBoundedAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ChoicesFacetFromBoundedAnnotationFactoryTest.java
index 6450b4a..212b5b7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ChoicesFacetFromBoundedAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/ChoicesFacetFromBoundedAnnotationFactoryTest.java
@@ -19,56 +19,23 @@
package org.apache.isis.core.metamodel.facets.object.domainobject;
-import org.jmock.Expectations;
-
import org.apache.isis.applib.annotation.Bounded;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-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.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.choices.ChoicesFacetFromBoundedAbstract;
import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class ChoicesFacetFromBoundedAnnotationFactoryTest extends AbstractFacetFactoryTest {
- private JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
-
private DomainObjectAnnotationFacetFactory facetFactory;
- private DeploymentCategoryProvider mockDeploymentCategoryProvider;
- private AuthenticationSessionProvider mockAuthenticationSessionProvider;
-
@Override
protected void setUp() throws Exception {
super.setUp();
- mockDeploymentCategoryProvider = context.mock(DeploymentCategoryProvider.class);
- mockAuthenticationSessionProvider = context.mock(AuthenticationSessionProvider.class);
-
- final AuthenticationSession mockAuthenticationSession = context.mock(AuthenticationSession.class);
- context.checking(new Expectations() {{
- allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
- will(returnValue(DeploymentCategory.PRODUCTION));
-
- allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
- will(returnValue(mockAuthenticationSession));
- }});
-
facetFactory = new DomainObjectAnnotationFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
-
- context.checking(new Expectations(){{
- allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
- will(returnValue(mockAuthenticationSessionProvider));
-
- allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
- will(returnValue(mockDeploymentCategoryProvider));
- }});
-
+ facetFactory.setServicesInjector(stubServicesInjector);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/eb6d4a8c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java
index 0368b24..23cba46 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/encodable/EncodableFacetFactoryTest.java
@@ -19,8 +19,6 @@
package org.apache.isis.core.metamodel.facets.object.encodable;
-import java.util.Collections;
-
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.annotation.Encodable;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
@@ -29,8 +27,6 @@ import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacetAbstract;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncoderDecoderUtil;
import org.apache.isis.core.metamodel.facets.object.encodeable.annotcfg.EncodableFacetAnnotationElseConfigurationFactory;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.services.configinternal.ConfigurationServiceInternal;
public class EncodableFacetFactoryTest extends AbstractFacetFactoryTest {
@@ -42,9 +38,7 @@ public class EncodableFacetFactoryTest extends AbstractFacetFactoryTest {
facetFactory = new EncodableFacetAnnotationElseConfigurationFactory();
- ServicesInjector servicesInjector = new ServicesInjector(Collections.emptyList(), stubConfiguration);
- servicesInjector.addFallbackIfRequired(ConfigurationServiceInternal.class, stubConfiguration);
- facetFactory.setServicesInjector(servicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/eb6d4a8c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java
index ee7b3f7..28e0400 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java
@@ -37,7 +37,7 @@ public class ParseableFacetAnnotationElseConfigurationFactoryTest extends Abstra
super.setUp();
facetFactory = new ParseableFacetAnnotationElseConfigurationFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/eb6d4a8c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
index 53de53c..e094ec4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
@@ -48,7 +48,7 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
super.setUp();
facetFactory = new ValueFacetAnnotationOrConfigurationFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/eb6d4a8c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
index 6144899..9b649c1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/PropertyMethodsFacetFactoryTest.java
@@ -89,7 +89,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testPropertyAccessorFacetIsInstalledAndMethodRemoved() {
final PropertyAccessorFacetViaAccessorFactory facetFactory = new PropertyAccessorFacetViaAccessorFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -113,7 +113,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testSetterFacetIsInstalledForSetterMethodAndMethodRemoved() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -142,7 +142,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInitializationFacetIsInstalledForSetterMethodAndMethodRemoved() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -171,7 +171,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testSetterFacetIsInstalledMeansNoDisabledOrDerivedFacetsInstalled() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -195,11 +195,11 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
final PropertyModifyFacetFactory facetFactoryForModify = new PropertyModifyFacetFactory();
- facetFactoryForModify.setServicesInjector(mockServicesInjector);
+ facetFactoryForModify.setServicesInjector(stubServicesInjector);
final PropertySetAndClearFacetFactory facetFactoryForSetter = new PropertySetAndClearFacetFactory();
- facetFactoryForSetter.setServicesInjector(mockServicesInjector);
+ facetFactoryForSetter.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -230,14 +230,14 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testModifyMethodWithNoSetterInstallsNotPersistedFacetButDoesNotInstallADisabledFacets() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final PropertyModifyFacetFactory facetFactoryForModify = new PropertyModifyFacetFactory();
- facetFactoryForModify.setServicesInjector(mockServicesInjector);
+ facetFactoryForModify.setServicesInjector(stubServicesInjector);
final DisabledFacetOnPropertyInferredFactory disabledFacetOnPropertyInferredFactory = new DisabledFacetOnPropertyInferredFactory();
- disabledFacetOnPropertyInferredFactory.setServicesInjector(mockServicesInjector);
+ disabledFacetOnPropertyInferredFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -267,10 +267,10 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testIfHaveSetterAndModifyFacetThenTheModifyFacetWinsOut() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final PropertyModifyFacetFactory facetFactoryForModify = new PropertyModifyFacetFactory();
- facetFactoryForModify.setServicesInjector(mockServicesInjector);
+ facetFactoryForModify.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -307,7 +307,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testClearFacet() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -336,7 +336,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testClearFacetViaSetterIfNoExplicitClearMethod() {
final PropertySetAndClearFacetFactory facetFactory = new PropertySetAndClearFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -363,7 +363,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testChoicesFacetFoundAndMethodRemoved() {
final PropertyChoicesFacetViaMethodFactory facetFactory = new PropertyChoicesFacetViaMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -393,7 +393,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testAutoCompleteFacetFoundAndMethodRemoved() {
final PropertyAutoCompleteFacetMethodFactory facetFactory = new PropertyAutoCompleteFacetMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
// context.checking(new Expectations(){{
// allowing(mockServicesInjector).lookupService(AuthenticationSessionProvider.class);
@@ -434,7 +434,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testDefaultFacetFoundAndMethodRemoved() {
final PropertyDefaultFacetViaMethodFactory facetFactory = new PropertyDefaultFacetViaMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -464,7 +464,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testValidateFacetFoundAndMethodRemoved() {
final PropertyValidateFacetViaMethodFactory facetFactory = new PropertyValidateFacetViaMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -494,7 +494,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testDisableFacetFoundAndMethodRemoved() {
final DisableForContextFacetViaMethodFactory facetFactory = new DisableForContextFacetViaMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -524,7 +524,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testDisableFacetNoArgsFoundAndMethodRemoved() {
final DisableForContextFacetViaMethodFactory facetFactory = new DisableForContextFacetViaMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -554,7 +554,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testHiddenFacetFoundAndMethodRemoved() {
final HideForContextFacetViaMethodFactory facetFactory = new HideForContextFacetViaMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -584,7 +584,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testHiddenFacetWithNoArgFoundAndMethodRemoved() {
final HideForContextFacetViaMethodFactory facetFactory = new HideForContextFacetViaMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -614,7 +614,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testPropertyFoundOnSuperclass() {
final PropertyAccessorFacetViaAccessorFactory facetFactory = new PropertyAccessorFacetViaAccessorFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -640,15 +640,15 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testPropertyFoundOnSuperclassButHelperMethodFoundOnSubclass() {
final PropertyAccessorFacetViaAccessorFactory facetFactory = new PropertyAccessorFacetViaAccessorFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final HideForContextFacetViaMethodFactory facetFactoryForHide = new HideForContextFacetViaMethodFactory();
- facetFactoryForHide.setServicesInjector(mockServicesInjector);
+ facetFactoryForHide.setServicesInjector(stubServicesInjector);
final DisableForContextFacetViaMethodFactory facetFactoryForDisable = new DisableForContextFacetViaMethodFactory();
- facetFactoryForDisable.setServicesInjector(mockServicesInjector);
+ facetFactoryForDisable.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -744,7 +744,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsNamedFacetUsingNameMethodAndRemovesMethod() {
final NamedFacetStaticMethodFactory facetFactory = new NamedFacetStaticMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
final Method nameMethod = findMethod(CustomerStatic.class, "nameFirstName");
@@ -763,7 +763,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsDescribedAsFacetUsingDescriptionAndRemovesMethod() {
final DescribedAsFacetStaticMethodFactory facetFactory = new DescribedAsFacetStaticMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
final Method descriptionMethod = findMethod(CustomerStatic.class, "descriptionFirstName");
@@ -782,7 +782,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsHiddenFacetUsingAlwaysHideAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
final Method propertyAlwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideFirstName");
@@ -798,7 +798,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsHiddenFacetUsingAlwaysHideWhenNotAndRemovesMethod() {
final HiddenFacetStaticMethodFactory facetFactory = new HiddenFacetStaticMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getLastName");
final Method propertyAlwaysHideMethod = findMethod(CustomerStatic.class, "alwaysHideLastName");
@@ -813,7 +813,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsDisabledFacetUsingProtectAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
final Method propertyProtectMethod = findMethod(CustomerStatic.class, "protectFirstName");
@@ -830,7 +830,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testDoesNotInstallDisabledFacetUsingProtectWhenNotAndRemovesMethod() {
final DisabledFacetStaticMethodFacetFactory facetFactory = new DisabledFacetStaticMethodFacetFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getLastName");
final Method propertyProtectMethod = findMethod(CustomerStatic.class, "protectLastName");
@@ -846,7 +846,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsHiddenForSessionFacetAndRemovesMethod() {
final HideForSessionFacetViaMethodFactory facetFactory = new HideForSessionFacetViaMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
final Method hideMethod = findMethod(CustomerStatic.class, "hideFirstName", new Class[] { UserMemento.class });
@@ -866,7 +866,7 @@ public class PropertyMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
public void testInstallsDisabledForSessionFacetAndRemovesMethod() {
final DisableForSessionFacetViaMethodFactory facetFactory = new DisableForSessionFacetViaMethodFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
final Method propertyAccessorMethod = findMethod(CustomerStatic.class, "getFirstName");
final Method disableMethod = findMethod(CustomerStatic.class, "disableFirstName", new Class[] { UserMemento.class });
http://git-wip-us.apache.org/repos/asf/isis/blob/eb6d4a8c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java
index 1c797d6..ffb3db1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/propparam/validate/mask/MaskAnnotationFacetFactoryTest.java
@@ -67,7 +67,7 @@ public class MaskAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
public void testMaskAnnotationPickedUpOnProperty() {
final MaskFacetOnPropertyAnnotationFactory facetFactory = new MaskFacetOnPropertyAnnotationFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@SuppressWarnings("unused")
@@ -89,7 +89,7 @@ public class MaskAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
public void testMaskAnnotationPickedUpOnActionParameter() {
final MaskFacetOnParameterAnnotationFactory facetFactory = new MaskFacetOnParameterAnnotationFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@@ -110,7 +110,7 @@ public class MaskAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
public void testMaskAnnotationNotIgnoredForNonStringsProperty() {
final MaskFacetOnPropertyAnnotationFactory facetFactory = new MaskFacetOnPropertyAnnotationFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
@@ -129,7 +129,7 @@ public class MaskAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
public void testMaskAnnotationNotIgnoredForPrimitiveOnActionParameter() {
final MaskFacetOnParameterAnnotationFactory facetFactory = new MaskFacetOnParameterAnnotationFactory();
- facetFactory.setServicesInjector(mockServicesInjector);
+ facetFactory.setServicesInjector(stubServicesInjector);
class Customer {
http://git-wip-us.apache.org/repos/asf/isis/blob/eb6d4a8c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
index 0df5fd2..70b620a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
@@ -19,10 +19,9 @@
package org.apache.isis.core.metamodel.facets.value;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
import java.sql.Date;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.TimeZone;
@@ -35,6 +34,9 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.datesql.JavaSqlDateValueSemanticsProvider;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class JavaSqlDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private JavaSqlDateValueSemanticsProvider adapter;
@@ -72,7 +74,7 @@ public class JavaSqlDateValueSemanticsProviderTest extends ValueSemanticsProvide
@Test
public void testTitleOf() {
- assertEquals("1970-01-01", adapter.displayTitleOf(date));
+ assertEquals(DateFormat.getDateInstance(SimpleDateFormat.MEDIUM).format(new Date(0)), adapter.displayTitleOf(date));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/eb6d4a8c/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
index 0db1744..02ad91b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
@@ -19,9 +19,7 @@
package org.apache.isis.core.metamodel.facets.value;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
+import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.TimeZone;
@@ -35,6 +33,9 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.dateutil.JavaUtilDateValueSemanticsProvider;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class JavaUtilDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private java.util.Date date;
@@ -77,7 +78,7 @@ public class JavaUtilDateValueSemanticsProviderTest extends ValueSemanticsProvid
*/
@Test
public void testTitleOf() {
- final String EXPECTED = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new java.util.Date(0));
+ final String EXPECTED = DateFormat.getDateTimeInstance(SimpleDateFormat.MEDIUM, SimpleDateFormat.SHORT).format(new java.util.Date(0));
assertEquals(EXPECTED, getValue().displayTitleOf(date));
}
[05/50] [abbrv] isis git commit: ISIS-1428: removing
Installer#getType(), since not used.
Posted by da...@apache.org.
ISIS-1428: removing Installer#getType(), since not used.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f6bf4ea3
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f6bf4ea3
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f6bf4ea3
Branch: refs/heads/master
Commit: f6bf4ea38bf53f60d9cdbe6e4cbff2d3e5426fe0
Parents: bcb5bc6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 8 07:01:52 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 8 07:01:52 2016 +0100
----------------------------------------------------------------------
.../apache/isis/core/commons/components/Installer.java | 13 -------------
.../core/commons/components/InstallerAbstract.java | 10 +---------
...AuthenticationManagerStandardInstallerAbstract.java | 2 +-
.../AuthorizationManagerStandardInstallerAbstract.java | 2 +-
.../runtime/optionhandler/OptionHandlerAbstract.java | 12 ------------
.../isis/progmodels/dflt/JavaReflectorInstaller.java | 2 +-
.../runtime/fixtures/FixturesInstallerAbstract.java | 2 +-
.../runtime/services/ServicesInstallerAbstract.java | 2 +-
8 files changed, 6 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f6bf4ea3/core/metamodel/src/main/java/org/apache/isis/core/commons/components/Installer.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/components/Installer.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/components/Installer.java
index 48badad..80643ad 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/components/Installer.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/components/Installer.java
@@ -38,19 +38,6 @@ import java.util.List;
*/
public interface Installer extends ApplicationScopedComponent {
- /**
- * The type of the installer, meaning the component type, and consistent
- * with the long option of the command line flag where applicable.
- *
- * <p>
- * Examples are <tt>authentication</tt> or <tt>persistor</tt>.
- *
- * <p>
- * Because all implementations of a given subinterface of {@link Installer}
- * should return the same value for this method, by convention these
- * subinterfaces define a constant which the implementation can just return.
- */
- String getType();
/**
* The name (qualified by type).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6bf4ea3/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java
index a9238ab..f1b0815 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java
@@ -30,7 +30,6 @@ public abstract class InstallerAbstract implements Installer {
//region > constructor, fields
- private final String type;
private final String name;
private final IsisConfigurationDefault isisConfiguration;
@@ -45,22 +44,15 @@ public abstract class InstallerAbstract implements Installer {
* to this constructor.
*/
public InstallerAbstract(
- final String type,
final String name,
final IsisConfigurationDefault isisConfiguration) {
- this.type = type;
this.name = name;
this.isisConfiguration = isisConfiguration;
}
//endregion
- //region > type, name
-
- @Override
- public String getType() {
- return type;
- }
+ //region > name
@Override
public String getName() {
http://git-wip-us.apache.org/repos/asf/isis/blob/f6bf4ea3/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
index 6dc4281..a347048 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
@@ -31,7 +31,7 @@ public abstract class AuthenticationManagerStandardInstallerAbstract extends Ins
public AuthenticationManagerStandardInstallerAbstract(
final String name,
final IsisConfigurationDefault isisConfiguration) {
- super(AuthenticationManagerInstaller.TYPE, name, isisConfiguration);
+ super(name, isisConfiguration);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/f6bf4ea3/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java
index 020a588..c7a40e2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java
@@ -33,7 +33,7 @@ public abstract class AuthorizationManagerStandardInstallerAbstract
public AuthorizationManagerStandardInstallerAbstract(
final String name,
final IsisConfigurationDefault isisConfiguration) {
- super(AuthorizationManagerInstaller.TYPE, name, isisConfiguration);
+ super(name, isisConfiguration);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/f6bf4ea3/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java
index da71920..07cf179 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/optionhandler/OptionHandlerAbstract.java
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.commons.cli.CommandLine;
-import org.apache.isis.core.commons.components.Installer;
import org.apache.isis.core.commons.lang.ListExtensions;
public abstract class OptionHandlerAbstract implements OptionHandler {
@@ -32,17 +31,6 @@ public abstract class OptionHandlerAbstract implements OptionHandler {
public OptionHandlerAbstract() {
}
- protected StringBuffer availableInstallers(final Object[] factories) {
- final StringBuffer types = new StringBuffer();
- for (int i = 0; i < factories.length; i++) {
- if (i > 0) {
- types.append("; ");
- }
- types.append(((Installer) factories[i]).getName());
- }
- return types;
- }
-
protected List<String> getOptionValues(final CommandLine commandLine, final String opt) {
final List<String> list = new ArrayList<String>();
final String[] optionValues = commandLine.getOptionValues(opt);
http://git-wip-us.apache.org/repos/asf/isis/blob/f6bf4ea3/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
index fb4677d..a8467f4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
@@ -60,7 +60,7 @@ public class JavaReflectorInstaller extends InstallerAbstract implements Specifi
}
public JavaReflectorInstaller(final String name, final IsisConfigurationDefault isisConfiguration) {
- super(SpecificationLoaderInstaller.TYPE, name, isisConfiguration);
+ super(name, isisConfiguration);
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/f6bf4ea3/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java
index 455171c..a2e15b4 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java
@@ -33,7 +33,7 @@ public abstract class FixturesInstallerAbstract extends InstallerAbstract implem
private LogonFixture logonFixture;
public FixturesInstallerAbstract(final String name, final IsisConfigurationDefault isisConfiguration) {
- super(FixturesInstaller.TYPE, name, isisConfiguration);
+ super(name, isisConfiguration);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/f6bf4ea3/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerAbstract.java
index ec9a92b..ff4e0e2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerAbstract.java
@@ -27,7 +27,7 @@ public abstract class ServicesInstallerAbstract extends InstallerAbstract implem
public ServicesInstallerAbstract(
final String name,
final IsisConfigurationDefault isisConfiguration) {
- super(ServicesInstaller.TYPE, name, isisConfiguration);
+ super(name, isisConfiguration);
}
}
[29/50] [abbrv] isis git commit: ISIS-1427: minor refactoring of
IsisConfigurationForJdoIntegTests to allow reuse within custom AppManifests
in integration tests
Posted by da...@apache.org.
ISIS-1427: minor refactoring of IsisConfigurationForJdoIntegTests to allow reuse within custom AppManifests in integration tests
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b6b1bca6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b6b1bca6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b6b1bca6
Branch: refs/heads/master
Commit: b6b1bca602c1cd9baf51fc74d7477907ac77d4e1
Parents: c88f44f
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun Jun 12 11:19:49 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun Jun 12 11:19:49 2016 +0100
----------------------------------------------------------------------
.../integtestsupport/IsisSystemForTest.java | 12 +--
.../IsisConfigurationForJdoIntegTests.java | 79 ++++++++++++++------
.../bootstrap/DomainAppSystemInitializer.java | 18 ++++-
3 files changed, 74 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b6b1bca6/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 b6a677e..4aab64a 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
@@ -269,14 +269,10 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
// populated at #setupSystem
private IsisComponentProvider componentProvider;
- public IsisSystemForTest setUpSystem() throws RuntimeException {
- return initIfRequiredThenOpenSession();
- }
-
/**
* Intended to be called from a test's {@link Before} method.
*/
- public IsisSystemForTest initIfRequiredThenOpenSession() throws RuntimeException {
+ public IsisSystemForTest setUpSystem() throws RuntimeException {
try {
initIfRequiredThenOpenSession(FireListeners.FIRE);
} catch (Exception e) {
@@ -354,14 +350,14 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
private IsisSessionFactory isisSessionFactory;
/**
- * The {@link IsisSessionFactory} created during {@link #initIfRequiredThenOpenSession()}.
+ * The {@link IsisSessionFactory} created during {@link #setUpSystem()}.
*/
public IsisSessionFactory getIsisSessionFactory() {
return isisSessionFactory;
}
/**
- * The {@link AuthenticationSession} created during {@link #initIfRequiredThenOpenSession()}.
+ * The {@link AuthenticationSession} created during {@link #setUpSystem()}.
*/
public AuthenticationSession getAuthenticationSession() {
return authenticationSession;
@@ -470,7 +466,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
return new Statement() {
@Override
public void evaluate() throws Throwable {
- initIfRequiredThenOpenSession();
+ setUpSystem();
try {
base.evaluate();
closeSession();
http://git-wip-us.apache.org/repos/asf/isis/blob/b6b1bca6/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java
index 38e478d..ab8224f 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/IsisConfigurationForJdoIntegTests.java
@@ -21,6 +21,7 @@ package org.apache.isis.objectstore.jdo.datanucleus;
import com.google.common.base.Joiner;
+import com.google.common.collect.Maps;
import org.datanucleus.PropertyNames;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,6 +35,9 @@ import org.apache.isis.core.runtime.persistence.PersistenceConstants;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.objectstore.jdo.service.RegisterEntities;
+import java.util.Map;
+import java.util.Properties;
+
/**
* If instantiated by the integration testing framework, this object will be registered as the implementation of
* the {@link ConfigurationServiceInternal} (internal) domain service, using
@@ -70,31 +74,15 @@ public class IsisConfigurationForJdoIntegTests extends IsisConfigurationDefault
}
private void addStandardProperties() {
+ final Map<String, String> map = Maps.newHashMap();
+ withStandardProperties(map);
+ add(asProperties(map), ContainsPolicy.IGNORE);
+ }
- // run-in memory
- addDataNucleusProperty("javax.jdo.option.ConnectionURL", "jdbc:hsqldb:mem:test");
- addDataNucleusProperty("javax.jdo.option.ConnectionDriverName", "org.hsqldb.jdbcDriver");
- addDataNucleusProperty("javax.jdo.option.ConnectionUserName", "sa");
- addDataNucleusProperty("javax.jdo.option.ConnectionPassword", "");
-
- // Don't do validations that consume setup time.
- addDataNucleusProperty(PropertyNames.PROPERTY_SCHEMA_AUTOCREATE_ALL, "true");
- addDataNucleusProperty(PropertyNames.PROPERTY_SCHEMA_VALIDATE_ALL, "false");
-
- // other properties as per WEB-INF/persistor_datanucleus.properties
- addDataNucleusProperty("datanucleus.persistenceByReachabilityAtCommit", "false");
- addDataNucleusProperty("datanucleus.identifier.case", "MixedCase");
- addDataNucleusProperty("datanucleus.cache.level2.type","none");
- addDataNucleusProperty("datanucleus.cache.level2.mode","ENABLE_SELECTIVE");
-
- // automatically install any fixtures that might have been registered
- add(PersistenceSession.INSTALL_FIXTURES_KEY , "true");
-
- add(PersistenceConstants.ENFORCE_SAFE_SEMANTICS, ""+PersistenceConstants.ENFORCE_SAFE_SEMANTICS_DEFAULT);
-
- add("isis.deploymentType", "server_prototype");
-
- add("isis.services.eventbus.allowLateRegistration", "true");
+ private static Properties asProperties(Map<String, String> map) {
+ Properties properties = new Properties();
+ properties.putAll(map);
+ return properties;
}
@Programmatic
@@ -132,4 +120,47 @@ public class IsisConfigurationForJdoIntegTests extends IsisConfigurationDefault
}
+ private static void withStandardProperties(Map<String, String> map) {
+ withJavaxJdoRunInMemoryProperties(map);
+ withDatanucleusProperties(map);
+ withIsisIntegTestProperties(map);
+ }
+
+ public static Map<String,String> withJavaxJdoRunInMemoryProperties(final Map<String, String> map) {
+
+ map.put(PersistenceSession.DATANUCLEUS_PROPERTIES_ROOT + "javax.jdo.option.ConnectionURL", "jdbc:hsqldb:mem:test");
+ map.put(PersistenceSession.DATANUCLEUS_PROPERTIES_ROOT + "javax.jdo.option.ConnectionDriverName", "org.hsqldb.jdbcDriver");
+ map.put(PersistenceSession.DATANUCLEUS_PROPERTIES_ROOT + "javax.jdo.option.ConnectionUserName", "sa");
+ map.put(PersistenceSession.DATANUCLEUS_PROPERTIES_ROOT + "javax.jdo.option.ConnectionPassword", "");
+
+ return map;
+ }
+
+ public static Map<String,String> withDatanucleusProperties(final Map<String, String> map) {
+
+ // Don't do validations that consume setup time.
+ map.put(PersistenceSession.DATANUCLEUS_PROPERTIES_ROOT + PropertyNames.PROPERTY_SCHEMA_AUTOCREATE_ALL, "true");
+ map.put(PersistenceSession.DATANUCLEUS_PROPERTIES_ROOT + PropertyNames.PROPERTY_SCHEMA_VALIDATE_ALL, "false");
+
+ // other properties as per WEB-INF/persistor_datanucleus.properties
+ map.put(PersistenceSession.DATANUCLEUS_PROPERTIES_ROOT + "datanucleus.persistenceByReachabilityAtCommit", "false");
+ map.put(PersistenceSession.DATANUCLEUS_PROPERTIES_ROOT + "datanucleus.identifier.case", "MixedCase");
+ map.put(PersistenceSession.DATANUCLEUS_PROPERTIES_ROOT + "datanucleus.cache.level2.type","none");
+ map.put(PersistenceSession.DATANUCLEUS_PROPERTIES_ROOT + "datanucleus.cache.level2.mode","ENABLE_SELECTIVE");
+
+ return map;
+ }
+
+ public static Map<String,String> withIsisIntegTestProperties(final Map<String, String> map) {
+
+ // automatically install any fixtures that might have been registered
+ map.put(PersistenceSession.INSTALL_FIXTURES_KEY , "true");
+ map.put(PersistenceConstants.ENFORCE_SAFE_SEMANTICS, ""+PersistenceConstants.ENFORCE_SAFE_SEMANTICS_DEFAULT);
+ map.put("isis.deploymentType", "server_prototype");
+ map.put("isis.services.eventbus.allowLateRegistration", "true");
+
+ return map;
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/b6b1bca6/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/bootstrap/DomainAppSystemInitializer.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/bootstrap/DomainAppSystemInitializer.java b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/bootstrap/DomainAppSystemInitializer.java
index dec906b..474c12d 100644
--- a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/bootstrap/DomainAppSystemInitializer.java
+++ b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/bootstrap/DomainAppSystemInitializer.java
@@ -18,11 +18,15 @@
*/
package domainapp.integtests.bootstrap;
+import com.google.common.collect.Maps;
import org.apache.isis.core.integtestsupport.IsisSystemForTest;
import org.apache.isis.objectstore.jdo.datanucleus.IsisConfigurationForJdoIntegTests;
import domainapp.app.DomainAppAppManifest;
+import java.util.HashMap;
+import java.util.Map;
+
public class DomainAppSystemInitializer {
public static void initIsft() {
@@ -30,10 +34,18 @@ public class DomainAppSystemInitializer {
if(isft == null) {
isft = new IsisSystemForTest.Builder()
.withLoggingAt(org.apache.log4j.Level.INFO)
- .with(new DomainAppAppManifest())
- .with(new IsisConfigurationForJdoIntegTests())
+ .with(new DomainAppAppManifest() {
+ @Override
+ public Map<String, String> getConfigurationProperties() {
+ final Map<String, String> map = Maps.newHashMap();
+ IsisConfigurationForJdoIntegTests.withJavaxJdoRunInMemoryProperties(map);
+ IsisConfigurationForJdoIntegTests.withDatanucleusProperties(map);
+ IsisConfigurationForJdoIntegTests.withIsisIntegTestProperties(map);
+ return map;
+ }
+ })
.build();
- isft.initIfRequiredThenOpenSession();
+ isft.setUpSystem();
IsisSystemForTest.set(isft);
}
}
[25/50] [abbrv] isis git commit: ISIS-1427: completes rationalization
for minimizing calls to IsisContext#getIsisSessionFactory static.
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
index 340e202..7e5b744 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
@@ -37,7 +37,6 @@ import org.apache.isis.applib.services.command.Command.Executor;
import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.applib.services.xactn.TransactionService;
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.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
@@ -45,6 +44,8 @@ import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.mementos.ActionMemento;
@@ -84,7 +85,7 @@ public final class BulkActionsLinkFactory implements ActionLinkFactory {
@Override
public void onClick() {
- final ObjectAction objectAction = actionMemento.getAction();
+ final ObjectAction objectAction = actionMemento.getAction(getSpecificationLoader());
final ConcurrencyChecking concurrencyChecking =
ConcurrencyChecking.concurrencyCheckingFor(objectAction.getSemantics());
@@ -93,8 +94,10 @@ public final class BulkActionsLinkFactory implements ActionLinkFactory {
final List<ObjectAdapter> toggledAdapters =
FluentIterable.from(toggleMementosList)
- .transform(ObjectAdapterMemento.Functions.fromMemento(concurrencyChecking))
- .toList();
+ .transform(
+ ObjectAdapterMemento.Functions.fromMemento(
+ concurrencyChecking, getPersistenceSession(), getSpecificationLoader()))
+ .toList();
final List<Object> domainObjects = Lists.newArrayList(Iterables.transform(toggledAdapters, ObjectAdapter.Functions.getObject()));
@@ -148,7 +151,7 @@ public final class BulkActionsLinkFactory implements ActionLinkFactory {
model.clearToggleMementosList();
toggleboxColumn.clearToggles();
final ActionModel actionModel = model.getActionModelHint();
- if(actionModel != null && actionModel.getActionMemento().getAction().getSemantics().isIdempotentInNature()) {
+ if(actionModel != null && actionModel.getActionMemento().getAction(getSpecificationLoader()).getSemantics().isIdempotentInNature()) {
ObjectAdapter resultAdapter = actionModel.getObject();
model.setObjectList(resultAdapter);
} else {
@@ -190,7 +193,7 @@ public final class BulkActionsLinkFactory implements ActionLinkFactory {
final List<ObjectAdapterMemento> toggleMementosList = Lists.newArrayList(model.getToggleMementosList());
for (ObjectAdapterMemento oam : toggleMementosList) {
// just requesting the adapter will sync the OAM's version with the objectstore
- oam.getObjectAdapter(ConcurrencyChecking.NO_CHECK);
+ oam.getObjectAdapter(ConcurrencyChecking.NO_CHECK, getPersistenceSession(), getSpecificationLoader());
}
// discard any adapters that might have been deleted
@@ -200,7 +203,8 @@ public final class BulkActionsLinkFactory implements ActionLinkFactory {
final List<ObjectAdapter> adapters = model.getObject();
model.clearToggleMementosList();
for (ObjectAdapterMemento oam : toggleMementosList) {
- final ObjectAdapter objectAdapter = oam.getObjectAdapter(ConcurrencyChecking.NO_CHECK);
+ final ObjectAdapter objectAdapter = oam.getObjectAdapter(ConcurrencyChecking.NO_CHECK,
+ getPersistenceSession(), getSpecificationLoader());
if(adapters.contains(objectAdapter)) {
// in case it has been deleted...
model.toggleSelectionOn(objectAdapter);
@@ -231,8 +235,16 @@ public final class BulkActionsLinkFactory implements ActionLinkFactory {
// Dependencies (from context)
///////////////////////////////////////////////////////
+ SpecificationLoader getSpecificationLoader() {
+ return getIsisSessionFactory().getSpecificationLoader();
+ }
+
+ PersistenceSession getPersistenceSession() {
+ return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
+ }
+
public AuthenticationSession getAuthenticationSession() {
- return getServicesInjector().lookupService(AuthenticationSessionProvider.class).getAuthenticationSession();
+ return getServicesInjector().getAuthenticationSession();
}
protected MessageBroker getMessageBroker() {
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
index a105aa3..6fa6842 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionSelectorHelper.java
@@ -133,7 +133,7 @@ public class CollectionSelectorHelper implements Serializable {
// else @CollectionLayout#defaultView attribute
if (hasDefaultViewFacet(model)) {
- DefaultViewFacet defaultViewFacet = model.getCollectionMemento().getCollection().getFacet(DefaultViewFacet.class);
+ DefaultViewFacet defaultViewFacet = model.getCollectionMemento().getCollection(model.getSpecificationLoader()).getFacet(DefaultViewFacet.class);
for (ComponentFactory componentFactory : componentFactories) {
final String componentName = componentFactory.getName();
final String viewName = defaultViewFacet.value();
@@ -193,7 +193,7 @@ public class CollectionSelectorHelper implements Serializable {
}
final OneToManyAssociation collection =
- entityCollectionModel.getCollectionMemento().getCollection();
+ entityCollectionModel.getCollectionMemento().getCollection(entityCollectionModel.getSpecificationLoader());
RenderFacet renderFacet = collection.getFacet(RenderFacet.class);
return renderFacet != null && renderFacet.value() == Render.Type.EAGERLY;
}
@@ -205,7 +205,7 @@ public class CollectionSelectorHelper implements Serializable {
}
final OneToManyAssociation collection =
- entityCollectionModel.getCollectionMemento().getCollection();
+ entityCollectionModel.getCollectionMemento().getCollection(entityCollectionModel.getSpecificationLoader());
DefaultViewFacet defaultViewFacet = collection.getFacet(DefaultViewFacet.class);
return defaultViewFacet != null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index 62a0e1d..ece85d6 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -173,7 +173,8 @@ public class CollectionContentsAsAjaxTablePanel
final ObjectSpecification parentSpecIfAny =
getModel().isParented()
- ? getModel().getParentObjectAdapterMemento().getObjectAdapter(ConcurrencyChecking.NO_CHECK).getSpecification()
+ ? getModel().getParentObjectAdapterMemento().getObjectAdapter(ConcurrencyChecking.NO_CHECK,
+ getPersistenceSession(), getSpecificationLoader()).getSpecification()
: null;
@SuppressWarnings("unchecked")
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
index 835ff8f..20eb1d9 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collection/EntityCollectionPanel.java
@@ -96,7 +96,8 @@ public class EntityCollectionPanel extends PanelAbstract<EntityModel> implements
CssClassAppender.appendCssClassTo(div, entityCollectionModel.getCollectionMemento().getId());
CssClassAppender.appendCssClassTo(div, entityCollectionModel.getTypeOfSpecification().getFullIdentifier().replace('.','-'));
- final OneToManyAssociation association = entityCollectionModel.getCollectionMemento().getCollection();
+ final OneToManyAssociation association = entityCollectionModel.getCollectionMemento().getCollection(
+ entityCollectionModel.getSpecificationLoader());
final ObjectAdapter objectAdapter = getModel().getObject();
final Consent visibility = association.isVisible(objectAdapter, InteractionInitiatedBy.USER, Where.OBJECT_FORMS);
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
index 9816a42..2fefb31 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
@@ -175,7 +175,8 @@ public class EntityIconAndTitlePanel extends PanelAbstract<EntityModel> {
public ObjectAdapter getContextAdapterIfAny() {
EntityModel model = getModel();
ObjectAdapterMemento contextAdapterMementoIfAny = model.getContextAdapterIfAny();
- return contextAdapterMementoIfAny != null? contextAdapterMementoIfAny.getObjectAdapter(ConcurrencyChecking.NO_CHECK): null;
+ return contextAdapterMementoIfAny != null? contextAdapterMementoIfAny.getObjectAdapter(ConcurrencyChecking.NO_CHECK,
+ model.getPersistenceSession(), model.getSpecificationLoader()): null;
}
static String abbreviated(final String str, final int maxLength) {
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
index b7a320d..5570903 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
@@ -96,14 +96,15 @@ public class PropertyEditPanel extends PanelAbstract<ScalarModel>
ObjectAdapter targetAdapter = null;
try {
targetAdapter = scalarModel.getParentObjectAdapterMemento()
- .getObjectAdapter(AdapterManager.ConcurrencyChecking.CHECK);
+ .getObjectAdapter(AdapterManager.ConcurrencyChecking.CHECK, scalarModel.getPersistenceSession(),
+ scalarModel.getSpecificationLoader());
scalarModel.toEditMode();
getComponentFactoryRegistry().addOrReplaceComponent(this, ComponentType.PROPERTY_EDIT_FORM, getScalarModel());
getComponentFactoryRegistry().addOrReplaceComponent(header, ComponentType.ENTITY_ICON_AND_TITLE, new EntityModel(targetAdapter));
- final OneToOneAssociation property = getScalarModel().getPropertyMemento().getProperty();
+ final OneToOneAssociation property = getScalarModel().getPropertyMemento().getProperty(scalarModel.getSpecificationLoader());
final String propertyName = property.getName();
final Label label = new Label(ID_PROPERTY_NAME, Model.of(propertyName));
@@ -120,7 +121,8 @@ public class PropertyEditPanel extends PanelAbstract<ScalarModel>
// been updated in the attempt
if (targetAdapter == null) {
targetAdapter = scalarModel.getParentObjectAdapterMemento()
- .getObjectAdapter(AdapterManager.ConcurrencyChecking.CHECK);
+ .getObjectAdapter(AdapterManager.ConcurrencyChecking.CHECK, getPersistenceSession(),
+ getSpecificationLoader());
}
// page redirect/handling
@@ -156,7 +158,7 @@ public class PropertyEditPanel extends PanelAbstract<ScalarModel>
ObjectAdapter targetAdapter = null;
try {
targetAdapter = getModel().getParentObjectAdapterMemento().getObjectAdapter(
- AdapterManager.ConcurrencyChecking.CHECK);
+ AdapterManager.ConcurrencyChecking.CHECK, getModel().getPersistenceSession(), getSpecificationLoader());
// no concurrency exception, so continue...
return editTargetAndProcessResults(target, feedbackForm);
@@ -167,7 +169,8 @@ public class PropertyEditPanel extends PanelAbstract<ScalarModel>
// been updated in the attempt
if (targetAdapter == null) {
targetAdapter = getModel().getParentObjectAdapterMemento().getObjectAdapter(
- AdapterManager.ConcurrencyChecking.CHECK);
+ AdapterManager.ConcurrencyChecking.CHECK, getModel().getPersistenceSession(),
+ getSpecificationLoader());
}
// page redirect/handling
@@ -211,7 +214,8 @@ public class PropertyEditPanel extends PanelAbstract<ScalarModel>
// could be programmatic flushing, so must include in the try... finally
ObjectAdapter adapter = getScalarModel().getParentObjectAdapterMemento()
- .getObjectAdapter(AdapterManager.ConcurrencyChecking.CHECK);
+ .getObjectAdapter(AdapterManager.ConcurrencyChecking.CHECK, getPersistenceSession(),
+ getSpecificationLoader());
final ObjectAdapter objectAdapter = getScalarModel().applyValue(adapter);
// (borrowed some code previously in EntityModel)
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPromptHeaderPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPromptHeaderPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPromptHeaderPanel.java
index 49c91bd..955abc2 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPromptHeaderPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPromptHeaderPanel.java
@@ -41,18 +41,19 @@ public class PropertyEditPromptHeaderPanel extends PanelAbstract<ScalarModel> {
super(id, model);
ObjectAdapter targetAdapter =
- model.getParentObjectAdapterMemento().getObjectAdapter(AdapterManager.ConcurrencyChecking.NO_CHECK);
+ model.getParentObjectAdapterMemento().getObjectAdapter(AdapterManager.ConcurrencyChecking.NO_CHECK,
+ getPersistenceSession(), getSpecificationLoader());
getComponentFactoryRegistry().addOrReplaceComponent(this, ComponentType.ENTITY_ICON_AND_TITLE, new EntityModel(targetAdapter));
final Label label = new Label(ID_PROPERTY_NAME, new AbstractReadOnlyModel<String>() {
@Override
public String getObject() {
- final OneToOneAssociation property = model.getPropertyMemento().getProperty();
+ final OneToOneAssociation property = model.getPropertyMemento().getProperty(getSpecificationLoader());
return property.getName();
}
});
- final OneToOneAssociation property = model.getPropertyMemento().getProperty();
+ final OneToOneAssociation property = model.getPropertyMemento().getProperty(getSpecificationLoader());
final NamedFacet namedFacet = property.getFacet(NamedFacet.class);
if(namedFacet != null) {
label.setEscapeModelStrings(namedFacet.escaped());
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 42a5e83..bf33953 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -43,6 +43,7 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacet;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.models.ActionPrompt;
import org.apache.isis.viewer.wicket.model.models.ActionPromptProvider;
@@ -268,7 +269,8 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
ScalarModel model = getModel();
final CssClassFacet facet = model.getFacet(CssClassFacet.class);
if(facet != null) {
- final ObjectAdapter parentAdapter = model.getParentObjectAdapterMemento().getObjectAdapter(ConcurrencyChecking.NO_CHECK);
+ final ObjectAdapter parentAdapter = model.getParentObjectAdapterMemento().getObjectAdapter(ConcurrencyChecking.NO_CHECK,
+ getPersistenceSession(), getSpecificationLoader());
final String cssClass = facet.cssClass(parentAdapter);
CssClassAppender.appendCssClassTo(this, cssClass);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index 4a353a0..0d65bc8 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -45,7 +45,6 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.object.autocomplete.AutoCompleteFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
@@ -369,11 +368,12 @@ public class ReferencePanel extends ScalarPanelAbstract {
return;
}
- if(!curr.containedIn(choiceMementos)) {
+ if(!curr.containedIn(choiceMementos, getPersistenceSession(), getSpecificationLoader())) {
if(!choiceMementos.isEmpty() && autoSelect()) {
final ObjectAdapterMemento newAdapterMemento = choiceMementos.get(0);
select2Field.getModel().setObject(newAdapterMemento);
- getModel().setObject(newAdapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK));
+ getModel().setObject(newAdapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK,
+ getPersistenceSession(), getSpecificationLoader()));
} else {
select2Field.getModel().setObject(null);
getModel().setObject(null);
@@ -465,7 +465,8 @@ public class ReferencePanel extends ScalarPanelAbstract {
select2Field.getModel().setObject(convertedInput);
}
- final ObjectAdapter adapter = convertedInput!=null?convertedInput.getObjectAdapter(ConcurrencyChecking.NO_CHECK):null;
+ final ObjectAdapter adapter = convertedInput!=null?convertedInput.getObjectAdapter(ConcurrencyChecking.NO_CHECK,
+ getPersistenceSession(), getSpecificationLoader()):null;
getModel().setObject(adapter);
}
@@ -526,9 +527,8 @@ public class ReferencePanel extends ScalarPanelAbstract {
@com.google.inject.Inject
private WicketViewerSettings wicketViewerSettings;
- // REVIEW: can't inject because IsisConfiguration not serializable.
IsisConfiguration getConfiguration() {
- return IsisContext.getSessionFactory().getConfiguration();
+ return getIsisSessionFactory().getConfiguration();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
index dd9eb31..8f3332d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
@@ -88,7 +88,7 @@ public class StandaloneCollectionPanel extends PanelAbstract<EntityCollectionMod
addOrReplace(outerDiv);
ActionModel actionModel = entityCollectionModel.getActionModelHint();
- ObjectAction action = actionModel.getActionMemento().getAction();
+ ObjectAction action = actionModel.getActionMemento().getAction(entityCollectionModel.getSpecificationLoader());
outerDiv.addOrReplace(new Label(StandaloneCollectionPanel.ID_ACTION_NAME, Model.of(action.getName())));
CssClassAppender.appendCssClassTo(outerDiv, action.getOnType().getFullIdentifier().replace('.', '-') + "_" + action.getId());
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
index 20b3aa8..4eb77e6 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
@@ -19,16 +19,23 @@ package org.apache.isis.viewer.wicket.ui.components.widgets;
import java.util.Collection;
import java.util.List;
import java.util.Locale;
+
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
-import org.wicketstuff.select2.TextChoiceProvider;
+
import org.apache.wicket.Session;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.string.Strings;
+import org.wicketstuff.select2.TextChoiceProvider;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+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;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -55,7 +62,9 @@ public abstract class ObjectAdapterMementoProviderAbstract extends TextChoicePro
return NULL_DISPLAY_TEXT;
}
- final ObjectAdapter objectAdapter = choice.getObjectAdapter(ConcurrencyChecking.NO_CHECK);
+ final ObjectAdapter objectAdapter =
+ choice.getObjectAdapter(
+ ConcurrencyChecking.NO_CHECK, getPersistenceSession(), getSpecificationLoader());
final IConverter<Object> converter = findConverter(objectAdapter);
return converter != null
? converter.convertToString(objectAdapter.getObject(), getLocale())
@@ -102,7 +111,8 @@ public abstract class ObjectAdapterMementoProviderAbstract extends TextChoicePro
matches.addAll(choicesMementos);
} else {
for (ObjectAdapterMemento candidate : choicesMementos) {
- ObjectAdapter objectAdapter = candidate.getObjectAdapter(ConcurrencyChecking.NO_CHECK);
+ ObjectAdapter objectAdapter = candidate.getObjectAdapter(ConcurrencyChecking.NO_CHECK,
+ getPersistenceSession(), getSpecificationLoader());
String title = objectAdapter.titleString(objectAdapter);
if (title.toLowerCase().contains(term.toLowerCase())) {
matches.add(candidate);
@@ -132,4 +142,23 @@ public abstract class ObjectAdapterMementoProviderAbstract extends TextChoicePro
protected ScalarModel getScalarModel() {
return scalarModel;
}
+
+
+ ///////////////////////////////////////////////////////
+ // Dependencies (from context)
+ ///////////////////////////////////////////////////////
+
+
+ protected SpecificationLoader getSpecificationLoader() {
+ return getIsisSessionFactory().getSpecificationLoader();
+ }
+
+ PersistenceSession getPersistenceSession() {
+ return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
+ }
+
+ private IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
index 55fd1ae..599211e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
@@ -98,7 +98,8 @@ public class BreadcrumbModel implements Serializable {
}
public String titleFor(final EntityModel model) {
- return model.getObjectAdapterMemento().getObjectAdapter(AdapterManager.ConcurrencyChecking.NO_CHECK).titleString(null);
+ return model.getObjectAdapterMemento().getObjectAdapter(AdapterManager.ConcurrencyChecking.NO_CHECK,
+ model.getPersistenceSession(), model.getSpecificationLoader()).titleString(null);
}
public EntityModel lookup(final String oidStr) {
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
index 3025ad5..fad497c 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
@@ -19,19 +19,14 @@
package org.apache.isis.viewer.wicket.ui.components.widgets.formcomponent;
-import java.util.List;
-
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.form.FormComponentPanel;
import org.apache.wicket.model.IModel;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
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;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
@@ -125,31 +120,6 @@ public abstract class FormComponentPanelAbstract<T> extends FormComponentPanel<T
return cfra.getComponentFactoryRegistry();
}
- /**
- * The underlying {@link AuthenticationSession Isis session} wrapped in the
- * {@link #getWebSession() Wicket session}.
- *
- * @return
- */
- public AuthenticationSession getAuthenticationSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
- }
-
- public DeploymentCategory getDeploymentCategory() {
- return IsisContext.getSessionFactory().getDeploymentCategory();
- }
-
- // ///////////////////////////////////////////////////////////////////
- // Dependencies (from IsisContext)
- // ///////////////////////////////////////////////////////////////////
-
- public PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
- }
-
- protected List<ObjectAdapter> getServices() {
- return getPersistenceSession().getServices();
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
index dcf12bd..172069e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
@@ -273,7 +273,10 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
: null;
select2Field.getModel().setObject(newAdapterMemento);
getModel().setObject(
- newAdapterMemento != null? newAdapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK): null);
+ newAdapterMemento != null
+ ? newAdapterMemento.getObjectAdapter(
+ ConcurrencyChecking.NO_CHECK, getPersistenceSession(), getSpecificationLoader())
+ : null);
}
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
index 697df6d..6e19fe5 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
@@ -44,7 +44,7 @@ public class EmailAvailableValidator implements IValidator<String> {
@Override
public void validate(final IValidatable<String> validatable) {
- getSessionFactory().doInSession(new Runnable() {
+ getIsisSessionFactory().doInSession(new Runnable() {
@Override
public void run() {
UserRegistrationService userRegistrationService = getServicesInjector().lookupService(UserRegistrationService.class);
@@ -57,10 +57,10 @@ public class EmailAvailableValidator implements IValidator<String> {
});
}ServicesInjector getServicesInjector() {
- return getSessionFactory().getServicesInjector();
+ return getIsisSessionFactory().getServicesInjector();
}
- IsisSessionFactory getSessionFactory() {
+ IsisSessionFactory getIsisSessionFactory() {
return IsisContext.getSessionFactory();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
index a7da922..de9c583 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
@@ -95,7 +95,7 @@ public abstract class RegisterPanel extends GenericPanel<UserDetails> {
/**
* Register user form.
*/
- private static class RegisterForm extends StatelessForm<UserDetails>
+ private class RegisterForm extends StatelessForm<UserDetails>
{
private static final long serialVersionUID = 1L;
@@ -124,13 +124,13 @@ public abstract class RegisterPanel extends GenericPanel<UserDetails> {
{
final UserDetails userDetails = getModelObject();
- getSessionFactory().doInSession(new Runnable() {
+ getIsisSessionFactory().doInSession(new Runnable() {
@Override
public void run() {
- final UserRegistrationService userRegistrationService = getSessionFactory()
+ final UserRegistrationService userRegistrationService = getIsisSessionFactory()
.getServicesInjector().lookupService(UserRegistrationService.class);
- getSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager()
+ getIsisSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager()
.executeWithinTransaction(new TransactionalClosure() {
@Override
public void execute() {
@@ -161,10 +161,6 @@ public abstract class RegisterPanel extends GenericPanel<UserDetails> {
}
}
- static IsisSessionFactory getSessionFactory() {
- return IsisContext.getSessionFactory();
- }
-
protected TextField<String> newEmailField(final UserDetails userDetails) {
// use readonly-ish model to prevent changing the email with manual form submits
TextField<String> emailField = new TextField<>(ID_EMAIL, new Model<String>() {
@@ -199,4 +195,9 @@ public abstract class RegisterPanel extends GenericPanel<UserDetails> {
usernameFormGroup.add(username);
return usernameFormGroup;
}
+
+ IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
index 66d27ff..cfeb59e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
@@ -23,6 +23,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
@@ -39,7 +40,7 @@ public class ActionPromptPage extends PageAbstract {
* For use with {@link Component#setResponsePage(org.apache.wicket.Page)}
*/
public ActionPromptPage(final ActionModel model) {
- super(new PageParameters(), model.getActionMemento().getAction().getName(), ComponentType.ACTION_PROMPT);
+ super(new PageParameters(), model.getActionMemento().getAction(model.getSpecificationLoader()).getName(), ComponentType.ACTION_PROMPT);
addChildComponents(themeDiv, model);
if(model.isBookmarkable()) {
@@ -48,19 +49,21 @@ public class ActionPromptPage extends PageAbstract {
addBookmarkedPages(themeDiv);
}
- public ActionPromptPage(final PageParameters pageParameters) {
- this(pageParameters, buildModel(pageParameters));
+ public ActionPromptPage(final PageParameters pageParameters, final SpecificationLoader specificationLoader) {
+ this(pageParameters, buildModel(pageParameters, specificationLoader));
}
public ActionPromptPage(final PageParameters pageParameters, final ActionModel model) {
- super(pageParameters, model.getActionMemento().getAction().getName(), ComponentType.ACTION_PROMPT);
+ super(pageParameters, model.getActionMemento().getAction(model.getSpecificationLoader()).getName(), ComponentType.ACTION_PROMPT);
addChildComponents(themeDiv, model);
// no need to bookmark because the ActionPanel will have done so for us
addBookmarkedPages(themeDiv);
}
- private static ActionModel buildModel(final PageParameters pageParameters) {
- return ActionModel.createForPersistent(pageParameters);
+ private static ActionModel buildModel(
+ final PageParameters pageParameters,
+ final SpecificationLoader specificationLoader) {
+ return ActionModel.createForPersistent(pageParameters, specificationLoader);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
index 4cda181..b8e72ce 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
@@ -131,8 +131,10 @@ public class MmvErrorPage extends WebPage {
// ///////////////////////////////////////////////////
protected IsisConfiguration getConfiguration() {
- return getSessionFactory().getConfiguration();
- }IsisSessionFactory getSessionFactory() {
+ return getIsisSessionFactory().getConfiguration();
+ }
+
+ IsisSessionFactory getIsisSessionFactory() {
return IsisContext.getSessionFactory();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
index 4bbc61e..9c634c8 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/standalonecollection/StandaloneCollectionPage.java
@@ -49,7 +49,7 @@ public class StandaloneCollectionPage extends PageAbstract {
private static String actionNameFrom(final EntityCollectionModel model) {
ActionModel actionModel = model.getActionModelHint();
if(actionModel != null) {
- return actionModel.getActionMemento().getAction().getName();
+ return actionModel.getActionMemento().getAction(actionModel.getSpecificationLoader()).getName();
}
return "Results"; // fallback, probably not required because hint should always exist on the model.
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java
index 58e991c..b9fb447 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/value/ValuePage.java
@@ -62,7 +62,7 @@ public class ValuePage extends PageAbstract {
private static String actionNameFrom(final ValueModel valueModel) {
ActionModel actionModel = valueModel.getActionModelHint();
if(actionModel != null) {
- return actionModel.getActionMemento().getAction().getName();
+ return actionModel.getActionMemento().getAction(valueModel.getSpecificationLoader()).getName();
}
return "Results"; // fallback, probably not required because hint should always exist on the model.
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
index a396d88..e69936d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
@@ -54,7 +54,7 @@ public class VoidReturnPage extends PageAbstract {
private static String actionNameFrom(final VoidModel model) {
ActionModel actionModel = model.getActionModelHint();
if(actionModel != null) {
- return actionModel.getActionMemento().getAction().getName();
+ return actionModel.getActionMemento().getAction(model.getSpecificationLoader()).getName();
}
return "Results"; // fallback, probably not required because hint should always exist on the model.
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index eb936c0..bf27fcd 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -29,6 +29,7 @@ import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -202,6 +203,10 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel
return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
}
+ public SpecificationLoader getSpecificationLoader() {
+ return getIsisSessionFactory().getSpecificationLoader();
+ }
+
protected ServicesInjector getServicesInjector() {
return getIsisSessionFactory().getServicesInjector();
}
@@ -211,4 +216,5 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel
}
+
}
[45/50] [abbrv] isis git commit: ISIS-1441: fixes unit tests
Posted by da...@apache.org.
ISIS-1441: fixes unit tests
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ed318639
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ed318639
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ed318639
Branch: refs/heads/master
Commit: ed318639be47e243cf2e7628065f967dd386e0c1
Parents: 364e5b9
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jun 16 10:24:28 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jun 16 10:25:45 2016 +0100
----------------------------------------------------------------------
.../ExplorationAuthenticatorTest.java | 100 ++++++++++++++
.../fixture/LogonFixtureAuthenticatorTest.java | 99 ++++++++++++++
.../ExplorationAuthenticatorTest.java | 129 ------------------
.../fixture/LogonFixtureAuthenticatorTest.java | 131 -------------------
4 files changed, 199 insertions(+), 260 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ed318639/core/metamodel/src/test/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticatorTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticatorTest.java b/core/metamodel/src/test/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticatorTest.java
new file mode 100644
index 0000000..6a17244
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticatorTest.java
@@ -0,0 +1,100 @@
+/*
+ * 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.authentication.exploration;
+
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestAbstract;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+@RunWith(JMock.class)
+public class ExplorationAuthenticatorTest {
+
+ private final Mockery mockery = new JUnit4Mockery();
+
+ private IsisConfiguration mockConfiguration;
+ private ExplorationAuthenticator authenticator;
+
+ private AuthenticationRequestExploration explorationRequest;
+
+ private SomeOtherAuthenticationRequest someOtherRequest;
+
+ private static class SomeOtherAuthenticationRequest extends AuthenticationRequestAbstract {
+ public SomeOtherAuthenticationRequest() {
+ super("other");
+ }
+ }
+
+ @Before
+ public void setUp() {
+ mockConfiguration = mockery.mock(IsisConfiguration.class);
+
+ mockery.checking(new Expectations() {
+ {
+ allowing(mockConfiguration).getString(ExplorationAuthenticatorConstants.USERS);
+ will(returnValue("unit-testing"));
+ }
+ });
+
+ explorationRequest = new AuthenticationRequestExploration();
+ someOtherRequest = new SomeOtherAuthenticationRequest();
+
+ authenticator = new ExplorationAuthenticator(mockConfiguration);
+ }
+
+ @Test
+ public void canAuthenticateExplorationRequest() throws Exception {
+ assertThat(authenticator.canAuthenticate(explorationRequest.getClass()), is(true));
+ }
+
+ @Test
+ public void canAuthenticateSomeOtherTypeOfRequest() throws Exception {
+ assertThat(authenticator.canAuthenticate(someOtherRequest.getClass()), is(false));
+ }
+
+ @Test
+ public void isValidExplorationRequestWhenRunningInExplorationMode() throws Exception {
+ authenticator.init(DeploymentCategory.EXPLORING);
+ assertThat(authenticator.isValid(explorationRequest), is(true));
+ }
+
+ @Test
+ public void isNotValidExplorationRequestWhenRunningInSomethingOtherThanExplorationMode() throws Exception {
+ authenticator.init(DeploymentCategory.PROTOTYPING);
+ assertThat(authenticator.isValid(explorationRequest), is(false));
+ }
+
+ @Test
+ public void isValidSomeOtherTypeOfRequest() throws Exception {
+ authenticator.init(DeploymentCategory.PROTOTYPING);
+ assertThat(authenticator.canAuthenticate(someOtherRequest.getClass()), is(false));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/ed318639/core/metamodel/src/test/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticatorTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticatorTest.java b/core/metamodel/src/test/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticatorTest.java
new file mode 100644
index 0000000..93d0e59
--- /dev/null
+++ b/core/metamodel/src/test/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticatorTest.java
@@ -0,0 +1,99 @@
+/*
+ * 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.authentication.fixture;
+
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.apache.isis.applib.fixtures.LogonFixture;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestAbstract;
+import org.apache.isis.core.runtime.fixtures.authentication.AuthenticationRequestLogonFixture;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+@RunWith(JMock.class)
+public class LogonFixtureAuthenticatorTest {
+
+ private final Mockery mockery = new JUnit4Mockery();
+
+ private IsisConfiguration mockConfiguration;
+ private LogonFixtureAuthenticator authenticator;
+
+ private AuthenticationRequestLogonFixture logonFixtureRequest;
+
+ private SomeOtherAuthenticationRequest someOtherRequest;
+
+ private static class SomeOtherAuthenticationRequest extends AuthenticationRequestAbstract {
+ public SomeOtherAuthenticationRequest() {
+ super("other");
+ }
+ }
+
+ @Before
+ public void setUp() {
+ mockConfiguration = mockery.mock(IsisConfiguration.class);
+
+ logonFixtureRequest = new AuthenticationRequestLogonFixture(new LogonFixture("joebloggs"));
+ someOtherRequest = new SomeOtherAuthenticationRequest();
+ authenticator = new LogonFixtureAuthenticator(mockConfiguration);
+ }
+
+ @Test
+ public void canAuthenticateExplorationRequest() throws Exception {
+ assertThat(authenticator.canAuthenticate(logonFixtureRequest.getClass()), is(true));
+ }
+
+ @Test
+ public void canAuthenticateSomeOtherTypeOfRequest() throws Exception {
+ assertThat(authenticator.canAuthenticate(someOtherRequest.getClass()), is(false));
+ }
+
+ @Test
+ public void isValidLogonFixtureRequestWhenRunningInExplorationMode() throws Exception {
+ authenticator.init(DeploymentCategory.EXPLORING);
+ assertThat(authenticator.isValid(logonFixtureRequest), is(true));
+ }
+
+ @Test
+ public void isValidLogonFixtureRequestWhenRunningInPrototypeMode() throws Exception {
+ authenticator.init(DeploymentCategory.PROTOTYPING);
+ assertThat(authenticator.isValid(logonFixtureRequest), is(true));
+ }
+
+ @Test
+ public void isNotValidExplorationRequestWhenRunningInSomethingOtherThanExplorationOrPrototypeMode() throws Exception {
+ authenticator.init(DeploymentCategory.PRODUCTION);
+ assertThat(authenticator.isValid(logonFixtureRequest), is(false));
+ }
+
+ @Test
+ public void isValidSomeOtherTypeOfRequest() throws Exception {
+ authenticator.init(DeploymentCategory.EXPLORING);
+ assertThat(authenticator.canAuthenticate(SomeOtherAuthenticationRequest.class), is(false));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/ed318639/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticatorTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticatorTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticatorTest.java
deleted file mode 100644
index f8cad24..0000000
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticatorTest.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * 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.authentication.exploration;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequestAbstract;
-import org.apache.isis.core.runtime.authentication.exploration.AuthenticationRequestExploration;
-import org.apache.isis.core.runtime.authentication.exploration.ExplorationAuthenticator;
-import org.apache.isis.core.runtime.authentication.exploration.ExplorationAuthenticatorConstants;
-import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.SystemConstants;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-@RunWith(JMock.class)
-public class ExplorationAuthenticatorTest {
-
- private final Mockery mockery = new JUnit4Mockery();
-
- private IsisConfiguration mockConfiguration;
- private ExplorationAuthenticator authenticator;
-
- private AuthenticationRequestExploration explorationRequest;
-
- private SomeOtherAuthenticationRequest someOtherRequest;
-
- private static class SomeOtherAuthenticationRequest extends AuthenticationRequestAbstract {
- public SomeOtherAuthenticationRequest() {
- super("other");
- }
- }
-
- @Before
- public void setUp() {
- mockConfiguration = mockery.mock(IsisConfiguration.class);
-
- mockery.checking(new Expectations() {
- {
- allowing(mockConfiguration).getString(ExplorationAuthenticatorConstants.USERS);
- will(returnValue(DeploymentType.UNIT_TESTING.name()));
- }
- });
-
- explorationRequest = new AuthenticationRequestExploration();
- someOtherRequest = new SomeOtherAuthenticationRequest();
-
- authenticator = new ExplorationAuthenticator(mockConfiguration);
- }
-
- @Test
- public void canAuthenticateExplorationRequest() throws Exception {
- assertThat(authenticator.canAuthenticate(explorationRequest.getClass()), is(true));
- }
-
- @Test
- public void canAuthenticateSomeOtherTypeOfRequest() throws Exception {
- assertThat(authenticator.canAuthenticate(someOtherRequest.getClass()), is(false));
- }
-
- @Test
- public void isValidExplorationRequestWhenRunningInExplorationMode() throws Exception {
- mockery.checking(new Expectations() {
- {
- allowing(mockConfiguration).getString(SystemConstants.DEPLOYMENT_TYPE_KEY);
- will(returnValue(DeploymentType.SERVER_EXPLORATION.name()));
- }
- });
- assertThat(authenticator.isValid(explorationRequest), is(true));
- }
-
- @Test
- public void isNotValidExplorationRequestWhenRunningInSomethingOtherThanExplorationMode() throws Exception {
- mockery.checking(new Expectations() {
- {
- allowing(mockConfiguration).getString(SystemConstants.DEPLOYMENT_TYPE_KEY);
- will(returnValue(DeploymentType.SERVER_PROTOTYPE.name()));
- }
- });
- assertThat(authenticator.isValid(explorationRequest), is(false));
- }
-
- @Test(expected = IllegalStateException.class)
- public void expectsThereToBeADeploymentTypeInIsisConfiguration() throws Exception {
- mockery.checking(new Expectations() {
- {
- allowing(mockConfiguration).getString(SystemConstants.DEPLOYMENT_TYPE_KEY);
- will(returnValue(null));
- }
- });
- authenticator.isValid(explorationRequest);
- }
-
- @Test
- public void isValidSomeOtherTypeOfRequest() throws Exception {
- mockery.checking(new Expectations() {
- {
- allowing(mockConfiguration).getString(SystemConstants.DEPLOYMENT_TYPE_KEY);
- will(returnValue(DeploymentType.SERVER_PROTOTYPE.name()));
- }
- });
- assertThat(authenticator.canAuthenticate(someOtherRequest.getClass()), is(false));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/ed318639/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticatorTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticatorTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticatorTest.java
deleted file mode 100644
index bcbeb32..0000000
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticatorTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * 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.authentication.fixture;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.apache.isis.applib.fixtures.LogonFixture;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequestAbstract;
-import org.apache.isis.core.runtime.authentication.fixture.LogonFixtureAuthenticator;
-import org.apache.isis.core.runtime.fixtures.authentication.AuthenticationRequestLogonFixture;
-import org.apache.isis.core.runtime.system.DeploymentType;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-@RunWith(JMock.class)
-public class LogonFixtureAuthenticatorTest {
-
- private final Mockery mockery = new JUnit4Mockery();
-
- private IsisConfiguration mockConfiguration;
- private LogonFixtureAuthenticator authenticator;
-
- private AuthenticationRequestLogonFixture logonFixtureRequest;
-
- private SomeOtherAuthenticationRequest someOtherRequest;
-
- private static class SomeOtherAuthenticationRequest extends AuthenticationRequestAbstract {
- public SomeOtherAuthenticationRequest() {
- super("other");
- }
- }
-
- @Before
- public void setUp() {
- mockConfiguration = mockery.mock(IsisConfiguration.class);
-
- logonFixtureRequest = new AuthenticationRequestLogonFixture(new LogonFixture("joebloggs"));
- someOtherRequest = new SomeOtherAuthenticationRequest();
- authenticator = new LogonFixtureAuthenticator(mockConfiguration);
- }
-
- @Test
- public void canAuthenticateExplorationRequest() throws Exception {
- assertThat(authenticator.canAuthenticate(logonFixtureRequest.getClass()), is(true));
- }
-
- @Test
- public void canAuthenticateSomeOtherTypeOfRequest() throws Exception {
- assertThat(authenticator.canAuthenticate(someOtherRequest.getClass()), is(false));
- }
-
- @Test
- public void isValidLogonFixtureRequestWhenRunningInExplorationMode() throws Exception {
- mockery.checking(new Expectations() {
- {
- allowing(mockConfiguration).getString("isis.deploymentType");
- will(returnValue(DeploymentType.SERVER_EXPLORATION.name()));
- }
- });
- assertThat(authenticator.isValid(logonFixtureRequest), is(true));
- }
-
- @Test
- public void isValidLogonFixtureRequestWhenRunningInPrototypeMode() throws Exception {
- mockery.checking(new Expectations() {
- {
- allowing(mockConfiguration).getString("isis.deploymentType");
- will(returnValue(DeploymentType.SERVER_PROTOTYPE.name()));
- }
- });
- assertThat(authenticator.isValid(logonFixtureRequest), is(true));
- }
-
- @Test
- public void isNotValidExplorationRequestWhenRunningInSomethingOtherThanExplorationOrPrototypeMode() throws Exception {
- mockery.checking(new Expectations() {
- {
- allowing(mockConfiguration).getString("isis.deploymentType");
- will(returnValue(DeploymentType.SERVER.name()));
- }
- });
- assertThat(authenticator.isValid(logonFixtureRequest), is(false));
- }
-
- @Test(expected = IllegalStateException.class)
- public void expectsThereToBeADeploymentTypeInIsisConfiguration() throws Exception {
- mockery.checking(new Expectations() {
- {
- allowing(mockConfiguration).getString("isis.deploymentType");
- will(returnValue(null));
- }
- });
- authenticator.isValid(logonFixtureRequest);
- }
-
- @Test
- public void isValidSomeOtherTypeOfRequest() throws Exception {
- mockery.checking(new Expectations() {
- {
- allowing(mockConfiguration).getString("isis.deploymentType");
- will(returnValue(DeploymentType.SERVER_EXPLORATION.name()));
- }
- });
- assertThat(authenticator.canAuthenticate(SomeOtherAuthenticationRequest.class), is(false));
- }
-
-}
[44/50] [abbrv] isis git commit: ISIS-1441: removes
AuthenticationManagerStandardForDfltRuntime,
instead use AuthenticationManagerStandard.
Posted by da...@apache.org.
ISIS-1441: removes AuthenticationManagerStandardForDfltRuntime, instead use AuthenticationManagerStandard.
The supporting classes move from isis-core-runtime to isis-core-metamodel. Because the Authenticator subclasses relied on DeploymentType (only available in the isis-core-runtime), these instead depend on DeploymentCategory (in isis-core-metamodel).
This also includes a minor refactoring in the closeSession stuff... previously we called closeSession on AuthenticationManagerStandardForDfltRuntime, that in turn called IsisSessionFactory#closeSession() in order to clear the threadlocal holding the current session. However, IsisSessionFactory is part of isis-core-runtime so this design doesn't work. However, there is only one caller of closeSession, namely UserResourceServerside (the RO viewer). The refactoring is therefore easy enough... just have UserResourceServerside make the call to IsisSessionFactory.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/364e5b9b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/364e5b9b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/364e5b9b
Branch: refs/heads/master
Commit: 364e5b9b64d6e831fecaec559ef649029c746ede
Parents: 29f1e08
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jun 16 10:01:36 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jun 16 10:01:36 2016 +0100
----------------------------------------------------------------------
.../components/AuthenticationManagerNull.java | 3 +-
.../AuthorizationManagerAllowAll.java | 3 +-
.../authentication/AuthenticationManager.java | 3 +-
.../AuthenticationRequestExploration.java | 51 ++++++++
.../exploration/ExplorationAuthenticator.java | 122 ++++++++++++++++++
.../ExplorationAuthenticatorConstants.java | 31 +++++
.../exploration/ExplorationSession.java | 61 +++++++++
.../fixture/LogonFixtureAuthenticator.java | 49 +++++++
.../standard/AuthenticationManagerStandard.java | 15 +--
.../authentication/standard/Authenticator.java | 7 +-
.../standard/AuthenticatorAbstract.java | 35 +++--
.../standard/AuthenticatorDefault.java | 31 +++++
.../authorization/AuthorizationManager.java | 3 +-
.../standard/AuthorizationManagerStandard.java | 8 +-
.../authorization/standard/Authorizor.java | 13 +-
.../standard/AuthorizorAbstract.java | 47 -------
.../AuthenticationRequestLogonFixture.java | 45 +++++++
...enticationManagerStandardForDfltRuntime.java | 79 ------------
...StandardInstallerAbstractForDfltRuntime.java | 28 +++-
.../AuthenticatorAbstractForDfltRuntime.java | 49 -------
.../AuthenticationRequestExploration.java | 55 --------
.../exploration/ExplorationAuthenticator.java | 127 -------------------
.../ExplorationAuthenticatorConstants.java | 31 -----
.../exploration/ExplorationSession.java | 61 ---------
.../fixture/LogonFixtureAuthenticator.java | 54 --------
.../AuthenticationRequestLogonFixture.java | 45 -------
.../session/IsisSessionFactoryBuilder.java | 4 +-
...AuthenticatorAbstractForDfltRuntimeTest.java | 126 ------------------
.../standard/AuthenticatorDefaultTest.java | 76 +++++++++++
.../shiro/ShiroAuthenticatorOrAuthorizor.java | 11 +-
...henticatorOrAuthorizorTest_authenticate.java | 28 ++--
...atorOrAuthorizorTest_isVisibleInAnyRole.java | 22 ++--
.../authorization/AuthorizorBypass.java | 3 +-
.../resources/UserResourceServerside.java | 6 +-
34 files changed, 591 insertions(+), 741 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/components/AuthenticationManagerNull.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/components/AuthenticationManagerNull.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/components/AuthenticationManagerNull.java
index 3850500..6518012 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/components/AuthenticationManagerNull.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/components/AuthenticationManagerNull.java
@@ -21,6 +21,7 @@ package org.apache.isis.core.integtestsupport.components;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.Noop;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.authentication.RegistrationDetails;
@@ -28,7 +29,7 @@ import org.apache.isis.core.runtime.authentication.RegistrationDetails;
public class AuthenticationManagerNull implements AuthenticationManager, Noop {
@Override
- public void init() {
+ public void init(final DeploymentCategory deploymentCategory) {
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/components/AuthorizationManagerAllowAll.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/components/AuthorizationManagerAllowAll.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/components/AuthorizationManagerAllowAll.java
index 03c9e70..cde743f 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/components/AuthorizationManagerAllowAll.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/components/AuthorizationManagerAllowAll.java
@@ -22,12 +22,13 @@ package org.apache.isis.core.integtestsupport.components;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
public class AuthorizationManagerAllowAll implements AuthorizationManager {
@Override
- public void init() {
+ public void init(final DeploymentCategory deploymentCategory) {
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java
index 11de514..b509f58 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManager.java
@@ -22,6 +22,7 @@ package org.apache.isis.core.runtime.authentication;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
/**
@@ -31,7 +32,7 @@ import org.apache.isis.core.metamodel.services.ServicesInjector;
public interface AuthenticationManager extends ApplicationScopedComponent {
@Programmatic
- void init();
+ void init(final DeploymentCategory deploymentCategory);
@Programmatic
void shutdown();
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/AuthenticationRequestExploration.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/AuthenticationRequestExploration.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/AuthenticationRequestExploration.java
new file mode 100644
index 0000000..53eb78b
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/AuthenticationRequestExploration.java
@@ -0,0 +1,51 @@
+/*
+ * 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.authentication.exploration;
+
+import java.util.List;
+
+import org.apache.isis.applib.fixtures.LogonFixture;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestAbstract;
+
+public class AuthenticationRequestExploration extends AuthenticationRequestAbstract {
+
+ private static final String EXPLORATION_USER = "exploration";
+
+ private final LogonFixture logonFixture;
+
+ public AuthenticationRequestExploration() {
+ this(null);
+ }
+
+ public AuthenticationRequestExploration(final LogonFixture logonFixture) {
+ super(logonFixture != null ? logonFixture.getUsername() : EXPLORATION_USER);
+ this.logonFixture = logonFixture;
+ }
+
+ @Override
+ public List<String> getRoles() {
+ return logonFixture != null ? logonFixture.getRoles() : super.getRoles();
+ }
+
+ public boolean isDefaultUser() {
+ return EXPLORATION_USER.equals(getName());
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticator.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticator.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticator.java
new file mode 100644
index 0000000..0732e17
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticator.java
@@ -0,0 +1,122 @@
+/*
+ * 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.authentication.exploration;
+
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.core.runtime.authentication.standard.AuthenticatorAbstract;
+import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
+
+/**
+ * Creates a session suitable for {@link org.apache.isis.core.metamodel.deployment.DeploymentCategory#PROTOTYPING}
+ * mode.
+ *
+ * <p>
+ * The format of the {@value ExplorationAuthenticatorConstants#USERS} key should
+ * be:
+ *
+ * <pre>
+ * <:userName> [:<role>[|<role>]...], <userName>...
+ * </pre>
+ */
+public class ExplorationAuthenticator extends AuthenticatorAbstract {
+
+ //region > Constructor, fields
+ private final Set<SimpleSession> registeredSessions = new LinkedHashSet<SimpleSession>();;
+ private final String users;
+
+
+ public ExplorationAuthenticator(final IsisConfiguration configuration) {
+ super(configuration);
+ users = getConfiguration().getString(ExplorationAuthenticatorConstants.USERS);
+ if (users != null) {
+ registeredSessions.addAll(parseUsers(users));
+ }
+ }
+
+ //endregion
+
+ private List<SimpleSession> parseUsers(final String users) {
+ final List<SimpleSession> registeredUsers = new ArrayList<SimpleSession>();
+
+ final StringTokenizer st = new StringTokenizer(users, ",");
+ while (st.hasMoreTokens()) {
+ final String token = st.nextToken();
+ final int end = token.indexOf(':');
+ final List<String> roles = new ArrayList<String>();
+ final String userName;
+ if (end == -1) {
+ userName = token.trim();
+ } else {
+ userName = token.substring(0, end).trim();
+ final String roleList = token.substring(end + 1);
+ final StringTokenizer st2 = new StringTokenizer(roleList, "|");
+ while (st2.hasMoreTokens()) {
+ final String role = st2.nextToken().trim();
+ roles.add(role);
+ }
+ }
+ registeredUsers.add(createSimpleSession(userName, roles));
+ }
+ return registeredUsers;
+ }
+
+ private SimpleSession createSimpleSession(final String userName, final List<String> roles) {
+ return new SimpleSession(userName, roles.toArray(new String[roles.size()]));
+ }
+
+ // //////////////////////////////////////////////////////////////////
+ // API
+ // //////////////////////////////////////////////////////////////////
+
+ /**
+ * Can authenticate if a {@link AuthenticationRequestExploration}.
+ */
+ @Override
+ public final boolean canAuthenticate(final Class<? extends AuthenticationRequest> authenticationRequestClass) {
+ return AuthenticationRequestExploration.class.isAssignableFrom(authenticationRequestClass);
+ }
+
+ @Override
+ protected final boolean isValid(final AuthenticationRequest request) {
+ return getDeploymentCategory().isExploring();
+ }
+
+ @Override
+ public AuthenticationSession authenticate(final AuthenticationRequest request, final String code) {
+ final AuthenticationRequestExploration authenticationRequestExploration = (AuthenticationRequestExploration) request;
+ if (!authenticationRequestExploration.isDefaultUser()) {
+ registeredSessions.add(createSimpleSession(authenticationRequestExploration.getName(), authenticationRequestExploration.getRoles()));
+ }
+ if (registeredSessions.size() >= 1) {
+ return registeredSessions.iterator().next();
+ } else {
+ return new ExplorationSession(code);
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticatorConstants.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticatorConstants.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticatorConstants.java
new file mode 100644
index 0000000..36c2c16
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticatorConstants.java
@@ -0,0 +1,31 @@
+/*
+ * 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.authentication.exploration;
+
+import org.apache.isis.core.commons.config.ConfigurationConstants;
+
+public final class ExplorationAuthenticatorConstants {
+
+ public static final String USERS = ConfigurationConstants.ROOT + "exploration.users";
+
+ private ExplorationAuthenticatorConstants() {
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationSession.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationSession.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationSession.java
new file mode 100644
index 0000000..144a2b2
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationSession.java
@@ -0,0 +1,61 @@
+/*
+ * 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.authentication.exploration;
+
+import java.io.IOException;
+
+import org.apache.isis.core.commons.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.commons.encoding.DataInputExtended;
+import org.apache.isis.core.commons.encoding.DataOutputExtended;
+import org.apache.isis.core.commons.encoding.Encodable;
+
+public final class ExplorationSession extends AuthenticationSessionAbstract implements Encodable {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final String DEFAULT_USER_NAME = "exploration";
+
+ /**
+ * Defaults validation code to <tt>""</tt>.
+ */
+ public ExplorationSession() {
+ this("");
+ }
+
+ public ExplorationSession(final String code) {
+ super(DEFAULT_USER_NAME, code);
+ initialized();
+ }
+
+ public ExplorationSession(final DataInputExtended input) throws IOException {
+ super(input);
+ initialized();
+ }
+
+ @Override
+ public void encode(final DataOutputExtended output) throws IOException {
+ super.encode(output);
+ }
+
+ private void initialized() {
+ // nothing to do
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticator.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticator.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticator.java
new file mode 100644
index 0000000..aec2356
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticator.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.core.runtime.authentication.fixture;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.core.runtime.authentication.standard.AuthenticatorAbstract;
+import org.apache.isis.core.runtime.fixtures.authentication.AuthenticationRequestLogonFixture;
+
+public class LogonFixtureAuthenticator extends AuthenticatorAbstract {
+
+ public LogonFixtureAuthenticator(final IsisConfiguration configuration) {
+ super(configuration);
+ }
+
+ /**
+ * Can authenticate if a {@link AuthenticationRequestLogonFixture}.
+ */
+ @Override
+ public final boolean canAuthenticate(final Class<? extends AuthenticationRequest> authenticationRequestClass) {
+ return AuthenticationRequestLogonFixture.class.isAssignableFrom(authenticationRequestClass);
+ }
+
+ @Override
+ protected final boolean isValid(final AuthenticationRequest request) {
+ final DeploymentCategory deploymentCategory = getDeploymentCategory();
+ return deploymentCategory.isExploring() || deploymentCategory.isPrototyping();
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
index d64fba5..fac9953 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
@@ -33,6 +33,7 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.util.ToString;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.authentication.RegistrationDetails;
@@ -41,11 +42,7 @@ public class AuthenticationManagerStandard implements AuthenticationManager {
private final Map<String, String> userByValidationCode = Maps.newHashMap();
- /**
- * Not final because may be set {@link #setAuthenticators(List)
- * programmatically}.
- */
- private List<Authenticator> authenticators = Lists.newArrayList();
+ private final List<Authenticator> authenticators = Lists.newArrayList();
private RandomCodeGenerator randomCodeGenerator;
private final IsisConfiguration configuration;
@@ -62,16 +59,17 @@ public class AuthenticationManagerStandard implements AuthenticationManager {
* Will default the {@link #setRandomCodeGenerator(RandomCodeGenerator)
* RandomCodeGenerator}, but {@link Authenticator}(s) must have been
* {@link #addAuthenticator(Authenticator) added}.
+ * @param deploymentCategory
*/
@Programmatic
- public final void init() {
+ public final void init(final DeploymentCategory deploymentCategory) {
defaultRandomCodeGeneratorIfNecessary();
addDefaultAuthenticators();
if (authenticators.size() == 0) {
throw new IsisException("No authenticators specified");
}
for (final Authenticator authenticator : authenticators) {
- authenticator.init();
+ authenticator.init(deploymentCategory);
}
}
@@ -150,7 +148,8 @@ public class AuthenticationManagerStandard implements AuthenticationManager {
authenticators.add(authenticator);
}
- protected void addAuthenticatorToStart(final Authenticator authenticator) {
+ @Programmatic
+ public void addAuthenticatorToStart(final Authenticator authenticator) {
authenticators.add(0, authenticator);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/Authenticator.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/Authenticator.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/Authenticator.java
index 50bd29d..a9e113d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/Authenticator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/Authenticator.java
@@ -21,12 +21,15 @@ package org.apache.isis.core.runtime.authentication.standard;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
public interface Authenticator extends ApplicationScopedComponent {
- public void init();
- public void shutdown();
+ void init(final DeploymentCategory deploymentCategory);
+ void shutdown();
+
+ DeploymentCategory getDeploymentCategory();
/**
* Whether the provided {@link AuthenticationRequest} is recognized by this
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstract.java
index 96e819b..5268472 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstract.java
@@ -21,27 +21,27 @@ package org.apache.isis.core.runtime.authentication.standard;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
public abstract class AuthenticatorAbstract implements Authenticator {
+ //region > constructor, fields
private final IsisConfiguration configuration;
-
- // //////////////////////////////////////////////////////
- // constructor
- // //////////////////////////////////////////////////////
+ private DeploymentCategory deploymentCategory;
public AuthenticatorAbstract(final IsisConfiguration configuration) {
this.configuration = configuration;
}
- // //////////////////////////////////////////////////////
- // init, shutdown
- // //////////////////////////////////////////////////////
+ //endregion
+
+ //region > init, shutdown
@Override
- public void init() {
+ public void init(final DeploymentCategory deploymentCategory) {
// does nothing.
+ this.deploymentCategory = deploymentCategory;
}
@Override
@@ -49,9 +49,14 @@ public abstract class AuthenticatorAbstract implements Authenticator {
// does nothing.
}
- // //////////////////////////////////////////////////////
- // API
- // //////////////////////////////////////////////////////
+ @Override
+ public DeploymentCategory getDeploymentCategory() {
+ return deploymentCategory;
+ }
+
+ //endregion
+
+ //region > API
/**
* Default implementation returns a {@link SimpleSession}; can be overridden
@@ -80,12 +85,14 @@ public abstract class AuthenticatorAbstract implements Authenticator {
*/
protected abstract boolean isValid(AuthenticationRequest request);
- // //////////////////////////////////////////////////////
- // Injected (via constructor)
- // //////////////////////////////////////////////////////
+ //endregion
+
+ //region > Injected (via constructor)
public IsisConfiguration getConfiguration() {
return configuration;
}
+ //endregion
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorDefault.java
new file mode 100644
index 0000000..3804e7e
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorDefault.java
@@ -0,0 +1,31 @@
+/*
+ * 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.authentication.standard;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
+
+public abstract class AuthenticatorDefault extends AuthenticatorAbstract {
+
+ public AuthenticatorDefault(final IsisConfiguration configuration) {
+ super(configuration);
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManager.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManager.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManager.java
index e43aba6..832ad03 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManager.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManager.java
@@ -24,6 +24,7 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
/**
@@ -35,7 +36,7 @@ import org.apache.isis.core.metamodel.services.ServicesInjector;
public interface AuthorizationManager extends ApplicationScopedComponent {
@Programmatic
- void init();
+ void init(final DeploymentCategory deploymentCategory);
@Programmatic
void shutdown();
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java
index ee3a055..276427b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java
@@ -20,10 +20,10 @@
package org.apache.isis.core.runtime.authorization.standard;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
import org.apache.isis.core.runtime.authorization.AuthorizationManagerAbstract;
@@ -42,7 +42,7 @@ public class AuthorizationManagerStandard extends AuthorizationManagerAbstract {
authorizor = new Authorizor() {
@Override
- public void init() {
+ public void init(final DeploymentCategory deploymentCategory) {
}
@Override
@@ -75,8 +75,8 @@ public class AuthorizationManagerStandard extends AuthorizationManagerAbstract {
// init, shutddown
// /////////////////////////////////////////////////////////
- public void init() {
- authorizor.init();
+ public void init(final DeploymentCategory deploymentCategory) {
+ authorizor.init(deploymentCategory);
}
public void shutdown() {
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/Authorizor.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/Authorizor.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/Authorizor.java
index a60e214..5d1616f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/Authorizor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/Authorizor.java
@@ -21,24 +21,25 @@ package org.apache.isis.core.runtime.authorization.standard;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
public interface Authorizor extends ApplicationScopedComponent {
- public void init();
- public void shutdown();
+ void init(final DeploymentCategory deploymentCategory);
+ void shutdown();
- public boolean isVisibleInAnyRole(final Identifier identifier);
- public boolean isUsableInAnyRole(final Identifier identifier);
+ boolean isVisibleInAnyRole(final Identifier identifier);
+ boolean isUsableInAnyRole(final Identifier identifier);
/**
* Checked for each of the user's roles.
*/
- public boolean isVisibleInRole(final String role, final Identifier identifier);
+ boolean isVisibleInRole(final String role, final Identifier identifier);
/**
* Checked for each of the user's roles.
*/
- public boolean isUsableInRole(final String role, final Identifier identifier);
+ boolean isUsableInRole(final String role, final Identifier identifier);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizorAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizorAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizorAbstract.java
deleted file mode 100644
index bd81027..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizorAbstract.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.authorization.standard;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-
-public abstract class AuthorizorAbstract implements Authorizor {
-
- private final IsisConfiguration configuration;
-
- public AuthorizorAbstract(final IsisConfiguration configuration) {
- this.configuration = configuration;
- }
-
- public IsisConfiguration getConfiguration() {
- return configuration;
- }
-
- @Override
- public boolean isVisibleInAnyRole(Identifier identifier) {
- return false;
- }
-
- @Override
- public boolean isUsableInAnyRole(Identifier identifier) {
- return false;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/metamodel/src/main/java/org/apache/isis/core/runtime/fixtures/authentication/AuthenticationRequestLogonFixture.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/fixtures/authentication/AuthenticationRequestLogonFixture.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/fixtures/authentication/AuthenticationRequestLogonFixture.java
new file mode 100644
index 0000000..c3f52cc
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/fixtures/authentication/AuthenticationRequestLogonFixture.java
@@ -0,0 +1,45 @@
+/*
+ * 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.fixtures.authentication;
+
+import java.util.List;
+
+import org.apache.isis.applib.fixtures.LogonFixture;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestAbstract;
+import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandard;
+
+/**
+ * For testing purposes, request corresponding to a {@link LogonFixture}.
+ *
+ * <p>
+ * Understood directly by {@link AuthenticationManagerStandard}.
+ */
+public class AuthenticationRequestLogonFixture extends AuthenticationRequestAbstract {
+
+ public AuthenticationRequestLogonFixture(final LogonFixture logonFixture) {
+ this(logonFixture.getUsername(), logonFixture.getRoles());
+ }
+
+ public AuthenticationRequestLogonFixture(final String name, final List<String> roles) {
+ super(name);
+ setRoles(roles);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
deleted file mode 100644
index 04fe4eb..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.authentication;
-
-import javax.inject.Inject;
-
-import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.fixtures.LogonFixture;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.authentication.exploration.ExplorationAuthenticator;
-import org.apache.isis.core.runtime.authentication.exploration.ExplorationSession;
-import org.apache.isis.core.runtime.authentication.fixture.LogonFixtureAuthenticator;
-import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandard;
-import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-
-/**
- * A refinement of the {@link AuthenticationManagerStandard}, which adds support
- * to make it easier without the need of logging in when running in either
- * {@link DeploymentType#SERVER_EXPLORATION exploration} mode or in
- * {@link DeploymentType#SERVER_PROTOTYPE prototype} mode.
- *
- * <p>
- * Specifically:
- * <ul>
- * <li>the {@link ExplorationAuthenticator} will always provide a special
- * {@link ExplorationSession} if running in the {@link DeploymentType} of
- * {@link DeploymentType#SERVER_EXPLORATION exploration}.
- * <li>the {@link LogonFixtureAuthenticator} will set up a session using the
- * login provided by a {@link LogonFixture}, provided that the
- * {@link DeploymentType} is {@link DeploymentType#SERVER_EXPLORATION exploration} or
- * {@link DeploymentType#SERVER_PROTOTYPE prototyping}
- * </ul>
- */
-public class AuthenticationManagerStandardForDfltRuntime extends AuthenticationManagerStandard {
-
- public AuthenticationManagerStandardForDfltRuntime(final IsisConfiguration configuration) {
- super(configuration);
- }
-
-
- @Programmatic
- @Override
- protected void addDefaultAuthenticators() {
- // we add to start to ensure that these special case authenticators
- // are always consulted first
- addAuthenticatorToStart(new ExplorationAuthenticator(getConfiguration()));
- addAuthenticatorToStart(new LogonFixtureAuthenticator(getConfiguration()));
- }
-
- @Programmatic
- @Override
- public void closeSession(final AuthenticationSession session) {
- super.closeSession(session);
- isisSessionFactory.closeSession();
- }
-
- @javax.inject.Inject
- IsisSessionFactory isisSessionFactory;
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java
index 8840218..1bc7486 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java
@@ -19,7 +19,12 @@
package org.apache.isis.core.runtime.authentication;
+import org.apache.isis.applib.fixtures.LogonFixture;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
+import org.apache.isis.core.runtime.authentication.exploration.ExplorationAuthenticator;
+import org.apache.isis.core.runtime.authentication.exploration.ExplorationSession;
+import org.apache.isis.core.runtime.authentication.fixture.LogonFixtureAuthenticator;
import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandard;
import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
@@ -32,9 +37,30 @@ public abstract class AuthenticationManagerStandardInstallerAbstractForDfltRunti
super(name, isisConfiguration);
}
+ /**
+ * Returns an instance of {@link AuthenticationManagerStandard} that has no need to log in when running in
+ * exploration mode.
+ *
+ * <p>
+ * Specifically:
+ * <ul>
+ * <li> the {@link ExplorationAuthenticator} will always provide a special {@link ExplorationSession} if running
+ * in the exploration mode.
+ * <li> the {@link LogonFixtureAuthenticator} will set up a session using the login provided by a
+ * {@link LogonFixture}, provided running in exploration or prototyping mode.
+ * </ul>
+ */
@Override
protected AuthenticationManagerStandard createAuthenticationManagerStandard() {
- return new AuthenticationManagerStandardForDfltRuntime(getConfiguration());
+ final IsisConfiguration configuration = getConfiguration();
+
+ final AuthenticationManagerStandard authenticationManager = new AuthenticationManagerStandard(configuration);
+
+ // we add to start to ensure that these special case authenticators are always consulted first
+ authenticationManager.addAuthenticatorToStart(new ExplorationAuthenticator(configuration));
+ authenticationManager.addAuthenticatorToStart(new LogonFixtureAuthenticator(configuration));
+
+ return authenticationManager;
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticatorAbstractForDfltRuntime.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticatorAbstractForDfltRuntime.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticatorAbstractForDfltRuntime.java
deleted file mode 100644
index 40e8b2c..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticatorAbstractForDfltRuntime.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.authentication;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.authentication.standard.AuthenticatorAbstract;
-import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.SystemConstants;
-
-public abstract class AuthenticatorAbstractForDfltRuntime extends AuthenticatorAbstract {
-
- public AuthenticatorAbstractForDfltRuntime(final IsisConfiguration configuration) {
- super(configuration);
- }
-
- // //////////////////////////////////////////////////////
- // Helpers
- // //////////////////////////////////////////////////////
-
- /**
- * Helper method for convenience of implementations that depend on the
- * {@link DeploymentType}.
- */
- public DeploymentType getDeploymentType() {
- final String deploymentTypeStr = getConfiguration().getString(SystemConstants.DEPLOYMENT_TYPE_KEY);
- if (deploymentTypeStr == null) {
- throw new IllegalStateException("Expect value for '" + SystemConstants.DEPLOYMENT_TYPE_KEY + "' to be bound into IsisConfiguration");
- }
- return DeploymentType.lookup(deploymentTypeStr);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/exploration/AuthenticationRequestExploration.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/exploration/AuthenticationRequestExploration.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/exploration/AuthenticationRequestExploration.java
deleted file mode 100644
index 21ff2ea..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/exploration/AuthenticationRequestExploration.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.authentication.exploration;
-
-import java.util.List;
-
-import org.apache.isis.applib.fixtures.LogonFixture;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequestAbstract;
-
-/**
- * For testing purposes, requests corresponding to an {@link ExplorationSession}
- * .
- */
-public class AuthenticationRequestExploration extends AuthenticationRequestAbstract {
-
- private static final String EXPLORATION_USER = "exploration";
-
- private final LogonFixture logonFixture;
-
- public AuthenticationRequestExploration() {
- this(null);
- }
-
- public AuthenticationRequestExploration(final LogonFixture logonFixture) {
- super(logonFixture != null ? logonFixture.getUsername() : EXPLORATION_USER);
- this.logonFixture = logonFixture;
- }
-
- @Override
- public List<String> getRoles() {
- return logonFixture != null ? logonFixture.getRoles() : super.getRoles();
- }
-
- public boolean isDefaultUser() {
- return EXPLORATION_USER.equals(getName());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticator.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticator.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticator.java
deleted file mode 100644
index 32b65c5..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticator.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * 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.authentication.exploration;
-
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.core.runtime.authentication.AuthenticatorAbstractForDfltRuntime;
-import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
-import org.apache.isis.core.runtime.system.DeploymentType;
-
-/**
- * Creates a session suitable for {@link DeploymentType#SERVER_EXPLORATION exploration}
- * mode.
- *
- * <p>
- * The format of the {@value ExplorationAuthenticatorConstants#USERS} key should
- * be:
- *
- * <pre>
- * <:userName> [:<role>[|<role>]...], <userName>...
- * </pre>
- */
-public class ExplorationAuthenticator extends AuthenticatorAbstractForDfltRuntime {
-
- private final Set<SimpleSession> registeredSessions = new LinkedHashSet<SimpleSession>();;
- private final String users;
-
- // //////////////////////////////////////////////////////////////////
- // Constructor
- // //////////////////////////////////////////////////////////////////
-
- public ExplorationAuthenticator(final IsisConfiguration configuration) {
- super(configuration);
- users = getConfiguration().getString(ExplorationAuthenticatorConstants.USERS);
- if (users != null) {
- registeredSessions.addAll(parseUsers(users));
- }
- }
-
- private List<SimpleSession> parseUsers(final String users) {
- final List<SimpleSession> registeredUsers = new ArrayList<SimpleSession>();
-
- final StringTokenizer st = new StringTokenizer(users, ",");
- while (st.hasMoreTokens()) {
- final String token = st.nextToken();
- final int end = token.indexOf(':');
- final List<String> roles = new ArrayList<String>();
- final String userName;
- if (end == -1) {
- userName = token.trim();
- } else {
- userName = token.substring(0, end).trim();
- final String roleList = token.substring(end + 1);
- final StringTokenizer st2 = new StringTokenizer(roleList, "|");
- while (st2.hasMoreTokens()) {
- final String role = st2.nextToken().trim();
- roles.add(role);
- }
- }
- registeredUsers.add(createSimpleSession(userName, roles));
- }
- return registeredUsers;
- }
-
- private SimpleSession createSimpleSession(final String userName, final List<String> roles) {
- return new SimpleSession(userName, roles.toArray(new String[roles.size()]));
- }
-
- // //////////////////////////////////////////////////////////////////
- // API
- // //////////////////////////////////////////////////////////////////
-
- /**
- * Can authenticate if a {@link AuthenticationRequestExploration}.
- */
- @Override
- public final boolean canAuthenticate(final Class<? extends AuthenticationRequest> authenticationRequestClass) {
- return AuthenticationRequestExploration.class.isAssignableFrom(authenticationRequestClass);
- }
-
- /**
- * Valid providing running in {@link DeploymentType#isExploring()
- * exploration} mode.
- */
- @Override
- protected final boolean isValid(final AuthenticationRequest request) {
- return getDeploymentType().isExploring();
- }
-
- @Override
- public AuthenticationSession authenticate(final AuthenticationRequest request, final String code) {
- final AuthenticationRequestExploration authenticationRequestExploration = (AuthenticationRequestExploration) request;
- if (!authenticationRequestExploration.isDefaultUser()) {
- registeredSessions.add(createSimpleSession(authenticationRequestExploration.getName(), authenticationRequestExploration.getRoles()));
- }
- if (registeredSessions.size() >= 1) {
- return registeredSessions.iterator().next();
- } else {
- return new ExplorationSession(code);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticatorConstants.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticatorConstants.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticatorConstants.java
deleted file mode 100644
index 36c2c16..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationAuthenticatorConstants.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.authentication.exploration;
-
-import org.apache.isis.core.commons.config.ConfigurationConstants;
-
-public final class ExplorationAuthenticatorConstants {
-
- public static final String USERS = ConfigurationConstants.ROOT + "exploration.users";
-
- private ExplorationAuthenticatorConstants() {
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationSession.java
deleted file mode 100644
index 144a2b2..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/exploration/ExplorationSession.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.authentication.exploration;
-
-import java.io.IOException;
-
-import org.apache.isis.core.commons.authentication.AuthenticationSessionAbstract;
-import org.apache.isis.core.commons.encoding.DataInputExtended;
-import org.apache.isis.core.commons.encoding.DataOutputExtended;
-import org.apache.isis.core.commons.encoding.Encodable;
-
-public final class ExplorationSession extends AuthenticationSessionAbstract implements Encodable {
-
- private static final long serialVersionUID = 1L;
-
- private static final String DEFAULT_USER_NAME = "exploration";
-
- /**
- * Defaults validation code to <tt>""</tt>.
- */
- public ExplorationSession() {
- this("");
- }
-
- public ExplorationSession(final String code) {
- super(DEFAULT_USER_NAME, code);
- initialized();
- }
-
- public ExplorationSession(final DataInputExtended input) throws IOException {
- super(input);
- initialized();
- }
-
- @Override
- public void encode(final DataOutputExtended output) throws IOException {
- super.encode(output);
- }
-
- private void initialized() {
- // nothing to do
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticator.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticator.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticator.java
deleted file mode 100644
index 9889bce..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/fixture/LogonFixtureAuthenticator.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.authentication.fixture;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.core.runtime.authentication.AuthenticatorAbstractForDfltRuntime;
-import org.apache.isis.core.runtime.authentication.standard.Authenticator;
-import org.apache.isis.core.runtime.fixtures.authentication.AuthenticationRequestLogonFixture;
-import org.apache.isis.core.runtime.system.DeploymentType;
-
-public class LogonFixtureAuthenticator extends AuthenticatorAbstractForDfltRuntime {
-
- public LogonFixtureAuthenticator(final IsisConfiguration configuration) {
- super(configuration);
- }
-
- /**
- * Can authenticate if a {@link AuthenticationRequestLogonFixture}.
- */
- @Override
- public final boolean canAuthenticate(final Class<? extends AuthenticationRequest> authenticationRequestClass) {
- return AuthenticationRequestLogonFixture.class.isAssignableFrom(authenticationRequestClass);
- }
-
- /**
- * Valid providing running in {@link DeploymentType#isExploring()
- * exploration} or {@link DeploymentType#isPrototyping() prototyping} mode.
- */
- @Override
- protected final boolean isValid(final AuthenticationRequest request) {
- final DeploymentType deploymentType = getDeploymentType();
- return deploymentType.isExploring() || deploymentType.isPrototyping();
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/authentication/AuthenticationRequestLogonFixture.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/authentication/AuthenticationRequestLogonFixture.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/authentication/AuthenticationRequestLogonFixture.java
deleted file mode 100644
index c3f52cc..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/authentication/AuthenticationRequestLogonFixture.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.fixtures.authentication;
-
-import java.util.List;
-
-import org.apache.isis.applib.fixtures.LogonFixture;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequestAbstract;
-import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandard;
-
-/**
- * For testing purposes, request corresponding to a {@link LogonFixture}.
- *
- * <p>
- * Understood directly by {@link AuthenticationManagerStandard}.
- */
-public class AuthenticationRequestLogonFixture extends AuthenticationRequestAbstract {
-
- public AuthenticationRequestLogonFixture(final LogonFixture logonFixture) {
- this(logonFixture.getUsername(), logonFixture.getRoles());
- }
-
- public AuthenticationRequestLogonFixture(final String name, final List<String> roles) {
- super(name);
- setRoles(roles);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/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
index 3bcdcdf..b675988 100644
--- 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
@@ -178,8 +178,8 @@ public class IsisSessionFactoryBuilder {
// remaining functionality only done if metamodel is valid.
- authenticationManager.init();
- authorizationManager.init();
+ authenticationManager.init(deploymentCategory);
+ authorizationManager.init(deploymentCategory);
persistenceSessionFactory.init(specificationLoader);
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstractForDfltRuntimeTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstractForDfltRuntimeTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstractForDfltRuntimeTest.java
deleted file mode 100644
index aed6454..0000000
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorAbstractForDfltRuntimeTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * 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.authentication.standard;
-
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.core.runtime.authentication.AuthenticatorAbstractForDfltRuntime;
-import org.apache.isis.core.runtime.system.DeploymentType;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-@RunWith(JMock.class)
-public class AuthenticatorAbstractForDfltRuntimeTest {
-
- private final Mockery mockery = new JUnit4Mockery();
-
- private IsisConfiguration mockConfiguration;
- private AuthenticatorAbstractForDfltRuntime authenticator;
-
- @Before
- public void setUp() {
- mockConfiguration = mockery.mock(IsisConfiguration.class);
-
- authenticator = new AuthenticatorAbstractForDfltRuntime(mockConfiguration) {
-
- @Override
- public boolean isValid(final AuthenticationRequest request) {
- return false;
- }
-
- @Override
- public boolean canAuthenticate(final Class<? extends AuthenticationRequest> authenticationRequestClass) {
- return false;
- }
- };
- }
-
- @Test
- public void getConfiguration() throws Exception {
- assertThat(authenticator.getConfiguration(), is(mockConfiguration));
- }
-
- @Test
- public void getDeploymentTypeForExploration() throws Exception {
- final DeploymentType deploymentType = DeploymentType.SERVER_EXPLORATION;
- mockery.checking(new Expectations() {
- {
- allowing(mockConfiguration).getString("isis.deploymentType");
- will(returnValue(deploymentType.name()));
- }
- });
- assertThat(authenticator.getDeploymentType(), is(deploymentType));
- }
-
- @Test
- public void getDeploymentTypeForPrototype() throws Exception {
- final DeploymentType deploymentType = DeploymentType.SERVER_PROTOTYPE;
- mockery.checking(new Expectations() {
- {
- allowing(mockConfiguration).getString("isis.deploymentType");
- will(returnValue(deploymentType.name()));
- }
- });
- assertThat(authenticator.getDeploymentType(), is(deploymentType));
- }
-
- @Test
- public void getDeploymentTypeForServer() throws Exception {
- final DeploymentType deploymentType = DeploymentType.SERVER;
- mockery.checking(new Expectations() {
- {
- allowing(mockConfiguration).getString("isis.deploymentType");
- will(returnValue(deploymentType.name()));
- }
- });
- assertThat(authenticator.getDeploymentType(), is(deploymentType));
- }
-
- @Test(expected = IllegalStateException.class)
- public void expectsThereToBeADeploymentTypeInIsisConfiguration() throws Exception {
- mockery.checking(new Expectations() {
- {
- allowing(mockConfiguration).getString("isis.deploymentType");
- will(returnValue(null));
- }
- });
- authenticator.getDeploymentType();
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void expectsThereToBeAValidDeploymentTypeInIsisConfiguration() throws Exception {
- mockery.checking(new Expectations() {
- {
- allowing(mockConfiguration).getString("isis.deploymentType");
- will(returnValue("GARBAGE"));
- }
- });
- authenticator.getDeploymentType();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorDefaultTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorDefaultTest.java
new file mode 100644
index 0000000..4f5b2ac
--- /dev/null
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/authentication/standard/AuthenticatorDefaultTest.java
@@ -0,0 +1,76 @@
+/*
+ * 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.authentication.standard;
+
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.core.runtime.system.DeploymentType;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+@RunWith(JMock.class)
+public class AuthenticatorDefaultTest {
+
+ private final Mockery mockery = new JUnit4Mockery();
+
+ private IsisConfiguration mockConfiguration;
+ private AuthenticatorAbstract authenticator;
+
+ @Before
+ public void setUp() {
+ mockConfiguration = mockery.mock(IsisConfiguration.class);
+
+ authenticator = new AuthenticatorAbstract(mockConfiguration) {
+
+ @Override
+ public boolean isValid(final AuthenticationRequest request) {
+ return false;
+ }
+
+ @Override
+ public boolean canAuthenticate(final Class<? extends AuthenticationRequest> authenticationRequestClass) {
+ return false;
+ }
+ };
+ }
+
+ @Test
+ public void getConfiguration() throws Exception {
+ assertThat(authenticator.getConfiguration(), is(mockConfiguration));
+ }
+
+ @Test
+ public void getDeploymentCategory() throws Exception {
+ final DeploymentCategory deploymentCategory = DeploymentType.SERVER_EXPLORATION.getDeploymentCategory();
+ authenticator.init(deploymentCategory);
+ assertThat(authenticator.getDeploymentCategory(), is(deploymentCategory));
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
----------------------------------------------------------------------
diff --git a/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java b/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
index 6896d63..68ab0e4 100644
--- a/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
+++ b/core/security-shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
@@ -45,6 +45,7 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
@@ -69,6 +70,7 @@ public class ShiroAuthenticatorOrAuthorizor implements Authenticator, Authorizor
//region > constructor and fields
private final IsisConfiguration configuration;
+ private DeploymentCategory deploymentCategory;
public ShiroAuthenticatorOrAuthorizor(final IsisConfiguration configuration) {
this.configuration = configuration;
@@ -83,13 +85,20 @@ public class ShiroAuthenticatorOrAuthorizor implements Authenticator, Authorizor
//region > init, shutdown
@Override
- public void init() {
+ public void init(final DeploymentCategory deploymentCategory) {
+ this.deploymentCategory = deploymentCategory;
}
@Override
public void shutdown() {
}
+
+ @Override
+ public DeploymentCategory getDeploymentCategory() {
+ return deploymentCategory;
+ }
+
//endregion
//region > Authenticator API
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
----------------------------------------------------------------------
diff --git a/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
index 00d6d28..722b2a7 100644
--- a/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
+++ b/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
@@ -18,18 +18,6 @@
*/
package org.apache.isis.security.shiro;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.config.IniSecurityManagerFactory;
import org.apache.shiro.mgt.SecurityManager;
@@ -41,6 +29,20 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
public class ShiroAuthenticatorOrAuthorizorTest_authenticate {
@Rule
@@ -54,7 +56,7 @@ public class ShiroAuthenticatorOrAuthorizorTest_authenticate {
@Before
public void setUp() throws Exception {
authOrAuth = new ShiroAuthenticatorOrAuthorizor(mockConfiguration);
- authOrAuth.init();
+ authOrAuth.init(DeploymentCategory.PRODUCTION);
}
@After
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
----------------------------------------------------------------------
diff --git a/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index 37035f4..ae8d414 100644
--- a/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/core/security-shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -18,15 +18,6 @@
*/
package org.apache.isis.security.shiro;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.config.IniSecurityManagerFactory;
import org.apache.shiro.mgt.SecurityManager;
@@ -38,6 +29,17 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole {
@Rule
@@ -51,7 +53,7 @@ public class ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole {
@Before
public void setUp() throws Exception {
authOrAuth = new ShiroAuthenticatorOrAuthorizor(mockConfiguration);
- authOrAuth.init();
+ authOrAuth.init(DeploymentCategory.PRODUCTION);
}
@After
[28/50] [abbrv] isis git commit: ISIS-1427: reinstating
IsisSystemForTest#setUpSystem to avoid too many unnecessary breakages.
Posted by da...@apache.org.
ISIS-1427: reinstating IsisSystemForTest#setUpSystem to avoid too many unnecessary breakages.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c88f44ff
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c88f44ff
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c88f44ff
Branch: refs/heads/master
Commit: c88f44ffd33c7c38917969a198b26c02224be13f
Parents: 95c3ecc
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jun 10 17:42:16 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jun 10 17:42:16 2016 +0100
----------------------------------------------------------------------
.../org/apache/isis/core/integtestsupport/IsisSystemForTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c88f44ff/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 6df861a..b6a677e 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
@@ -269,6 +269,10 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
// populated at #setupSystem
private IsisComponentProvider componentProvider;
+ public IsisSystemForTest setUpSystem() throws RuntimeException {
+ return initIfRequiredThenOpenSession();
+ }
+
/**
* Intended to be called from a test's {@link Before} method.
*/
[26/50] [abbrv] isis git commit: ISIS-1427: completes rationalization
for minimizing calls to IsisContext#getIsisSessionFactory static.
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java
index 7f1d886..9eeddd9 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java
@@ -21,24 +21,22 @@ package org.apache.isis.viewer.wicket.model.mementos;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.runtime.system.context.IsisContext;
public final class SpecUtils {
private SpecUtils(){}
- public static ObjectSpecification getSpecificationFor(ObjectSpecId objectSpecId) {
- ObjectSpecification objectSpec = getSpecificationLoader().lookupBySpecId(objectSpecId);
+ public static ObjectSpecification getSpecificationFor(
+ final ObjectSpecId objectSpecId,
+ final SpecificationLoader specificationLoader) {
+ ObjectSpecification objectSpec = specificationLoader.lookupBySpecId(objectSpecId);
if(objectSpec != null) {
return objectSpec;
}
// attempt to load directly.
- return getSpecificationLoader().loadSpecification(objectSpecId.asString());
+ return specificationLoader.loadSpecification(objectSpecId.asString());
}
- protected static SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSessionFactory().getSpecificationLoader();
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index df59ea9..2188b70 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -66,7 +66,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
import org.apache.isis.viewer.wicket.model.mementos.ActionMemento;
import org.apache.isis.viewer.wicket.model.mementos.ActionParameterMemento;
@@ -79,11 +79,12 @@ import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
* {@link Mode#RESULTS results} once invoked.
*/
public class ActionModel extends BookmarkableModel<ObjectAdapter> {
-
+
private static final long serialVersionUID = 1L;
private static final String NULL_ARG = "$nullArg$";
private static final Pattern KEY_VALUE_PATTERN = Pattern.compile("([^=]+)=(.+)");
+ public static final OidMarshaller OID_MARSHALLER = new OidMarshaller();
/**
* Whether we are obtaining arguments (eg in a dialog), or displaying the
@@ -95,11 +96,16 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
}
-
+ public ActionModel copy() {
+ return new ActionModel(this);
+ }
+
+
//////////////////////////////////////////////////
// Factory methods
//////////////////////////////////////////////////
+
/**
* @param objectAdapter
* @param action
@@ -112,23 +118,25 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
return new ActionModel(serviceMemento, homePageActionMemento, mode);
}
- public static ActionModel createForPersistent(final PageParameters pageParameters) {
- return new ActionModel(pageParameters);
+ public static ActionModel createForPersistent(
+ final PageParameters pageParameters,
+ final SpecificationLoader specificationLoader) {
+ return new ActionModel(pageParameters, specificationLoader);
}
/**
* Factory method for creating {@link PageParameters}.
*
- * see {@link #ActionModel(PageParameters)}
+ * see {@link #ActionModel(PageParameters, SpecificationLoader)}
*/
public static PageParameters createPageParameters(
final ObjectAdapter adapter, final ObjectAction objectAction, final ConcurrencyChecking concurrencyChecking) {
final PageParameters pageParameters = PageParametersUtils.newPageParameters();
-
+
final String oidStr = concurrencyChecking == ConcurrencyChecking.CHECK?
- adapter.getOid().enString(getOidMarshaller()):
- adapter.getOid().enStringNoVersion(getOidMarshaller());
+ adapter.getOid().enString(OID_MARSHALLER):
+ adapter.getOid().enStringNoVersion(OID_MARSHALLER);
PageParameterNames.OBJECT_OID.addStringTo(pageParameters, oidStr);
final ActionType actionType = objectAction.getType();
@@ -192,7 +200,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
public PageParameters getPageParameters() {
final ObjectAdapter adapter = getTargetAdapter();
- final ObjectAction objectAction = getActionMemento().getAction();
+ final ObjectAction objectAction = getActionMemento().getAction(getSpecificationLoader());
final PageParameters pageParameters = createPageParameters(
adapter, objectAction, ConcurrencyChecking.NO_CHECK);
@@ -209,7 +217,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
@Override
public String getTitle() {
final ObjectAdapter adapter = getTargetAdapter();
- final ObjectAction objectAction = getActionMemento().getAction();
+ final ObjectAction objectAction = getActionMemento().getAction(getSpecificationLoader());
final StringBuilder buf = new StringBuilder();
final ObjectAdapter[] argumentsAsArray = getArgumentsAsArray();
@@ -266,23 +274,28 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
private final Map<Integer, ScalarModel> arguments = Maps.newHashMap();
- private ActionModel(final PageParameters pageParameters) {
- this(newObjectAdapterMementoFrom(pageParameters), newActionMementoFrom(pageParameters), actionModeFrom(pageParameters));
+ private ActionModel(final PageParameters pageParameters, final SpecificationLoader specificationLoader) {
+ this(newObjectAdapterMementoFrom(pageParameters), newActionMementoFrom(pageParameters, specificationLoader), actionModeFrom(pageParameters,
+ specificationLoader));
setArgumentsIfPossible(pageParameters);
setContextArgumentIfPossible(pageParameters);
}
- private static ActionMemento newActionMementoFrom(final PageParameters pageParameters) {
+ private static ActionMemento newActionMementoFrom(
+ final PageParameters pageParameters,
+ final SpecificationLoader specificationLoader) {
final ObjectSpecId owningSpec = ObjectSpecId.of(PageParameterNames.ACTION_OWNING_SPEC.getStringFrom(pageParameters));
final ActionType actionType = PageParameterNames.ACTION_TYPE.getEnumFrom(pageParameters, ActionType.class);
final String actionNameParms = PageParameterNames.ACTION_ID.getStringFrom(pageParameters);
- return new ActionMemento(owningSpec, actionType, actionNameParms);
+ return new ActionMemento(owningSpec, actionType, actionNameParms, specificationLoader);
}
- private static Mode actionModeFrom(final PageParameters pageParameters) {
- final ActionMemento actionMemento = newActionMementoFrom(pageParameters);
- if(actionMemento.getAction().getParameterCount() == 0) {
+ private static Mode actionModeFrom(
+ final PageParameters pageParameters,
+ final SpecificationLoader specificationLoader) {
+ final ActionMemento actionMemento = newActionMementoFrom(pageParameters, specificationLoader);
+ if(actionMemento.getAction(specificationLoader).getParameterCount() == 0) {
return Mode.RESULTS;
}
final List<String> listFrom = PageParameterNames.ACTION_ARGS.getListFrom(pageParameters);
@@ -301,7 +314,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
private static RootOid oidFor(final PageParameters pageParameters) {
final String oidStr = PageParameterNames.OBJECT_OID.getStringFrom(pageParameters);
- return getOidMarshaller().unmarshal(oidStr, RootOid.class);
+ return OID_MARSHALLER.unmarshal(oidStr, RootOid.class);
}
@@ -329,10 +342,11 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
this.executingPanel = actionModel.executingPanel;
}
- private void setArgumentsIfPossible(final PageParameters pageParameters) {
+ private void setArgumentsIfPossible(
+ final PageParameters pageParameters) {
final List<String> args = PageParameterNames.ACTION_ARGS.getListFrom(pageParameters);
- final ObjectAction action = actionMemento.getAction();
+ final ObjectAction action = actionMemento.getAction(getSpecificationLoader());
final List<ObjectSpecification> parameterTypes = action.getParameterTypes();
for (int paramNum = 0; paramNum < args.size(); paramNum++) {
@@ -351,7 +365,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
return false;
}
- final ObjectAction action = actionMemento.getAction();
+ final ObjectAction action = actionMemento.getAction(getSpecificationLoader());
final List<ObjectSpecification> parameterTypes = action.getParameterTypes();
final int parameterCount = parameterTypes.size();
@@ -383,8 +397,8 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
final EncodableFacet encodeable = objSpec.getFacet(EncodableFacet.class);
return encodeable.toEncodedString(adapter);
}
-
- return adapter.getOid().enStringNoVersion(getOidMarshaller());
+
+ return adapter.getOid().enStringNoVersion(OID_MARSHALLER);
}
private ObjectAdapter decodeArg(final ObjectSpecification objSpec, final String encoded) {
@@ -398,7 +412,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
}
try {
- final RootOid oid = RootOid.deStringEncoded(encoded, getOidMarshaller());
+ final RootOid oid = RootOid.deStringEncoded(encoded, OID_MARSHALLER);
return getPersistenceSession().adapterFor(oid);
} catch (final Exception e) {
return null;
@@ -406,7 +420,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
}
private void setArgument(final int paramNum, final ObjectAdapter argumentAdapter) {
- final ObjectAction action = actionMemento.getAction();
+ final ObjectAction action = actionMemento.getAction(getSpecificationLoader());
final ObjectActionParameter actionParam = action.getParameters().get(paramNum);
final ActionParameterMemento apm = new ActionParameterMemento(actionParam);
final ScalarModel argumentModel = getArgumentModel(apm);
@@ -426,7 +440,8 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
}
public ObjectAdapter getTargetAdapter() {
- return targetAdapterMemento.getObjectAdapter(getConcurrencyChecking());
+ return targetAdapterMemento.getObjectAdapter(getConcurrencyChecking(), getPersistenceSession(),
+ getSpecificationLoader());
}
protected ConcurrencyChecking getConcurrencyChecking() {
@@ -461,7 +476,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
final ObjectAdapter targetAdapter = getTargetAdapter();
final ObjectAdapter[] arguments = getArgumentsAsArray();
- final ObjectAction action = getActionMemento().getAction();
+ final ObjectAction action = getActionMemento().getAction(getSpecificationLoader());
// if this action is a mixin, then it will fill in the details automatically.
final ObjectAdapter mixedInAdapter = null;
@@ -487,7 +502,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
public String getReasonInvalidIfAny() {
final ObjectAdapter targetAdapter = getTargetAdapter();
final ObjectAdapter[] proposedArguments = getArgumentsAsArray();
- final ObjectAction objectAction = getActionMemento().getAction();
+ final ObjectAction objectAction = getActionMemento().getAction(getSpecificationLoader());
final Consent validity = objectAction.isProposedArgumentSetValid(targetAdapter, proposedArguments,
InteractionInitiatedBy.USER);
return validity.isAllowed() ? null : validity.getReason();
@@ -499,11 +514,11 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
}
public ObjectAdapter[] getArgumentsAsArray() {
- if(this.arguments.size() < this.getActionMemento().getAction().getParameterCount()) {
+ if(this.arguments.size() < this.getActionMemento().getAction(getSpecificationLoader()).getParameterCount()) {
primeArgumentModels();
}
- final ObjectAction objectAction = getActionMemento().getAction();
+ final ObjectAction objectAction = getActionMemento().getAction(getSpecificationLoader());
final ObjectAdapter[] arguments = new ObjectAdapter[objectAction.getParameterCount()];
for (int i = 0; i < arguments.length; i++) {
final ScalarModel scalarModel = this.arguments.get(i);
@@ -513,14 +528,14 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
}
public void reset() {
- this.actionMode = determineMode(actionMemento.getAction());
+ this.actionMode = determineMode(actionMemento.getAction(getSpecificationLoader()));
}
public void clearArguments() {
for (final ScalarModel argumentModel : arguments.values()) {
argumentModel.reset();
}
- this.actionMode = determineMode(actionMemento.getAction());
+ this.actionMode = determineMode(actionMemento.getAction(getSpecificationLoader()));
}
/**
@@ -528,7 +543,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
* of {@link BookmarkPolicy#AS_ROOT root}, and has safe {@link ObjectAction#getSemantics() semantics}.
*/
public boolean isBookmarkable() {
- final ObjectAction action = getActionMemento().getAction();
+ final ObjectAction action = getActionMemento().getAction(getSpecificationLoader());
final BookmarkPolicyFacet bookmarkPolicy = action.getFacet(BookmarkPolicyFacet.class);
final boolean safeSemantics = action.getSemantics().isSafeInNature();
return bookmarkPolicy.value() == BookmarkPolicy.AS_ROOT && safeSemantics;
@@ -639,7 +654,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
// //////////////////////////////////////
public List<ActionParameterMemento> primeArgumentModels() {
- final ObjectAction objectAction = getActionMemento().getAction();
+ final ObjectAction objectAction = getActionMemento().getAction(getSpecificationLoader());
final List<ObjectActionParameter> parameters = objectAction.getParameters();
final List<ActionParameterMemento> mementos = buildParameterMementos(parameters);
@@ -679,17 +694,10 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
//////////////////////////////////////////////////
// Dependencies (from context)
//////////////////////////////////////////////////
-
- private static OidMarshaller getOidMarshaller() {
- return IsisContext.getSessionFactory().getOidMarshaller();
- }
- public ActionModel copy() {
- return new ActionModel(this);
- }
- protected ServicesInjector getServicesInjector() {
- return getPersistenceSession().getServicesInjector();
+ ServicesInjector getServicesInjector() {
+ return getIsisSessionFactory().getServicesInjector();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
index 6cb0305..c1479d6 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
@@ -24,11 +24,15 @@ import java.util.Comparator;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
final class BookmarkTreeNodeComparator implements Comparator<BookmarkTreeNode> {
+ private final SpecificationLoader specificationLoader;
+
+ public BookmarkTreeNodeComparator(final SpecificationLoader specificationLoader){
+ this.specificationLoader = specificationLoader;
+ }
+
@Override
public int compare(BookmarkTreeNode o1, BookmarkTreeNode o2) {
@@ -60,20 +64,7 @@ final class BookmarkTreeNodeComparator implements Comparator<BookmarkTreeNode> {
private String classNameOf(RootOid oid) {
ObjectSpecId objectSpecId = oid.getObjectSpecId();
- return getSpecificationLoader().lookupBySpecId(objectSpecId).getIdentifier().getClassName();
- }
-
-
- //////////////////////////////////////////////////
- // Dependencies (from context)
- //////////////////////////////////////////////////
-
- protected SpecificationLoader getSpecificationLoader() {
- return getSessionFactory().getSpecificationLoader();
- }
-
- IsisSessionFactory getSessionFactory() {
- return IsisContext.getSessionFactory();
+ return specificationLoader.lookupBySpecId(objectSpecId).getIdentifier().getClassName();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
index 77874ef..af9aff2 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
@@ -22,12 +22,14 @@ package org.apache.isis.viewer.wicket.model.models;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
+
import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.core.runtime.system.context.IsisContext;
public class BookmarkedPagesModel extends ModelAbstract<List<? extends BookmarkTreeNode>> {
@@ -35,15 +37,13 @@ public class BookmarkedPagesModel extends ModelAbstract<List<? extends BookmarkT
private static final long serialVersionUID = 1L;
- private static final BookmarkTreeNodeComparator COMPARATOR = new BookmarkTreeNodeComparator();
-
private static final String MAX_SIZE_KEY = "isis.viewer.wicket.bookmarkedPages.maxSize";
private static final int MAX_SIZE_DEFAULT_VALUE = 15;
private final List<BookmarkTreeNode> rootNodes = Lists.newArrayList();
private transient PageParameters current;
-
+
public void bookmarkPage(final BookmarkableModel<?> bookmarkableModel) {
// hack: remove any garbage that might've got stored in 'rootNodes'
@@ -92,7 +92,7 @@ public class BookmarkedPagesModel extends ModelAbstract<List<? extends BookmarkT
List<BookmarkTreeNode> depthFirstGraph = Lists.newArrayList();
List<BookmarkTreeNode> sortedNodes = Lists.newArrayList(rootNodes);
- Collections.sort(sortedNodes, COMPARATOR);
+ Collections.sort(sortedNodes, new BookmarkTreeNodeComparator(getSpecificationLoader()));
for (BookmarkTreeNode rootNode : sortedNodes) {
rootNode.appendGraphTo(depthFirstGraph);
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index f46d7ef..2342b40 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -84,7 +84,8 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
return Lists.newArrayList(
Iterables.filter(
Iterables.transform(entityCollectionModel.mementoList,
- ObjectAdapterMemento.Functions.fromMemento(ConcurrencyChecking.NO_CHECK)),
+ ObjectAdapterMemento.Functions.fromMemento(ConcurrencyChecking.NO_CHECK,
+ entityCollectionModel.getPersistenceSession(), entityCollectionModel.getSpecificationLoader())),
Predicates.notNull()));
}
@@ -115,8 +116,10 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
@Override
List<ObjectAdapter> load(final EntityCollectionModel entityCollectionModel) {
final ObjectAdapter adapter = entityCollectionModel.getParentObjectAdapterMemento().getObjectAdapter(
- ConcurrencyChecking.NO_CHECK);
- final OneToManyAssociation collection = entityCollectionModel.collectionMemento.getCollection();
+ ConcurrencyChecking.NO_CHECK, entityCollectionModel.getPersistenceSession(),
+ entityCollectionModel.getSpecificationLoader());
+ final OneToManyAssociation collection = entityCollectionModel.collectionMemento.getCollection(
+ entityCollectionModel.getSpecificationLoader());
final ObjectAdapter collectionAsAdapter = collection.get(adapter, InteractionInitiatedBy.USER);
final List<Object> objectList = asIterable(collectionAsAdapter);
@@ -149,7 +152,7 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
@Override
public String getName(EntityCollectionModel model) {
- return model.getCollectionMemento().getName();
+ return model.getCollectionMemento().getName(model.getSpecificationLoader());
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
index 0497744..37cac0b 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
@@ -329,7 +329,8 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> implements UiH
return null;
}
- final ObjectAdapter objectAdapter = adapterMemento.getObjectAdapter(concurrencyChecking);
+ final ObjectAdapter objectAdapter =
+ adapterMemento.getObjectAdapter(concurrencyChecking, getPersistenceSession(), getSpecificationLoader());
return objectAdapter;
}
@@ -383,12 +384,12 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> implements UiH
* {@link #getObject() entity}.
*/
public void resetPropertyModels() {
- adapterMemento.resetVersion();
+ adapterMemento.resetVersion(getPersistenceSession(), getSpecificationLoader());
for (final PropertyMemento pm : propertyScalarModels.keySet()) {
final ScalarModel scalarModel = propertyScalarModels.get(pm);
final ObjectAdapter adapter = getObject();
final ObjectAdapter associatedAdapter =
- pm.getProperty().get(adapter, InteractionInitiatedBy.USER);
+ pm.getProperty(getSpecificationLoader()).get(adapter, InteractionInitiatedBy.USER);
scalarModel.setObject(associatedAdapter);
}
}
@@ -526,7 +527,10 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> implements UiH
private ObjectAdapter getPendingAdapter() {
final ObjectAdapterMemento memento = getObject();
- return memento != null ? memento.getObjectAdapter(ConcurrencyChecking.NO_CHECK) : null;
+ return memento != null
+ ? memento.getObjectAdapter(ConcurrencyChecking.NO_CHECK,
+ entityModel.getPersistenceSession(), entityModel.getSpecificationLoader())
+ : null;
}
public ObjectAdapter getPendingElseCurrentAdapter() {
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
index 924b444..f825988 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
@@ -52,7 +52,7 @@ public abstract class ModelAbstract<T> extends LoadableDetachableModel<T> {
return getCurrentSession().getAuthenticationSession();
}
- protected PersistenceSession getPersistenceSession() {
+ public PersistenceSession getPersistenceSession() {
return getCurrentSession().getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index f96919c..ac1df21 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -70,13 +70,13 @@ public class ScalarModel extends EntityModel implements LinksProvider {
PROPERTY {
@Override
public String getName(final ScalarModel scalarModel) {
- return scalarModel.getPropertyMemento().getProperty().getName();
+ return scalarModel.getPropertyMemento().getProperty(scalarModel.getSpecificationLoader()).getName();
}
@Override
public ObjectSpecification getScalarTypeSpec(final ScalarModel scalarModel) {
ObjectSpecId type = scalarModel.getPropertyMemento().getType();
- return SpecUtils.getSpecificationFor(type);
+ return SpecUtils.getSpecificationFor(type, scalarModel.getSpecificationLoader());
}
@Override
@@ -87,17 +87,16 @@ public class ScalarModel extends EntityModel implements LinksProvider {
@Override
public String getLongName(final ScalarModel scalarModel) {
ObjectSpecId objectSpecId = scalarModel.parentObjectAdapterMemento.getObjectSpecId();
- final String specShortName = SpecUtils.getSpecificationFor(objectSpecId).getShortIdentifier();
- return specShortName + "-" + scalarModel.getPropertyMemento().getProperty().getId();
+ final String specShortName = SpecUtils.getSpecificationFor(objectSpecId, scalarModel.getSpecificationLoader()).getShortIdentifier();
+ return specShortName + "-" + scalarModel.getPropertyMemento().getProperty(scalarModel.getSpecificationLoader()).getId();
}
@Override
public String disable(final ScalarModel scalarModel, final Where where) {
final ObjectAdapter parentAdapter = scalarModel.parentObjectAdapterMemento.getObjectAdapter(
- ConcurrencyChecking.CHECK);
- final OneToOneAssociation property = scalarModel.getPropertyMemento().getProperty();
+ ConcurrencyChecking.CHECK, scalarModel.getPersistenceSession(), scalarModel.getSpecificationLoader());
+ final OneToOneAssociation property = scalarModel.getPropertyMemento().getProperty(scalarModel.getSpecificationLoader());
try {
- final AuthenticationSession session = scalarModel.getAuthenticationSession();
final Consent usable = property.isUsable(parentAdapter, InteractionInitiatedBy.USER, where);
return usable.isAllowed() ? null : usable.getReason();
} catch (final Exception ex) {
@@ -107,13 +106,14 @@ public class ScalarModel extends EntityModel implements LinksProvider {
@Override
public String parseAndValidate(final ScalarModel scalarModel, final String proposedPojoAsStr) {
- final OneToOneAssociation property = scalarModel.getPropertyMemento().getProperty();
+ final OneToOneAssociation property = scalarModel.getPropertyMemento().getProperty(scalarModel.getSpecificationLoader());
ParseableFacet parseableFacet = property.getFacet(ParseableFacet.class);
if (parseableFacet == null) {
parseableFacet = property.getSpecification().getFacet(ParseableFacet.class);
}
try {
- final ObjectAdapter parentAdapter = scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK);
+ final ObjectAdapter parentAdapter = scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK,
+ scalarModel.getPersistenceSession(), scalarModel.getSpecificationLoader());
final ObjectAdapter currentValue = property.get(parentAdapter, InteractionInitiatedBy.USER);
final ObjectAdapter proposedAdapter =
parseableFacet.parseTextEntry(currentValue, proposedPojoAsStr, InteractionInitiatedBy.USER);
@@ -131,8 +131,9 @@ public class ScalarModel extends EntityModel implements LinksProvider {
@Override
public String validate(final ScalarModel scalarModel, final ObjectAdapter proposedAdapter) {
- final ObjectAdapter parentAdapter = scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK);
- final OneToOneAssociation property = scalarModel.getPropertyMemento().getProperty();
+ final ObjectAdapter parentAdapter = scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK,
+ scalarModel.getPersistenceSession(), scalarModel.getSpecificationLoader());
+ final OneToOneAssociation property = scalarModel.getPropertyMemento().getProperty(scalarModel.getSpecificationLoader());
try {
final Consent valid = property.isAssociationValid(parentAdapter, proposedAdapter,
InteractionInitiatedBy.USER);
@@ -144,20 +145,20 @@ public class ScalarModel extends EntityModel implements LinksProvider {
@Override
public boolean isRequired(final ScalarModel scalarModel) {
- final FacetHolder facetHolder = scalarModel.getPropertyMemento().getProperty();
+ final FacetHolder facetHolder = scalarModel.getPropertyMemento().getProperty(scalarModel.getSpecificationLoader());
return isRequired(facetHolder);
}
@Override
public <T extends Facet> T getFacet(final ScalarModel scalarModel, final Class<T> facetType) {
- final FacetHolder facetHolder = scalarModel.getPropertyMemento().getProperty();
+ final FacetHolder facetHolder = scalarModel.getPropertyMemento().getProperty(scalarModel.getSpecificationLoader());
return facetHolder.getFacet(facetType);
}
@Override
public boolean hasChoices(final ScalarModel scalarModel) {
final PropertyMemento propertyMemento = scalarModel.getPropertyMemento();
- final OneToOneAssociation property = propertyMemento.getProperty();
+ final OneToOneAssociation property = propertyMemento.getProperty(scalarModel.getSpecificationLoader());
return property.hasChoices();
}
@@ -168,9 +169,10 @@ public class ScalarModel extends EntityModel implements LinksProvider {
final AuthenticationSession authenticationSession,
final DeploymentCategory deploymentCategory) {
final PropertyMemento propertyMemento = scalarModel.getPropertyMemento();
- final OneToOneAssociation property = propertyMemento.getProperty();
+ final OneToOneAssociation property = propertyMemento.getProperty(scalarModel.getSpecificationLoader());
ObjectAdapter parentAdapter = scalarModel.parentObjectAdapterMemento
- .getObjectAdapter(ConcurrencyChecking.NO_CHECK);
+ .getObjectAdapter(ConcurrencyChecking.NO_CHECK, scalarModel.getPersistenceSession(),
+ scalarModel.getSpecificationLoader());
final ObjectAdapter[] choices = property.getChoices(
parentAdapter,
InteractionInitiatedBy.USER);
@@ -181,7 +183,7 @@ public class ScalarModel extends EntityModel implements LinksProvider {
@Override
public boolean hasAutoComplete(final ScalarModel scalarModel) {
final PropertyMemento propertyMemento = scalarModel.getPropertyMemento();
- final OneToOneAssociation property = propertyMemento.getProperty();
+ final OneToOneAssociation property = propertyMemento.getProperty(scalarModel.getSpecificationLoader());
return property.hasAutoComplete();
}
@@ -192,9 +194,10 @@ public class ScalarModel extends EntityModel implements LinksProvider {
final AuthenticationSession authenticationSession,
final DeploymentCategory deploymentCategory) {
final PropertyMemento propertyMemento = scalarModel.getPropertyMemento();
- final OneToOneAssociation property = propertyMemento.getProperty();
+ final OneToOneAssociation property = propertyMemento.getProperty(scalarModel.getSpecificationLoader());
final ObjectAdapter parentAdapter =
- scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK);
+ scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK,
+ scalarModel.getPersistenceSession(), scalarModel.getSpecificationLoader());
final ObjectAdapter[] choices =
property.getAutoComplete(
parentAdapter, searchArg,
@@ -207,7 +210,7 @@ public class ScalarModel extends EntityModel implements LinksProvider {
if (scalarModel.hasAutoComplete()) {
final PropertyMemento propertyMemento = scalarModel.getPropertyMemento();
- final OneToOneAssociation property = propertyMemento.getProperty();
+ final OneToOneAssociation property = propertyMemento.getProperty(scalarModel.getSpecificationLoader());
return property.getAutoCompleteMinLength();
} else {
return 0;
@@ -217,20 +220,21 @@ public class ScalarModel extends EntityModel implements LinksProvider {
@Override
public void resetVersion(ScalarModel scalarModel) {
- scalarModel.parentObjectAdapterMemento.resetVersion();
+ scalarModel.parentObjectAdapterMemento.resetVersion(scalarModel.getPersistenceSession(),
+ scalarModel.getSpecificationLoader());
}
@Override
public String getDescribedAs(final ScalarModel scalarModel) {
final PropertyMemento propertyMemento = scalarModel.getPropertyMemento();
- final OneToOneAssociation property = propertyMemento.getProperty();
+ final OneToOneAssociation property = propertyMemento.getProperty(scalarModel.getSpecificationLoader());
return property.getDescription();
}
@Override
public Integer getLength(ScalarModel scalarModel) {
final PropertyMemento propertyMemento = scalarModel.getPropertyMemento();
- final OneToOneAssociation property = propertyMemento.getProperty();
+ final OneToOneAssociation property = propertyMemento.getProperty(scalarModel.getSpecificationLoader());
final BigDecimalValueFacet facet = property.getFacet(BigDecimalValueFacet.class);
return facet != null? facet.getLength(): null;
}
@@ -238,7 +242,7 @@ public class ScalarModel extends EntityModel implements LinksProvider {
@Override
public Integer getScale(ScalarModel scalarModel) {
final PropertyMemento propertyMemento = scalarModel.getPropertyMemento();
- final OneToOneAssociation property = propertyMemento.getProperty();
+ final OneToOneAssociation property = propertyMemento.getProperty(scalarModel.getSpecificationLoader());
final BigDecimalValueFacet facet = property.getFacet(BigDecimalValueFacet.class);
return facet != null? facet.getScale(): null;
}
@@ -246,7 +250,7 @@ public class ScalarModel extends EntityModel implements LinksProvider {
@Override
public int getTypicalLength(ScalarModel scalarModel) {
final PropertyMemento propertyMemento = scalarModel.getPropertyMemento();
- final OneToOneAssociation property = propertyMemento.getProperty();
+ final OneToOneAssociation property = propertyMemento.getProperty(scalarModel.getSpecificationLoader());
final TypicalLengthFacet facet = property.getFacet(TypicalLengthFacet.class);
return facet != null? facet.value() : StringValueSemanticsProvider.TYPICAL_LENGTH;
}
@@ -258,9 +262,10 @@ public class ScalarModel extends EntityModel implements LinksProvider {
@Override
public void reset(ScalarModel scalarModel) {
- final OneToOneAssociation property = scalarModel.propertyMemento.getProperty();
+ final OneToOneAssociation property = scalarModel.propertyMemento.getProperty(scalarModel.getSpecificationLoader());
final ObjectAdapter parentAdapter =
- scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK);
+ scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK,
+ scalarModel.getPersistenceSession(), scalarModel.getSpecificationLoader());
final ObjectAdapter associatedAdapter =
property.get(parentAdapter, InteractionInitiatedBy.USER);
scalarModel.setObject(associatedAdapter);
@@ -269,12 +274,12 @@ public class ScalarModel extends EntityModel implements LinksProvider {
PARAMETER {
@Override
public String getName(final ScalarModel scalarModel) {
- return scalarModel.getParameterMemento().getActionParameter().getName();
+ return scalarModel.getParameterMemento().getActionParameter(scalarModel.getSpecificationLoader()).getName();
}
@Override
public ObjectSpecification getScalarTypeSpec(final ScalarModel scalarModel) {
- return scalarModel.getParameterMemento().getSpecification();
+ return scalarModel.getParameterMemento().getSpecification(scalarModel.getSpecificationLoader());
}
@Override
@@ -290,8 +295,8 @@ public class ScalarModel extends EntityModel implements LinksProvider {
return null;
}
ObjectSpecId objectSpecId = adapterMemento.getObjectSpecId();
- final String specShortName = SpecUtils.getSpecificationFor(objectSpecId).getShortIdentifier();
- final String parmId = scalarModel.getParameterMemento().getActionParameter().getIdentifier().toNameIdentityString();
+ final String specShortName = SpecUtils.getSpecificationFor(objectSpecId, scalarModel.getSpecificationLoader()).getShortIdentifier();
+ final String parmId = scalarModel.getParameterMemento().getActionParameter(scalarModel.getSpecificationLoader()).getIdentifier().toNameIdentityString();
return specShortName + "-" + parmId + "-" + scalarModel.getParameterMemento().getNumber();
}
@@ -303,9 +308,11 @@ public class ScalarModel extends EntityModel implements LinksProvider {
@Override
public String parseAndValidate(final ScalarModel scalarModel, final String proposedPojoAsStr) {
- final ObjectActionParameter parameter = scalarModel.getParameterMemento().getActionParameter();
+ final ObjectActionParameter parameter = scalarModel.getParameterMemento().getActionParameter(
+ scalarModel.getSpecificationLoader());
try {
- final ObjectAdapter parentAdapter = scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK);
+ final ObjectAdapter parentAdapter = scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK,
+ scalarModel.getPersistenceSession(), scalarModel.getSpecificationLoader());
final String invalidReasonIfAny = parameter.isValid(parentAdapter, proposedPojoAsStr,
InteractionInitiatedBy.USER
);
@@ -317,9 +324,11 @@ public class ScalarModel extends EntityModel implements LinksProvider {
@Override
public String validate(final ScalarModel scalarModel, final ObjectAdapter proposedAdapter) {
- final ObjectActionParameter parameter = scalarModel.getParameterMemento().getActionParameter();
+ final ObjectActionParameter parameter = scalarModel.getParameterMemento().getActionParameter(
+ scalarModel.getSpecificationLoader());
try {
- final ObjectAdapter parentAdapter = scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK);
+ final ObjectAdapter parentAdapter = scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK,
+ scalarModel.getPersistenceSession(), scalarModel.getSpecificationLoader());
final String invalidReasonIfAny = parameter.isValid(parentAdapter, proposedAdapter.getObject(),
InteractionInitiatedBy.USER
);
@@ -331,20 +340,22 @@ public class ScalarModel extends EntityModel implements LinksProvider {
@Override
public boolean isRequired(final ScalarModel scalarModel) {
- final FacetHolder facetHolder = scalarModel.getParameterMemento().getActionParameter();
+ final FacetHolder facetHolder = scalarModel.getParameterMemento().getActionParameter(
+ scalarModel.getSpecificationLoader());
return isRequired(facetHolder);
}
@Override
public <T extends Facet> T getFacet(final ScalarModel scalarModel, final Class<T> facetType) {
- final FacetHolder facetHolder = scalarModel.getParameterMemento().getActionParameter();
+ final FacetHolder facetHolder = scalarModel.getParameterMemento().getActionParameter(
+ scalarModel.getSpecificationLoader());
return facetHolder.getFacet(facetType);
}
@Override
public boolean hasChoices(final ScalarModel scalarModel) {
final ActionParameterMemento parameterMemento = scalarModel.getParameterMemento();
- final ObjectActionParameter actionParameter = parameterMemento.getActionParameter();
+ final ObjectActionParameter actionParameter = parameterMemento.getActionParameter(scalarModel.getSpecificationLoader());
return actionParameter.hasChoices();
}
@Override
@@ -354,9 +365,10 @@ public class ScalarModel extends EntityModel implements LinksProvider {
final AuthenticationSession authenticationSession,
final DeploymentCategory deploymentCategory) {
final ActionParameterMemento parameterMemento = scalarModel.getParameterMemento();
- final ObjectActionParameter actionParameter = parameterMemento.getActionParameter();
+ final ObjectActionParameter actionParameter = parameterMemento.getActionParameter(scalarModel.getSpecificationLoader());
final ObjectAdapter parentAdapter =
- scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK);
+ scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK,
+ scalarModel.getPersistenceSession(), scalarModel.getSpecificationLoader());
final ObjectAdapter[] choices =
actionParameter.getChoices(
parentAdapter, argumentsIfAvailable,
@@ -367,7 +379,7 @@ public class ScalarModel extends EntityModel implements LinksProvider {
@Override
public boolean hasAutoComplete(final ScalarModel scalarModel) {
final ActionParameterMemento parameterMemento = scalarModel.getParameterMemento();
- final ObjectActionParameter actionParameter = parameterMemento.getActionParameter();
+ final ObjectActionParameter actionParameter = parameterMemento.getActionParameter(scalarModel.getSpecificationLoader());
return actionParameter.hasAutoComplete();
}
@Override
@@ -377,10 +389,11 @@ public class ScalarModel extends EntityModel implements LinksProvider {
final AuthenticationSession authenticationSession,
final DeploymentCategory deploymentCategory) {
final ActionParameterMemento parameterMemento = scalarModel.getParameterMemento();
- final ObjectActionParameter actionParameter = parameterMemento.getActionParameter();
+ final ObjectActionParameter actionParameter = parameterMemento.getActionParameter(scalarModel.getSpecificationLoader());
final ObjectAdapter parentAdapter =
- scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK);
+ scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK,
+ scalarModel.getPersistenceSession(), scalarModel.getSpecificationLoader());
final ObjectAdapter[] choices = actionParameter.getAutoComplete(
parentAdapter, searchArg,
InteractionInitiatedBy.USER);
@@ -391,7 +404,8 @@ public class ScalarModel extends EntityModel implements LinksProvider {
public int getAutoCompleteOrChoicesMinLength(ScalarModel scalarModel) {
if (scalarModel.hasAutoComplete()) {
final ActionParameterMemento parameterMemento = scalarModel.getParameterMemento();
- final ObjectActionParameter actionParameter = parameterMemento.getActionParameter();
+ final ObjectActionParameter actionParameter = parameterMemento.getActionParameter(
+ scalarModel.getSpecificationLoader());
return actionParameter.getAutoCompleteMinLength();
} else {
return 0;
@@ -405,14 +419,14 @@ public class ScalarModel extends EntityModel implements LinksProvider {
@Override
public String getDescribedAs(final ScalarModel scalarModel) {
final ActionParameterMemento parameterMemento = scalarModel.getParameterMemento();
- final ObjectActionParameter actionParameter = parameterMemento.getActionParameter();
+ final ObjectActionParameter actionParameter = parameterMemento.getActionParameter(scalarModel.getSpecificationLoader());
return actionParameter.getDescription();
}
@Override
public Integer getLength(ScalarModel scalarModel) {
final ActionParameterMemento parameterMemento = scalarModel.getParameterMemento();
- final ObjectActionParameter actionParameter = parameterMemento.getActionParameter();
+ final ObjectActionParameter actionParameter = parameterMemento.getActionParameter(scalarModel.getSpecificationLoader());
final BigDecimalValueFacet facet = actionParameter.getFacet(BigDecimalValueFacet.class);
return facet != null? facet.getLength(): null;
}
@@ -420,7 +434,7 @@ public class ScalarModel extends EntityModel implements LinksProvider {
@Override
public Integer getScale(ScalarModel scalarModel) {
final ActionParameterMemento parameterMemento = scalarModel.getParameterMemento();
- final ObjectActionParameter actionParameter = parameterMemento.getActionParameter();
+ final ObjectActionParameter actionParameter = parameterMemento.getActionParameter(scalarModel.getSpecificationLoader());
final BigDecimalValueFacet facet = actionParameter.getFacet(BigDecimalValueFacet.class);
return facet != null? facet.getScale(): null;
}
@@ -428,7 +442,7 @@ public class ScalarModel extends EntityModel implements LinksProvider {
@Override
public int getTypicalLength(ScalarModel scalarModel) {
final ActionParameterMemento parameterMemento = scalarModel.getParameterMemento();
- final ObjectActionParameter actionParameter = parameterMemento.getActionParameter();
+ final ObjectActionParameter actionParameter = parameterMemento.getActionParameter(scalarModel.getSpecificationLoader());
final TypicalLengthFacet facet = actionParameter.getFacet(TypicalLengthFacet.class);
return facet != null? facet.value() : StringValueSemanticsProvider.TYPICAL_LENGTH;
}
@@ -440,9 +454,11 @@ public class ScalarModel extends EntityModel implements LinksProvider {
@Override
public void reset(ScalarModel scalarModel) {
- final ObjectActionParameter actionParameter = scalarModel.parameterMemento.getActionParameter();
+ final ObjectActionParameter actionParameter = scalarModel.parameterMemento.getActionParameter(
+ scalarModel.getSpecificationLoader());
final ObjectAdapter parentAdapter =
- scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK);
+ scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK,
+ scalarModel.getPersistenceSession(), scalarModel.getSpecificationLoader());
final ObjectAdapter defaultAdapter = actionParameter.getDefault(parentAdapter);
scalarModel.setObject(defaultAdapter);
}
@@ -565,8 +581,9 @@ public class ScalarModel extends EntityModel implements LinksProvider {
}
private void getAndStore(final ObjectAdapterMemento parentAdapterMemento) {
- final OneToOneAssociation property = propertyMemento.getProperty();
- final ObjectAdapter parentAdapter = parentAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK);
+ final OneToOneAssociation property = propertyMemento.getProperty(getSpecificationLoader());
+ final ObjectAdapter parentAdapter = parentAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK,
+ getPersistenceSession(), getSpecificationLoader());
final ObjectAdapter associatedAdapter = property.get(parentAdapter, InteractionInitiatedBy.USER);
setObject(associatedAdapter);
}
@@ -760,9 +777,10 @@ public class ScalarModel extends EntityModel implements LinksProvider {
public String getReasonInvalidIfAny() {
- final OneToOneAssociation property = getPropertyMemento().getProperty();
+ final OneToOneAssociation property = getPropertyMemento().getProperty(getSpecificationLoader());
- final ObjectAdapter adapter = getParentObjectAdapterMemento().getObjectAdapter(ConcurrencyChecking.CHECK);
+ final ObjectAdapter adapter = getParentObjectAdapterMemento().getObjectAdapter(ConcurrencyChecking.CHECK,
+ getPersistenceSession(), getSpecificationLoader());
final ObjectAdapter associate = getObject();
@@ -776,7 +794,7 @@ public class ScalarModel extends EntityModel implements LinksProvider {
* @return adapter, which may be different from the original (if a {@link ViewModelFacet#isCloneable(Object) cloneable} view model, for example.
*/
public ObjectAdapter applyValue(ObjectAdapter adapter) {
- final OneToOneAssociation property = getPropertyMemento().getProperty();
+ final OneToOneAssociation property = getPropertyMemento().getProperty(getSpecificationLoader());
//
// previously there was a guard here to only apply changes provided:
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
index fab9761..bed0300 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
@@ -22,7 +22,6 @@ import org.apache.wicket.model.Model;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
@@ -71,15 +70,20 @@ public interface ScalarModelWithPending extends Serializable {
LOG.debug("setting to: " + adapterMemento!=null?adapterMemento.toString():null);
}
owner.setPending(adapterMemento);
- if (owner.getScalarModel() != null) {
+ final ScalarModel ownerScalarModel = owner.getScalarModel();
+ if (ownerScalarModel != null) {
if(adapterMemento == null) {
- owner.getScalarModel().setObject((ObjectAdapter)null);
+ ownerScalarModel.setObject(null);
} else {
- if (owner.getPending() != null) {
+ final ObjectAdapterMemento ownerPending = owner.getPending();
+ if (ownerPending != null) {
if (LOG.isDebugEnabled()) {
- LOG.debug("setting to pending: " + owner.getPending().toString());
+ LOG.debug("setting to pending: " + ownerPending.toString());
}
- owner.getScalarModel().setObject(owner.getPending().getObjectAdapter(ConcurrencyChecking.NO_CHECK));
+ ownerScalarModel.setObject(
+ ownerPending.getObjectAdapter(
+ ConcurrencyChecking.NO_CHECK,
+ ownerScalarModel.getPersistenceSession(), ownerScalarModel.getSpecificationLoader()));
}
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
index 9ddd054..0780044 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
@@ -39,7 +39,8 @@ public class ValueModel extends ModelAbstract<ObjectAdapter> {
@Override
protected ObjectAdapter load() {
- return adapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK);
+ return adapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK, getPersistenceSession(),
+ getSpecificationLoader());
}
// //////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
index d3228f2..0be366f 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
@@ -26,6 +26,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.hint.HintStore;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
/**
@@ -135,8 +136,13 @@ public class ComponentHintKey implements Serializable {
};
}
- protected HintStore getHintStore() {
- return IsisContext.getSessionFactory().getServicesInjector().lookupService(HintStore.class);
+
+ HintStore getHintStore() {
+ return getIsisSessionFactory().getServicesInjector().lookupService(HintStore.class);
+ }
+
+ IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ObjectAdapterFunctions.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ObjectAdapterFunctions.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ObjectAdapterFunctions.java
deleted file mode 100644
index 7700e04..0000000
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ObjectAdapterFunctions.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.viewer.wicket.model.util;
-
-import com.google.common.base.Function;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
-import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
-
-/**
- * @deprecated - use {@link ObjectAdapter.Functions} or {@link ObjectAdapterMemento.Functions}
- */
-@Deprecated
-public final class ObjectAdapterFunctions {
-
- private ObjectAdapterFunctions() {
- }
-
- /**
- * @deprecated - use {@link ObjectAdapter.Functions}
- */
- @Deprecated
- public static Function<Object, ObjectAdapter> fromPojo(final AdapterManager adapterManager) {
- return ObjectAdapter.Functions.adapterForUsing(adapterManager);
- }
-
- /**
- * @deprecated - use {@link ObjectAdapterMemento.Functions}
- */
- @Deprecated
- public static Function<ObjectAdapterMemento, ObjectAdapter> fromMemento(final ConcurrencyChecking concurrencyChecking) {
- return ObjectAdapterMemento.Functions.fromMemento(concurrencyChecking);
- }
-
- /**
- * @deprecated - use {@link ObjectAdapterMemento.Functions}
- */
- @Deprecated
- public static Function<ObjectAdapter, ObjectAdapterMemento> toMemento() {
- return ObjectAdapterMemento.Functions.toMemento();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java
index 0b81418..89169eb 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanel.java
@@ -81,7 +81,7 @@ public class ActionLinkPanel extends PanelAbstract<ActionModel> {
}
private String determineTitle() {
- return getModel().getActionMemento().getAction().getId();
+ return getModel().getActionMemento().getAction(getSpecificationLoader()).getId();
}
private AbstractLink newLink(final String linkId, final Class<? extends Page> pageClass, final PageParameters pageParameters) {
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java
index f36ac36..cdef5be 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionlink/ActionLinkPanelFactory.java
@@ -45,7 +45,7 @@ public class ActionLinkPanelFactory extends ComponentFactoryAbstract {
return ApplicationAdvice.DOES_NOT_APPLY;
}
final ActionModel actionModel = (ActionModel) model;
- final ActionSemantics.Of semantics = actionModel.getActionMemento().getAction().getSemantics();
+ final ActionSemantics.Of semantics = actionModel.getActionMemento().getAction(actionModel.getSpecificationLoader()).getSemantics();
return ApplicationAdvice.appliesIf(semantics.isSafeInNature());
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
index e947e29..1da1815 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
@@ -49,7 +49,8 @@ public final class EntityActionLinkFactory extends ActionLinkFactoryAbstract {
final ObjectAdapterMemento adapterMemento,
final ObjectAction action) {
- final ObjectAdapter objectAdapter = adapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK);
+ final ObjectAdapter objectAdapter = adapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK,
+ entityModel.getPersistenceSession(), entityModel.getSpecificationLoader());
final Boolean persistent = objectAdapter.representsPersistent();
if (!persistent) {
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java
index e2f99c5..d9d6f2f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java
@@ -65,7 +65,8 @@ public final class EntityActionUtil {
} else {
final ObjectAdapterMemento parentMemento = scalarModel.getParentObjectAdapterMemento();
final EntityModel parentEntityModel = new EntityModel(parentMemento);
- final OneToOneAssociation oneToOneAssociation = scalarModel.getPropertyMemento().getProperty();
+ final OneToOneAssociation oneToOneAssociation = scalarModel.getPropertyMemento().getProperty(
+ scalarModel.getSpecificationLoader());
final List<ObjectAction> associatedActions = getObjectActionsForAssociation(parentEntityModel, oneToOneAssociation,
deploymentCategory);
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
index d4e52b4..69f2f9c 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
@@ -41,7 +41,9 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaPosition;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
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;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
@@ -312,8 +314,8 @@ class CssMenuItem implements Serializable {
final ActionLinkFactory actionLinkFactory) {
// check visibility
- final AuthenticationSession session = getAuthenticationSession();
- final ObjectAdapter adapter = targetAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK);
+ final ObjectAdapter adapter = targetAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK,
+ getPersistenceSession(), getSpecificationLoader());
final Consent visibility = objectAction.isVisible(adapter, InteractionInitiatedBy.USER, ActionModel.WHERE_FOR_ACTION_INVOCATION);
if (visibility.isVetoed()) {
return null;
@@ -446,11 +448,20 @@ class CssMenuItem implements Serializable {
// dependencies
// //////////////////////////////////////////////////////////////
- protected AuthenticationSession getAuthenticationSession() {
+ AuthenticationSession getAuthenticationSession() {
return getIsisSessionFactory().getCurrentSession().getAuthenticationSession();
}
- protected IsisSessionFactory getIsisSessionFactory() {
+ SpecificationLoader getSpecificationLoader() {
+ return getIsisSessionFactory().getSpecificationLoader();
+ }
+
+
+ PersistenceSession getPersistenceSession() {
+ return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
+ }
+
+ IsisSessionFactory getIsisSessionFactory() {
return IsisContext.getSessionFactory();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionLinkFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionLinkFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionLinkFactory.java
index d4a971f..8385137 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionLinkFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionLinkFactory.java
@@ -24,6 +24,10 @@ import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+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;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.ui.components.widgets.linkandlabel.ActionLinkFactoryAbstract;
@@ -31,17 +35,30 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.linkandlabel.ActionLi
class ServiceActionLinkFactory extends ActionLinkFactoryAbstract {
private static final long serialVersionUID = 1L;
-
+
@Override
public LinkAndLabel newLink(
final String linkId, final ObjectAdapterMemento adapterMemento,
final ObjectAction action) {
- ObjectAdapter objectAdapter = adapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK);
+ ObjectAdapter objectAdapter = adapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK,
+ getPersistenceSession(), getSpecificationLoader());
final AbstractLink link = newLink(linkId, objectAdapter, action);
return newLinkAndLabel(objectAdapter, action, link, null);
}
+ SpecificationLoader getSpecificationLoader() {
+ return getIsisSessionFactory().getSpecificationLoader();
+ }
+
+ PersistenceSession getPersistenceSession() {
+ return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
+ }
+
+ protected IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
+ }
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
index b5fbf72..4d2e98e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
@@ -46,12 +46,12 @@ public class ActionPromptHeaderPanel extends PanelAbstract<ActionModel> {
final Label label = new Label(ID_ACTION_NAME, new AbstractReadOnlyModel<String>() {
@Override
public String getObject() {
- final ObjectAction action = model.getActionMemento().getAction();
+ final ObjectAction action = model.getActionMemento().getAction(getSpecificationLoader());
return action.getName();
}
});
- final ObjectAction action = model.getActionMemento().getAction();
+ final ObjectAction action = model.getActionMemento().getAction(getSpecificationLoader());
NamedFacet namedFacet = action.getFacet(NamedFacet.class);
if (namedFacet != null) {
label.setEscapeModelStrings(namedFacet.escaped());
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanel.java
index 11c1436..055b8b6 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionInfoPanel.java
@@ -40,7 +40,7 @@ public class ActionInfoPanel extends PanelAbstract<ActionModel> {
super(id, actionModel);
final ObjectAdapter targetAdapter = getModel().getTargetAdapter();
- final ObjectAction objectAction = getModel().getActionMemento().getAction();
+ final ObjectAction objectAction = getModel().getActionMemento().getAction(getModel().getSpecificationLoader());
// TODO: render instead as links (providing isn't a service; provide a
// component for this?)
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
index d4c4b57..1959ce6 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
@@ -37,14 +37,13 @@ import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
import org.apache.isis.core.commons.authentication.MessageBroker;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
-import org.apache.isis.viewer.wicket.model.models.ExecutingPanel;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.ActionPrompt;
import org.apache.isis.viewer.wicket.model.models.BookmarkableModel;
import org.apache.isis.viewer.wicket.model.models.BookmarkedPagesModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.ExecutingPanel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.actionresponse.ActionResultResponse;
import org.apache.isis.viewer.wicket.ui.actionresponse.ActionResultResponseHandlingStrategy;
@@ -126,7 +125,7 @@ public class ActionPanel extends PanelAbstract<ActionModel> implements Executing
getComponentFactoryRegistry().addOrReplaceComponent(this, ComponentType.PARAMETERS, getActionModel());
getComponentFactoryRegistry().addOrReplaceComponent(header, ComponentType.ENTITY_ICON_AND_TITLE, new EntityModel(targetAdapter));
- final String actionName = getActionModel().getActionMemento().getAction().getName();
+ final String actionName = getActionModel().getActionMemento().getAction(actionModel.getSpecificationLoader()).getName();
header.add(new Label(ID_ACTION_NAME, Model.of(actionName)));
} catch (final ConcurrencyException ex) {
@@ -338,7 +337,7 @@ public class ActionPanel extends PanelAbstract<ActionModel> implements Executing
///////////////////////////////////////////////////////
protected IsisTransactionManager getTransactionManager() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager();
+ return getPersistenceSession().getTransactionManager();
}
protected MessageBroker getMessageBroker() {
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
index 35b1e57..dbda8ad 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.java
@@ -211,7 +211,7 @@ public class ActionParametersFormPanel extends PanelAbstract<ActionModel> {
*/
private void applyAreYouSure(AjaxButton button) {
ActionModel actionModel = getActionModel();
- final ObjectAction action = actionModel.getActionMemento().getAction();
+ final ObjectAction action = actionModel.getActionMemento().getAction(getSpecificationLoader());
SemanticsOf semanticsOf = SemanticsOf.from(action.getSemantics());
addConfirmationDialogIfAreYouSureSemantics(button, semanticsOf);
@@ -225,7 +225,7 @@ public class ActionParametersFormPanel extends PanelAbstract<ActionModel> {
final ObjectAdapter[] pendingArguments = actionModel.getArgumentsAsArray();
try {
- final ObjectAction action = actionModel.getActionMemento().getAction();
+ final ObjectAction action = actionModel.getActionMemento().getAction(getSpecificationLoader());
final int numParams = action.getParameterCount();
for (int i = 0; i < numParams; i++) {
final ScalarPanelAbstract paramPanel = paramPanels.get(i);
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
index b699b41..210ec64 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
@@ -44,7 +44,6 @@ import org.apache.wicket.util.string.Strings;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
import org.apache.isis.viewer.wicket.model.models.BookmarkTreeNode;
import org.apache.isis.viewer.wicket.model.models.BookmarkedPagesModel;
@@ -225,8 +224,4 @@ public class BookmarkedPagesPanel extends PanelAbstract<BookmarkedPagesModel> {
@com.google.inject.Inject
private ImageResourceCache imageCache;
- protected SpecificationLoader getSpecificationLoader() {
- return getIsisSessionFactory().getSpecificationLoader();
- }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
index 770dc93..636236d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
@@ -62,7 +62,7 @@ public class CollectionPanel extends PanelAbstract<EntityCollectionModel> implem
final List<LinkAndLabel> entityActionLinks = Lists.newArrayList();
- final OneToManyAssociation otma = collectionModel.getCollectionMemento().getCollection();
+ final OneToManyAssociation otma = collectionModel.getCollectionMemento().getCollection(collectionModel.getSpecificationLoader());
final EntityModel entityModel = collectionModel.getEntityModel();
final List<ObjectAction> associatedActions =
[50/50] [abbrv] isis git commit: ISIS-1443: deals with subclass
domain services
Posted by da...@apache.org.
ISIS-1443: deals with subclass domain services
whereby the superclass is also a domain service but is only loaded
implicitly by walking the type hierarchy. This commit ensures that
if that superclass is annotated with @DomainService then it will
correctly be created with a service ObjectSpec
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3dffc2d9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3dffc2d9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3dffc2d9
Branch: refs/heads/master
Commit: 3dffc2d96e240982d16131d57d34fc8f54d1292c
Parents: 90828ab
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jun 16 11:29:53 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jun 16 11:29:53 2016 +0100
----------------------------------------------------------------------
.../isis/core/metamodel/specloader/SpecificationLoader.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3dffc2d9/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
index bc745fe..d5791d1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
@@ -315,7 +315,13 @@ public class SpecificationLoader implements ApplicationScopedComponent {
}
private ObjectSpecification internalLoadSpecification(final Class<?> type) {
- return internalLoadSpecification(type, null);
+ // superclasses tend to be loaded via this method, implicitly.
+ // what can happen is that a subclass domain service, eg a fake one such as FakeLocationLookupService
+ // can be registered first prior to the "real" implementation. As belt-n-braces, if that superclass is
+ // annotated using @DomainService, then we ensure its own spec is created correctly as a service spec.
+ final DomainService domainServiceIfAny = type.getAnnotation(DomainService.class);
+ final NatureOfService natureOfServiceIfAny = domainServiceIfAny != null ? domainServiceIfAny.nature() : null;
+ return internalLoadSpecification(type, natureOfServiceIfAny);
}
private ObjectSpecification internalLoadSpecification(final Class<?> type, final NatureOfService nature) {
[11/50] [abbrv] isis git commit: ISIS-1427: simplifying IsisContext
and minimizing calls to it; also removed Localization (unused)
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
index 21d99a2..d5b1ee1 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
@@ -165,7 +165,7 @@ public class RegisterEntities {
// //////////////////////////////////////
SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSpecificationLoader();
+ return IsisContext.getSessionFactory().getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index 3951bea..2c68c1b 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -27,7 +27,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
@@ -62,15 +61,13 @@ public class PojoAdapterTest {
private AuthenticationSession mockAuthenticationSession;
@Mock
private PersistenceSession mockPersistenceSession;
- @Mock
- private Localization mockLocalization;
-
+
@Before
public void setUp() throws Exception {
domainObject = new RuntimeTestPojo();
adapter = new PojoAdapter(domainObject, RootOid.create(ObjectSpecId.of("CUS"), "1"), mockAuthenticationSession,
- mockLocalization, mockSpecificationLoader, mockPersistenceSession);
+ mockSpecificationLoader, mockPersistenceSession);
adapter.setVersion(mockVersion);
allowUnimportantMethodCallsOn(mockVersion);
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
index 23f4ed5..164e2c0 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
@@ -23,7 +23,6 @@ import java.util.Iterator;
import com.google.common.base.Splitter;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.ParentedCollectionOid;
@@ -61,12 +60,10 @@ public class PojoAdapterBuilder {
private Version version;
- private Localization localization;
-
private AuthenticationSession authenticationSession;
- public static enum Persistence {
+ public enum Persistence {
TRANSIENT {
@Override
RootOid createOid(ObjectSpecId objectSpecId, String identifier) {
@@ -181,11 +178,6 @@ public class PojoAdapterBuilder {
return this;
}
- public PojoAdapterBuilder with(Localization localization) {
- this.localization = localization;
- return this;
- }
-
public PojoAdapterBuilder with(Version version) {
this.version = version;
return this;
@@ -199,7 +191,7 @@ public class PojoAdapterBuilder {
public PojoAdapter build() {
final RootOid rootOid = persistence.createOid(objectSpecId, identifier);
final Oid oid = type.oidFor(rootOid, objectSpecId, aggregatedId);
- final PojoAdapter pojoAdapter = new PojoAdapter(pojo, oid, authenticationSession, localization,
+ final PojoAdapter pojoAdapter = new PojoAdapter(pojo, oid, authenticationSession,
specificationLoader, persistenceSession) {
@Override
public ObjectSpecification getSpecification() { return objectSpec != null? objectSpec: super.getSpecification(); }
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
index 7477085..460e0e4 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext.java
@@ -22,7 +22,6 @@ import java.util.List;
import org.apache.isis.applib.annotation.Render;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -50,8 +49,6 @@ public interface RendererContext {
List<List<String>> getFollowLinks();
- Localization getLocalization();
-
boolean honorUiHints();
boolean objectPropertyValuesOnly();
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
index 0cc3335..c09cada 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
@@ -222,7 +222,7 @@ public abstract class ReprRendererAbstract<R extends ReprRendererAbstract<R, T>,
}
protected List<ObjectAdapter> getServiceAdapters() {
- return IsisContext.getPersistenceSession().getServices();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().getServices();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java
index fe37480..004b72e 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectLinkTo.java
@@ -96,13 +96,5 @@ public class DomainObjectLinkTo implements ObjectAdapterLinkTo {
- //////////////////////////////////////////////////
- // Dependencies (from context)
- //////////////////////////////////////////////////
-
- protected static OidMarshaller getOidMarshaller() {
- return IsisContext.getOidMarshaller();
- }
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
index 5dc34b8..830205e 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
@@ -397,7 +397,7 @@ public class DomainObjectReprRenderer extends ReprRendererAbstract<DomainObjectR
return JsonValueEncoder.asObject(objectAdapter, format);
}
final TitleFacet titleFacet = objectSpec.getFacet(TitleFacet.class);
- final String title = titleFacet.title(objectAdapter, resourceContext.getLocalization());
+ final String title = titleFacet.title(objectAdapter);
return DomainObjectReprRenderer.newLinkToBuilder(resourceContext, Rel.VALUE, objectAdapter).withTitle(title).build();
}
@@ -408,7 +408,7 @@ public class DomainObjectReprRenderer extends ReprRendererAbstract<DomainObjectR
// ///////////////////////////////////////////////////////////////////
protected static OidMarshaller getOidMarshaller() {
- return IsisContext.getOidMarshaller();
- }
+ return IsisContext.getSessionFactory().getOidMarshaller();
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
index a0314ae..5425c22 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
@@ -846,7 +846,7 @@ public final class JsonValueEncoder {
}
private static PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
index 7857861..27a8446 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
@@ -126,7 +126,7 @@ public class ObjectPropertyReprRenderer extends AbstractObjectMemberReprRenderer
return value;
} else {
final TitleFacet titleFacet = spec.getFacet(TitleFacet.class);
- final String title = titleFacet.title(valueAdapter, rendererContext.getLocalization());
+ final String title = titleFacet.title(valueAdapter);
final LinkBuilder valueLinkBuilder = DomainObjectReprRenderer.newLinkToBuilder(rendererContext, Rel.VALUE, valueAdapter).withTitle(title);
if(eagerlyRender) {
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
index 9a437f6..dfc8c75 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
@@ -59,10 +59,10 @@ public class IsisPrettyPrintingProcessor implements DecoratorProcessor<Marshalle
}
protected DeploymentCategory getDeploymentCategory() {
- return IsisContext.getDeploymentCategory();
+ return IsisContext.getSessionFactory().getDeploymentCategory();
}
protected IsisConfiguration getConfiguration() {
- return IsisContext.getConfiguration();
+ return IsisContext.getSessionFactory().getConfiguration();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
index 40b89a6..446682d 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
@@ -29,7 +29,8 @@ public final class JsonWriterUtil {
private JsonWriterUtil(){}
public static String jsonFor(final Object object) {
- final JsonMapper.PrettyPrinting prettyPrinting = inferPrettyPrinting(IsisContext.getDeploymentCategory());
+ final JsonMapper.PrettyPrinting prettyPrinting = inferPrettyPrinting(
+ IsisContext.getSessionFactory().getDeploymentCategory());
try {
return JsonMapper.instance(prettyPrinting).write(object);
} catch (final IOException e) {
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
index e298c40..cf51d0c 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
@@ -36,7 +36,6 @@ import com.google.common.base.Strings;
import com.google.common.collect.Sets;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -47,6 +46,7 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.DomainModel;
@@ -72,7 +72,6 @@ public class ResourceContext implements RendererContext6 {
private final ServicesInjector servicesInjector;
private final SpecificationLoader specificationLoader;
private final AuthenticationSession authenticationSession;
- private final Localization localization;
private final PersistenceSession persistenceSession;
private List<List<String>> followLinks;
@@ -98,13 +97,8 @@ public class ResourceContext implements RendererContext6 {
final HttpServletRequest httpServletRequest,
final HttpServletResponse httpServletResponse,
final SecurityContext securityContext,
- final DeploymentCategory deploymentCategory,
final IsisConfiguration configuration,
final ServicesInjector servicesInjector,
- final SpecificationLoader specificationLoader,
- final AuthenticationSession authenticationSession,
- final Localization localization,
- final PersistenceSession persistenceSession,
final InteractionInitiatedBy interactionInitiatedBy) {
this.httpHeaders = httpHeaders;
@@ -118,12 +112,15 @@ public class ResourceContext implements RendererContext6 {
this.httpServletResponse = httpServletResponse;
this.securityContext = securityContext;
this.servicesInjector = servicesInjector;
- this.localization = localization;
this.configuration = configuration;
- this.authenticationSession = authenticationSession;
- this.persistenceSession = persistenceSession;
- this.specificationLoader = specificationLoader;
- this.deploymentCategory = deploymentCategory;
+
+ this.authenticationSession = servicesInjector.getAuthenticationSession();
+ this.specificationLoader = servicesInjector.getSpecificationLoader();
+ this.deploymentCategory = servicesInjector.getDeploymentCategory();
+
+ final IsisSessionFactory isisSessionFactory = servicesInjector.lookupServiceElseFail(IsisSessionFactory.class);
+ this.persistenceSession = isisSessionFactory.getCurrentSession().getPersistenceSession();
+
this.interactionInitiatedBy = interactionInitiatedBy;
init(representationType);
@@ -267,11 +264,6 @@ public class ResourceContext implements RendererContext6 {
}
@Override
- public Localization getLocalization() {
- return localization;
- }
-
- @Override
public AuthenticationSession getAuthenticationSession() {
return authenticationSession;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RuntimeExceptionMapper.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RuntimeExceptionMapper.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RuntimeExceptionMapper.java
index 9e3f062..bc191c5 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RuntimeExceptionMapper.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RuntimeExceptionMapper.java
@@ -38,7 +38,8 @@ public class RuntimeExceptionMapper implements ExceptionMapper<RuntimeException>
@Override
public Response toResponse(final RuntimeException ex) {
// since have rendered...
- final IsisTransaction currentTransaction = IsisContext.getTransactionManager().getTransaction();
+ final IsisTransaction currentTransaction = IsisContext.getSessionFactory().getCurrentSession()
+ .getPersistenceSession().getTransactionManager().getCurrentTransaction();
final Throwable rootCause = Throwables.getRootCause(ex);
final List<Throwable> causalChain = Throwables.getCausalChain(ex);
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyBasicAuth.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyBasicAuth.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyBasicAuth.java
index f8f69e5..1e43a0b 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyBasicAuth.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyBasicAuth.java
@@ -88,7 +88,7 @@ public class AuthenticationSessionStrategyBasicAuth extends AuthenticationSessio
// //////////////////////////////////////////////////////////
protected AuthenticationManager getAuthenticationManager() {
- return IsisContext.getAuthenticationManager();
+ return IsisContext.getSessionFactory().getAuthenticationManager();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyTrusted.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyTrusted.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyTrusted.java
index 16fbfc7..d369f39 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyTrusted.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyTrusted.java
@@ -37,6 +37,6 @@ public class AuthenticationSessionStrategyTrusted extends AuthenticationSessionS
// will always succeed.
final AuthenticationRequestExploration request = new AuthenticationRequestExploration();
- return IsisContext.getAuthenticationManager().authenticate(request);
+ return IsisContext.getSessionFactory().getAuthenticationManager().authenticate(request);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
index 783dc6d..e5ab94f 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
@@ -57,7 +57,8 @@ public class RestfulObjectsJaxbWriterForXml extends JAXBXmlRootElementProvider {
marshaller.setAdapter(PersistentEntityAdapter.class, new PersistentEntityAdapter() {
@Override
protected BookmarkService getBookmarkService() {
- final PersistenceSession persistenceSession = IsisContext.getPersistenceSession();
+ final PersistenceSession persistenceSession = IsisContext.getSessionFactory().getCurrentSession()
+ .getPersistenceSession();
final ServicesInjector servicesInjector = persistenceSession.getServicesInjector();
return servicesInjector.lookupService(BookmarkService.class);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
index f4b9ea4..da57bcd 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
@@ -23,7 +23,6 @@ import javax.ws.rs.core.Response;
import org.apache.isis.applib.annotation.ActionSemantics;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -32,10 +31,10 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
@@ -119,11 +118,6 @@ public class DomainResourceHelper {
}
@Override
- public Localization getLocalization() {
- return rendererContext.getLocalization();
- }
-
- @Override
public boolean canEagerlyRender(ObjectAdapter objectAdapter) {
return rendererContext.canEagerlyRender(objectAdapter);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectActionArgHelper.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectActionArgHelper.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectActionArgHelper.java
index aa12ed6..82d15f3 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectActionArgHelper.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ObjectActionArgHelper.java
@@ -65,8 +65,7 @@ public class ObjectActionArgHelper {
// validate individual arg
final ObjectActionParameter parameter = parameters.get(i);
final Object argPojo = argAdapter!=null?argAdapter.getObject():null;
- final String reasonNotValid = parameter.isValid(objectAdapter, argPojo, InteractionInitiatedBy.USER,
- null
+ final String reasonNotValid = parameter.isValid(objectAdapter, argPojo, InteractionInitiatedBy.USER
);
if (reasonNotValid != null) {
argRepr.mapPut("invalidReason", reasonNotValid);
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
index 1eb2445..1b4fa83 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
@@ -31,15 +31,14 @@ import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.Providers;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.url.UrlEncodingUtils;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.ServiceUtil;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.system.context.IsisContext;
@@ -111,7 +110,7 @@ public abstract class ResourceAbstract {
final Where where,
final RepresentationService.Intent intent,
final String urlUnencodedQueryString) {
- if (!IsisContext.inSession()) {
+ if (!IsisContext.getSessionFactory().inSession()) {
throw RestfulObjectsApplicationException.create(HttpStatusCode.UNAUTHORIZED);
}
if (getAuthenticationSession() == null) {
@@ -121,10 +120,9 @@ public abstract class ResourceAbstract {
this.resourceContext = new ResourceContext(
representationType, httpHeaders, providers, uriInfo, request, where, intent, urlUnencodedQueryString, httpServletRequest, httpServletResponse,
securityContext,
- getDeploymentCategory(), getConfiguration(),
- getServicesInjector(), getSpecificationLoader(),
- getAuthenticationSession(), getLocalization(),
- getPersistenceSession(), InteractionInitiatedBy.USER);
+ getConfiguration(),
+ getServicesInjector(),
+ InteractionInitiatedBy.USER);
}
protected ResourceContext getResourceContext() {
@@ -168,11 +166,11 @@ public abstract class ResourceAbstract {
// //////////////////////////////////////////////////////////////
protected DeploymentCategory getDeploymentCategory() {
- return IsisContext.getDeploymentCategory();
+ return IsisContext.getSessionFactory().getDeploymentCategory();
}
protected IsisConfiguration getConfiguration () {
- return IsisContext.getConfiguration();
+ return IsisContext.getSessionFactory().getConfiguration();
}
protected ServicesInjector getServicesInjector () {
@@ -180,23 +178,19 @@ public abstract class ResourceAbstract {
}
protected AuthenticationSession getAuthenticationSession() {
- return IsisContext.getAuthenticationSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
}
protected AuthenticationManager getAuthenticationManager() {
- return IsisContext.getAuthenticationManager();
+ return IsisContext.getSessionFactory().getAuthenticationManager();
}
protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSpecificationLoader();
+ return IsisContext.getSessionFactory().getSpecificationLoader();
}
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
- }
-
- protected Localization getLocalization() {
- return IsisContext.getLocalization();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
// //////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
index d051294..2642e86 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
@@ -71,7 +71,7 @@ public class SwaggerSpecResource {
private String swagger(final SwaggerService.Visibility visibility) {
final SwaggerService.Format format = deriveFrom(httpHeaders);
- String spec = IsisContext.doInSession(new MyCallable(visibility, format));
+ String spec = IsisContext.getSessionFactory().doInSession(new MyCallable(visibility, format));
return spec;
}
@@ -119,7 +119,7 @@ public class SwaggerSpecResource {
}
PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
index 8fea05d..74e6264 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
@@ -37,7 +37,7 @@ public class IsisTransactionFilterForRestfulObjects implements Filter {
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
// no-op if no session available.
- if(!IsisContext.inSession()) {
+ if(!IsisContext.getSessionFactory().inSession()) {
chain.doFilter(request, response);
return;
}
@@ -54,11 +54,11 @@ public class IsisTransactionFilterForRestfulObjects implements Filter {
}
protected boolean inTransaction() {
- return IsisContext.inTransaction();
+ return IsisContext.getSessionFactory().inTransaction();
}
protected IsisTransactionManager getTransactionManager() {
- return IsisContext.getTransactionManager();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager();
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java
index 33e537e..9164f20 100644
--- a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java
+++ b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java
@@ -161,7 +161,8 @@ public class ResourceContextTest_ensureCompatibleAcceptHeader {
private ResourceContext instantiateResourceContext(
final RepresentationType representationType) {
- return new ResourceContext(representationType, httpHeaders, null, null, null, null, null, null, httpServletRequest, null, null, null, null, null, null, null, null, null, null);
+ return new ResourceContext(representationType, httpHeaders, null, null, null, null, null, null, httpServletRequest, null, null,
+ null, null, null);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
index 21ad08e..d886275 100644
--- a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
+++ b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_getArg.java
@@ -56,7 +56,8 @@ public class ResourceContextTest_getArg {
givenServletRequestQueryString(queryString);
givenServletRequestParameterMapEmpty();
- resourceContext = new ResourceContext(null, null, null, null, null, null, null, (String)null, httpServletRequest, null, null, null, null, null, null, null, null, null, null) {
+ resourceContext = new ResourceContext(null, null, null, null, null, null, null, (String)null, httpServletRequest, null, null,
+ null, null, null) {
@Override
void init(final RepresentationType representationType) {
//
@@ -72,7 +73,8 @@ public class ResourceContextTest_getArg {
givenServletRequestQueryString(queryString);
givenServletRequestParameterMapEmpty();
- resourceContext = new ResourceContext(null, null, null, null, null, null, null, (String)null, httpServletRequest, null, null, null, null, null, null, null, null, null, null) {
+ resourceContext = new ResourceContext(null, null, null, null, null, null, null, (String)null, httpServletRequest, null, null,
+ null, null, null) {
@Override
void init(final RepresentationType representationType) {
//
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index b9f0ddb..3ac1de0 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -28,7 +28,6 @@ import com.google.common.base.Function;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.google.inject.Guice;
-import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Module;
@@ -69,6 +68,7 @@ import org.apache.isis.core.runtime.runner.IsisInjectModule;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.webapp.IsisWebAppBootstrapper;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
@@ -152,40 +152,56 @@ public class IsisWicketApplication
}
/**
- * {@link Inject}ed when {@link #init() initialized}.
+ * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
*/
- @Inject
+ @com.google.inject.Inject
private ComponentFactoryRegistry componentFactoryRegistry;
/**
- * {@link Inject}ed when {@link #init() initialized}.
+ * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
*/
@SuppressWarnings("unused")
- @Inject
+ @com.google.inject.Inject
private ImageResourceCache imageCache;
/**
- * {@link Inject}ed when {@link #init() initialized}.
+ * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
*/
@SuppressWarnings("unused")
- @Inject
+ @com.google.inject.Inject
private WicketViewerSettings wicketViewerSettings;
/**
- * {@link Inject}ed when {@link #init() initialized}.
+ * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
*/
- @Inject
+ @com.google.inject.Inject
private PageClassRegistry pageClassRegistry;
-
/**
- * {@link Inject}ed when {@link #init() initialized}.
+ * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
*/
- @Inject
+ @com.google.inject.Inject
private IsisSystem isisSystem;
+ /**
+ * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
+ */
+ @com.google.inject.Inject
+ private IsisSessionFactory isisSessionFactory;
- private boolean determiningDeploymentType;
+ /**
+ * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
+ */
+ @com.google.inject.Inject
+ private IsisConfiguration configuration;
+
+ /**
+ * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
+ */
+ @com.google.inject.Inject
+ private DeploymentCategory deploymentCategory;
+
+ private boolean determiningConfigurationType;
private DeploymentTypeWicketAbstract deploymentType;
private final List<String> validationErrors = Lists.newArrayList();
@@ -241,7 +257,8 @@ public class IsisWicketApplication
final IsisConfigurationDefault configuration = isisConfigurationBuilder.getConfiguration();
- deploymentType = determineDeploymentType(configuration.getString("isis.deploymentType"));
+ DeploymentTypeWicketAbstract deploymentType =
+ determineDeploymentType(configuration.getString("isis.deploymentType"));
RequestCycleListenerCollection requestCycleListeners = getRequestCycleListeners();
IRequestCycleListener requestCycleListenerForIsis = newWebRequestCycleForIsis();
@@ -267,7 +284,7 @@ public class IsisWicketApplication
filterJavascriptContributions();
- configureWicketSourcePluginIfNecessary(configuration);
+ configureWicketSourcePluginIfNecessary();
// TODO ISIS-987 Either make the API better (no direct access to the map) or use DB records
int maxEntries = 1000;
@@ -312,14 +329,14 @@ public class IsisWicketApplication
select2Settings.setIncludeJqueryUI(false);
}
- protected void configureWicketSourcePluginIfNecessary(final IsisConfiguration configuration) {
- if(isWicketSourcePluginEnabled(configuration)) {
+ protected void configureWicketSourcePluginIfNecessary() {
+ if(isWicketSourcePluginEnabled(this.configuration)) {
configureWicketSourcePlugin();
}
}
protected void configureWicketSourcePlugin() {
- if(!deploymentType.isProduction()) {
+ if(!deploymentCategory.isProduction()) {
WicketSource.configure(this);
}
}
@@ -388,7 +405,7 @@ public class IsisWicketApplication
return;
}
- determiningDeploymentType = true;
+ determiningConfigurationType = true;
try {
final IsisConfigurationBuilder isisConfigurationBuilder = obtainConfigBuilder();
@@ -396,7 +413,7 @@ public class IsisWicketApplication
String deploymentTypeFromConfig = configuration.getString("isis.deploymentType");
deploymentType = determineDeploymentType(deploymentTypeFromConfig);
} finally {
- determiningDeploymentType = false;
+ determiningConfigurationType = false;
}
}
@@ -641,7 +658,7 @@ public class IsisWicketApplication
@Override
public RuntimeConfigurationType getConfigurationType() {
- if(determiningDeploymentType) {
+ if(determiningConfigurationType) {
// avoiding an infinite loop; have already passed through here once before
// this time around, just delegate to web-inf
return super.getConfigurationType();
@@ -718,7 +735,6 @@ public class IsisWicketApplication
return pageClassRegistry;
}
-
/**
* Delegates to the {@link #getPageClassRegistry() PageClassRegistry}.
*/
@@ -727,7 +743,6 @@ public class IsisWicketApplication
return getPageClassRegistry().getPageClass(PageType.HOME);
}
-
/**
* Delegates to the {@link #getPageClassRegistry() PageClassRegistry}.
*/
@@ -761,13 +776,11 @@ public class IsisWicketApplication
return (Class<? extends WebPage>) getPageClassRegistry().getPageClass(PageType.PASSWORD_RESET);
}
-
public AuthenticationSession getAuthenticationSession() {
- return IsisContext.getAuthenticationSession();
+ return isisSessionFactory.getCurrentSession().getAuthenticationSession();
}
-
public DeploymentCategory getDeploymentCategory() {
- return deploymentType.getDeploymentCategory();
+ return deploymentCategory;
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
index 7fd37ed..cca4423 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
@@ -134,7 +134,7 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
// /////////////////////////////////////////////////
protected AuthenticationManager getAuthenticationManager() {
- return IsisContext.getAuthenticationManager();
+ return IsisContext.getSessionFactory().getAuthenticationManager();
}
// /////////////////////////////////////////////////
@@ -147,22 +147,22 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
final SessionLoggingService.CausedBy causedBy) {
final SessionLoggingService sessionLoggingService = getSessionLoggingService();
if (sessionLoggingService != null) {
- IsisContext.doInSession(new Runnable() {
- @Override
- public void run() {
- // use hashcode as session identifier, to avoid re-binding http sessions if using Session#getId()
- int sessionHashCode = System.identityHashCode(AuthenticatedWebSessionForIsis.this);
- sessionLoggingService.log(type, username, Clock.getTimeAsDateTime().toDate(), causedBy, Integer.toString(sessionHashCode));
- }
- });
+ IsisContext.getSessionFactory().doInSession(new Runnable() {
+ @Override
+ public void run() {
+ // use hashcode as session identifier, to avoid re-binding http sessions if using Session#getId()
+ int sessionHashCode = System.identityHashCode(AuthenticatedWebSessionForIsis.this);
+ sessionLoggingService.log(type, username, Clock.getTimeAsDateTime().toDate(), causedBy, Integer.toString(sessionHashCode));
+ }
+ });
}
}
protected SessionLoggingService getSessionLoggingService() {
- return IsisContext.doInSession(new Callable<SessionLoggingService>() {
+ return IsisContext.getSessionFactory().doInSession(new Callable<SessionLoggingService>() {
@Override
public SessionLoggingService call() throws Exception {
- return IsisContext.getPersistenceSession().getServicesInjector().lookupService(SessionLoggingService.class);
+ return IsisContext.getSessionFactory().getServicesInjector().lookupService(SessionLoggingService.class);
}
});
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
index 226e806..abe60a5 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
@@ -69,11 +69,11 @@ public class ConverterForObjectAdapter implements IConverter<ObjectAdapter> {
// //////////////////////////////////////////////////////////
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
protected OidMarshaller getOidMarshaller() {
- return IsisContext.getOidMarshaller();
+ return IsisContext.getSessionFactory().getOidMarshaller();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
index ba66e40..5e0781d 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
@@ -82,11 +82,11 @@ public class ConverterForObjectAdapterMemento implements IConverter<ObjectAdapte
// //////////////////////////////////////////////////////////
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
protected OidMarshaller getOidMarshaller() {
- return IsisContext.getOidMarshaller();
+ return IsisContext.getSessionFactory().getOidMarshaller();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
index 66be00a..49ec79f 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
@@ -68,15 +68,15 @@ public class LocalizerForIsis extends Localizer {
protected String translate(final String key, final Component component) {
final Class<?> contextClass = determineContextClassElse(component, IsisWicketApplication.class);
final String context = contextClass.getName();
- if(IsisContext.inSession()) {
+ if(IsisContext.getSessionFactory().inSession()) {
return translate(key, context);
} else {
- return IsisContext.doInSession(new Callable<String>() {
- @Override
- public String call() throws Exception {
- return translate(key, context);
- }
- });
+ return IsisContext.getSessionFactory().doInSession(new Callable<String>() {
+ @Override
+ public String call() throws Exception {
+ return translate(key, context);
+ }
+ });
}
}
@@ -153,7 +153,7 @@ public class LocalizerForIsis extends Localizer {
}
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
index b13bbe4..4e2500f 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
@@ -84,7 +84,7 @@ public class WebRequestCycleForIsis extends AbstractRequestCycleListener {
return;
}
- IsisContext.openSession(authenticationSession);
+ IsisContext.getSessionFactory().openSession(authenticationSession);
getTransactionManager().startTransaction();
}
@@ -99,7 +99,7 @@ public class WebRequestCycleForIsis extends AbstractRequestCycleListener {
LOG.debug("onRequestHandlerExecuted: handler: " + handler);
}
- if (IsisContext.inSession()) {
+ if (IsisContext.getSessionFactory().inSession()) {
try {
// will commit (or abort) the transaction;
// an abort will cause the exception to be thrown.
@@ -107,7 +107,7 @@ public class WebRequestCycleForIsis extends AbstractRequestCycleListener {
} catch(Exception ex) {
// will redirect to error page after this,
// so make sure there is a new transaction ready to go.
- if(getTransactionManager().getTransaction().getState().isComplete()) {
+ if(getTransactionManager().getCurrentTransaction().getState().isComplete()) {
getTransactionManager().startTransaction();
}
if(handler instanceof RenderPageRequestHandler) {
@@ -130,12 +130,12 @@ public class WebRequestCycleForIsis extends AbstractRequestCycleListener {
*/
@Override
public synchronized void onEndRequest(RequestCycle cycle) {
- if (IsisContext.inSession()) {
+ if (IsisContext.getSessionFactory().inSession()) {
try {
// belt and braces
getTransactionManager().endTransaction();
} finally {
- IsisContext.closeSession();
+ IsisContext.getSessionFactory().closeSession();
}
}
}
@@ -247,19 +247,19 @@ public class WebRequestCycleForIsis extends AbstractRequestCycleListener {
//region > Dependencies (from isis' context)
protected ServicesInjector getServicesInjector() {
- return IsisContext.getPersistenceSession().getServicesInjector();
+ return IsisContext.getSessionFactory().getServicesInjector();
}
protected IsisTransactionManager getTransactionManager() {
- return IsisContext.getTransactionManager();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager();
}
protected boolean inIsisSession() {
- return IsisContext.inSession();
+ return IsisContext.getSessionFactory().inSession();
}
protected AuthenticationSession getAuthenticationSession() {
- return IsisContext.getAuthenticationSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
index f5738a8..6720f08 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
@@ -72,7 +72,7 @@ public class DeepLinkServiceWicket implements DeepLinkService {
}
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
@Inject
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
index cdfef3e..33ef03e 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
@@ -31,7 +31,7 @@ public class WicketViewerSettingsDefault implements WicketViewerSettings {
private static final long serialVersionUID = 1L;
IsisConfiguration getConfiguration() {
- return IsisContext.getConfiguration();
+ return IsisContext.getSessionFactory().getConfiguration();
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/isis/PersistenceSessionProvider.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/isis/PersistenceSessionProvider.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/isis/PersistenceSessionProvider.java
deleted file mode 100644
index 3c6d78f..0000000
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/isis/PersistenceSessionProvider.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.viewer.wicket.model.isis;
-
-
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
-
-public interface PersistenceSessionProvider {
-
- PersistenceSession getPersistenceSession();
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
index 6d2a0b2..c4a7803 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
@@ -35,7 +35,7 @@ public class CollectionMemento implements Serializable {
private static final long serialVersionUID = 1L;
private static ObjectSpecification owningSpecFor(final OneToManyAssociation association) {
- return IsisContext.getSpecificationLoader().loadSpecification(association.getIdentifier().toClassIdentityString());
+ return IsisContext.getSessionFactory().getSpecificationLoader().loadSpecification(association.getIdentifier().toClassIdentityString());
}
private final ObjectSpecId owningType;
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
index 4ab3c0b..a9747dc 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
@@ -462,12 +462,12 @@ public class ObjectAdapterMemento implements Serializable {
//////////////////////////////////////////////////
private static PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
public static OidMarshaller getOidMarshaller() {
- return IsisContext.getOidMarshaller();
- }
+ return IsisContext.getSessionFactory().getOidMarshaller();
+ }
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
index 6504be6..3f734bc 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
@@ -32,7 +32,7 @@ public class PropertyMemento implements Serializable {
private static final long serialVersionUID = 1L;
private static ObjectSpecification owningSpecFor(final OneToOneAssociation association) {
- return IsisContext.getSpecificationLoader().loadSpecification(association.getIdentifier().toClassIdentityString());
+ return IsisContext.getSessionFactory().getSpecificationLoader().loadSpecification(association.getIdentifier().toClassIdentityString());
}
private final ObjectSpecId owningSpecId;
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java
index d541d8a..7f1d886 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/SpecUtils.java
@@ -38,7 +38,7 @@ public final class SpecUtils {
}
protected static SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSpecificationLoader();
+ return IsisContext.getSessionFactory().getSpecificationLoader();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index 8ebf435..df59ea9 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -52,7 +52,6 @@ import org.apache.isis.applib.services.routing.RoutingService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.applib.value.NamedWithMimeType;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
@@ -682,7 +681,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> {
//////////////////////////////////////////////////
private static OidMarshaller getOidMarshaller() {
- return IsisContext.getOidMarshaller();
+ return IsisContext.getSessionFactory().getOidMarshaller();
}
public ActionModel copy() {
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
index ad769b0..2f788c4 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
@@ -261,7 +261,7 @@ public class BookmarkTreeNode implements Serializable {
// //////////////////////////////////////
protected static OidMarshaller getOidMarshaller() {
- return IsisContext.getOidMarshaller();
+ return IsisContext.getSessionFactory().getOidMarshaller();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
index a0a16b3..6b51ebc 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
@@ -76,11 +76,11 @@ final class BookmarkTreeNodeComparator implements Comparator<BookmarkTreeNode> {
//////////////////////////////////////////////////
protected OidMarshaller getOidMarshaller() {
- return IsisContext.getOidMarshaller();
+ return IsisContext.getSessionFactory().getOidMarshaller();
}
protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSpecificationLoader();
+ return IsisContext.getSessionFactory().getSpecificationLoader();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
index 1a5d614..dfe947a 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
@@ -143,7 +143,7 @@ public class BookmarkedPagesModel extends ModelAbstract<List<? extends BookmarkT
protected IsisConfiguration getConfiguration() {
- return IsisContext.getConfiguration();
+ return IsisContext.getSessionFactory().getConfiguration();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index 58d9ce3..5a9e142 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -515,11 +515,11 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
}
private static PersistenceSession getPersistenceSessionStatic() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
private static SpecificationLoader getSpecificationLoaderStatic() {
- return IsisContext.getSpecificationLoader();
+ return IsisContext.getSessionFactory().getSpecificationLoader();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
index 1c3a074..7015de0 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
@@ -237,7 +237,7 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> implements UiH
}
protected HintStore getHintStore() {
- return IsisContext.getPersistenceSession().getServicesInjector().lookupService(HintStore.class);
+ return IsisContext.getSessionFactory().getServicesInjector().lookupService(HintStore.class);
}
@@ -632,11 +632,11 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> implements UiH
// //////////////////////////////////////////////////////////
protected static OidMarshaller getOidMarshaller() {
- return IsisContext.getOidMarshaller();
- }
+ return IsisContext.getSessionFactory().getOidMarshaller();
+ }
protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSpecificationLoader();
+ return IsisContext.getSessionFactory().getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
index 52b0d58..afd0c2b 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
@@ -47,11 +47,11 @@ public abstract class ModelAbstract<T> extends LoadableDetachableModel<T> {
// //////////////////////////////////////////////////////////////
protected AuthenticationSession getAuthenticationSession() {
- return IsisContext.getAuthenticationSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
}
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
protected AdapterManager getAdapterManager() {
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 2503eba..249119d 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -27,7 +27,6 @@ import java.util.List;
import com.google.common.collect.Lists;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -48,7 +47,6 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.links.LinksProvider;
import org.apache.isis.viewer.wicket.model.mementos.ActionParameterMemento;
@@ -117,10 +115,8 @@ public class ScalarModel extends EntityModel implements LinksProvider {
try {
final ObjectAdapter parentAdapter = scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK);
final ObjectAdapter currentValue = property.get(parentAdapter, InteractionInitiatedBy.USER);
- final Localization localization = IsisContext.getLocalization();
- final ObjectAdapter proposedAdapter = parseableFacet.parseTextEntry(currentValue, proposedPojoAsStr,
- InteractionInitiatedBy.USER, localization
- );
+ final ObjectAdapter proposedAdapter =
+ parseableFacet.parseTextEntry(currentValue, proposedPojoAsStr, InteractionInitiatedBy.USER);
final Consent valid = property.isAssociationValid(parentAdapter, proposedAdapter,
InteractionInitiatedBy.USER);
return valid.isAllowed() ? null : valid.getReason();
@@ -310,9 +306,8 @@ public class ScalarModel extends EntityModel implements LinksProvider {
final ObjectActionParameter parameter = scalarModel.getParameterMemento().getActionParameter();
try {
final ObjectAdapter parentAdapter = scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK);
- Localization localization = IsisContext.getLocalization();
final String invalidReasonIfAny = parameter.isValid(parentAdapter, proposedPojoAsStr,
- InteractionInitiatedBy.USER, localization
+ InteractionInitiatedBy.USER
);
return invalidReasonIfAny;
} catch (final Exception ex) {
@@ -325,9 +320,8 @@ public class ScalarModel extends EntityModel implements LinksProvider {
final ObjectActionParameter parameter = scalarModel.getParameterMemento().getActionParameter();
try {
final ObjectAdapter parentAdapter = scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK);
- Localization localization = IsisContext.getLocalization();
final String invalidReasonIfAny = parameter.isValid(parentAdapter, proposedAdapter.getObject(),
- InteractionInitiatedBy.USER, localization
+ InteractionInitiatedBy.USER
);
return invalidReasonIfAny;
} catch (final Exception ex) {
@@ -643,9 +637,8 @@ public class ScalarModel extends EntityModel implements LinksProvider {
if (parseableFacet == null) {
throw new RuntimeException("unable to parse string for " + getTypeOfSpecification().getFullIdentifier());
}
- Localization localization = IsisContext.getLocalization();
final ObjectAdapter adapter = parseableFacet.parseTextEntry(getObject(), enteredText,
- InteractionInitiatedBy.USER, localization
+ InteractionInitiatedBy.USER
);
setObject(adapter);
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
index ea411c6..d3228f2 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
@@ -136,7 +136,7 @@ public class ComponentHintKey implements Serializable {
}
protected HintStore getHintStore() {
- return IsisContext.getPersistenceSession().getServicesInjector().lookupService(HintStore.class);
+ return IsisContext.getSessionFactory().getServicesInjector().lookupService(HintStore.class);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
index 81a77ed..591873f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
@@ -45,7 +45,7 @@ public enum ActionResultResponseHandlingStrategy {
// force any changes in state etc to happen now prior to the redirect;
// in the case of an object being returned, this should cause our page mementos
// (eg EntityModel) to hold the correct state. I hope.
- IsisContext.getTransactionManager().flushTransaction();
+ IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager().flushTransaction();
// "redirect-after-post"
component.setResponsePage(resultResponse.getToPage());
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
index 6b98431..136b961 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
@@ -136,7 +136,7 @@ public enum ActionResultResponseType {
}
}
private static ObjectAdapter adapterFor(final Object pojo) {
- return IsisContext.getPersistenceSession().adapterFor(pojo);
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().adapterFor(pojo);
}
private static ActionResultResponse toEntityPage(final ActionModel model, final ObjectAdapter actualAdapter, final ConcurrencyException exIfAny) {
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
index 336f27e..6fc405c 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
@@ -93,11 +93,11 @@ public final class EntityActionLinkFactory extends ActionLinkFactoryAbstract {
// ///////////////////////////////////////////////////////////////////
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
protected AuthenticationSession getAuthenticationSession() {
- return IsisContext.getAuthenticationSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
}
}
\ No newline at end of file
[03/50] [abbrv] isis git commit: ISIS-1427: use DeploymentCategory
rather than DeploymentType throughout (except in very initial bootstrapping).
Posted by da...@apache.org.
ISIS-1427: use DeploymentCategory rather than DeploymentType throughout (except in very initial bootstrapping).
Also:
- no need for IsisInjectModel to expose DeploymentType or IsisConfiguration as @Provides @Singleton
- remove DeploymentType from IsisComponentProvider classes (plays no part), just pass to IsisSystem directly.
- allow IsisSystem to be created from a non-null AppManifest (internally creates a default IsisComponentProviderDefault2)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d02540d9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d02540d9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d02540d9
Branch: refs/heads/master
Commit: d02540d9b2af2f48ed9597163f35a06315ce48c2
Parents: 9e1f2fd
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 8 06:46:55 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 8 06:46:55 2016 +0100
----------------------------------------------------------------------
.../IsisComponentProviderDefault.java | 2 +-
.../integtestsupport/IsisSystemForTest.java | 3 +-
.../isis/tool/mavenplugin/IsisMojoAbstract.java | 6 +--
.../PersistenceMechanismInstaller.java | 4 +-
.../core/runtime/runner/IsisInjectModule.java | 50 +++++---------------
.../DeploymentCategoryProviderDefault.java | 2 +-
.../services/i18n/po/TranslationServicePo.java | 12 +++--
.../isis/core/runtime/system/IsisSystem.java | 43 ++++++++++-------
.../runtime/system/context/IsisContext.java | 8 ++--
.../system/session/IsisSessionFactory.java | 14 +++---
.../IsisComponentProvider.java | 18 ++-----
.../IsisComponentProviderDefault2.java | 8 +---
.../IsisComponentProviderUsingInstallers.java | 10 ++--
.../core/webapp/IsisWebAppBootstrapper.java | 7 +--
.../AuthenticationSessionStrategyDefault.java | 2 +-
...ataNucleusPersistenceMechanismInstaller.java | 4 +-
.../rendering/RendererContext3.java | 4 +-
.../rendering/ReprRendererAbstract.java | 16 +++----
.../conneg/IsisPrettyPrintingProcessor.java | 10 ++--
.../rendering/util/JsonWriterUtil.java | 9 ++--
.../restfulobjects/server/ResourceContext.java | 12 ++---
.../server/resources/DomainResourceHelper.java | 6 +--
.../server/resources/ResourceAbstract.java | 9 ++--
.../wicket/viewer/IsisWicketApplication.java | 6 +--
.../entityactions/EntityActionUtil.java | 9 ++--
.../components/collection/CollectionPanel.java | 13 +----
.../collection/bulk/BulkActionsHelper.java | 4 +-
.../CollectionContentsSortableDataProvider.java | 2 +-
.../entity/header/EntityHeaderPanel.java | 12 +----
.../layout/bs3/clearfix/ClearFix.java | 9 ----
.../ui/components/layout/bs3/col/Col.java | 9 ----
.../ui/components/layout/bs3/row/Row.java | 7 ---
.../components/scalars/ScalarPanelAbstract.java | 6 ---
.../scalars/ScalarPanelTextFieldAbstract.java | 2 +-
.../isisapplib/IsisBlobOrClobPanelAbstract.java | 2 +-
.../scalars/primitive/BooleanPanel.java | 2 +-
.../scalars/reference/ReferencePanel.java | 2 +-
.../FormComponentPanelAbstract.java | 2 +-
.../valuechoices/ValueChoicesSelect2Panel.java | 2 +-
.../wicket/ui/pages/entity/EntityPage.java | 7 +--
.../viewer/wicket/ui/panels/FormAbstract.java | 2 +-
41 files changed, 132 insertions(+), 225 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java
index c53005e..494b0f6 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java
@@ -37,7 +37,7 @@ public class IsisComponentProviderDefault extends IsisComponentProviderDefault2
final List<InstallableFixture> fixturesOverride,
final IsisConfiguration configurationOverride,
final MetaModelValidator metaModelValidatorOverride) {
- super(deploymentType, appManifestIfAny, servicesOverride, fixturesOverride, configurationOverride,
+ super(appManifestIfAny, servicesOverride, fixturesOverride, configurationOverride,
metaModelValidatorOverride);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/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 fcc4cd1..2c0642c 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
@@ -43,6 +43,7 @@ import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -406,7 +407,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
metaModelValidatorOverride
);
- isisSystem = new IsisSystem(componentProvider);
+ isisSystem = new IsisSystem(componentProvider, DeploymentCategory.PRODUCTION);
// ensures that a FixtureClock is installed as the singleton underpinning the ClockService
FixtureClock.initialize();
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/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 3190749..2978b27 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,10 +33,8 @@ 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.DeploymentType;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProviderDefault2;
import org.apache.isis.tool.mavenplugin.util.MavenProjects;
public abstract class IsisMojoAbstract extends AbstractMojo {
@@ -59,10 +57,8 @@ public abstract class IsisMojoAbstract extends AbstractMojo {
final Plugin plugin = MavenProjects.lookupPlugin(mavenProject, CURRENT_PLUGIN_KEY);
final AppManifest manifest = InstanceUtil.createInstance(this.appManifest, AppManifest.class);
- final IsisComponentProviderDefault2 componentProvider = new IsisComponentProviderDefault2(
- DeploymentType.UNIT_TESTING, manifest, null, null, null, null);
- final IsisSystem isisSystem = new IsisSystem(componentProvider);
+ final IsisSystem isisSystem = new IsisSystem(manifest);
try {
isisSystem.init();
if(!isisSystem.isMetaModelValid()) {
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java
index 47ccb7a..15552b1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstaller.java
@@ -20,8 +20,8 @@
package org.apache.isis.core.runtime.installerregistry.installerapi;
import org.apache.isis.core.commons.components.Installer;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
@@ -33,7 +33,7 @@ public interface PersistenceMechanismInstaller extends Installer {
static String TYPE = "persistor";
PersistenceSessionFactory createPersistenceSessionFactory(
- final DeploymentType deploymentType,
+ final DeploymentCategory deploymentCategory,
final ServicesInjector servicesInjector);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/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 4e420bf..d676e69 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
@@ -29,9 +29,8 @@ import com.google.inject.Singleton;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.fixturescripts.FixtureScript;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.runtime.system.DeploymentType;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProviderUsingInstallers;
@@ -42,7 +41,7 @@ public class IsisInjectModule extends AbstractModule {
*
* <p>
* This is bound in by default in <tt>IsisWicketModule</tt>, but is replaced with null when the system is
- * {@link #provideIsisSystem(DeploymentType, IsisConfiguration, AppManifest) created} .
+ * {@link #provideIsisSystem(AppManifest) created} .
* </p>
*/
private static final AppManifest APP_MANIFEST_NOOP = new AppManifest() {
@@ -70,41 +69,21 @@ public class IsisInjectModule extends AbstractModule {
}
};
- private final DeploymentType deploymentType;
+ private final DeploymentCategory deploymentCategory;
private final IsisConfigurationDefault isisConfiguration;
public IsisInjectModule(
- final DeploymentType deploymentType,
+ final DeploymentCategory deploymentCategory,
final IsisConfigurationDefault isisConfiguration) {
this.isisConfiguration = isisConfiguration;
- this.deploymentType = deploymentType;
+ this.deploymentCategory = deploymentCategory;
}
/**
- * As passed in or defaulted by the constructors.
+ * Allows the {@link AppManifest} to be programmatically bound in.
*/
- @SuppressWarnings("unused")
- @Provides
- @Singleton
- private DeploymentType provideDeploymentsType() {
- return deploymentType;
- }
-
- /**
- * As passed in or defaulted by the constructors.
- */
- @SuppressWarnings("unused")
- @Provides
- @Singleton
- private IsisConfiguration providesConfiguration() {
- return isisConfiguration;
- }
-
-
@Override
protected void configure() {
- requireBinding(DeploymentType.class);
- requireBinding(IsisConfiguration.class);
bind(AppManifest.class).toInstance(APP_MANIFEST_NOOP);
}
@@ -112,20 +91,14 @@ public class IsisInjectModule extends AbstractModule {
@Provides
@Inject
@Singleton
- protected IsisSystem provideIsisSystem(
- final DeploymentType deploymentType,
- final IsisConfiguration isisConfiguration,
- final AppManifest appManifestIfAny) {
+ protected IsisSystem provideIsisSystem(final AppManifest appManifestIfAny) {
+
+ final AppManifest appManifest = appManifestIfAny != APP_MANIFEST_NOOP ? appManifestIfAny : null;
final IsisComponentProviderUsingInstallers componentProvider =
- new IsisComponentProviderUsingInstallers(
- deploymentType,
- appManifestIfAny == APP_MANIFEST_NOOP
- ? null
- : appManifestIfAny,
- isisConfiguration);
+ new IsisComponentProviderUsingInstallers(isisConfiguration, appManifest);
- final IsisSystem system = new IsisSystem(componentProvider);
+ final IsisSystem system = new IsisSystem(componentProvider, deploymentCategory);
// as a side-effect, if the metamodel turns out to be invalid, then
// this will push the MetaModelInvalidException into IsisContext.
@@ -134,5 +107,4 @@ public class IsisInjectModule extends AbstractModule {
return system;
}
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java
index e57610d..f585319 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java
@@ -29,6 +29,6 @@ public class DeploymentCategoryProviderDefault implements DeploymentCategoryProv
@Programmatic
@Override
public DeploymentCategory getDeploymentCategory() {
- return IsisContext.getDeploymentType().getDeploymentCategory();
+ return IsisContext.getDeploymentCategory();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
index 64c8881..15bcf15 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
@@ -19,18 +19,21 @@
package org.apache.isis.core.runtime.services.i18n.po;
import java.util.Map;
+
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
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.i18n.LocaleProvider;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.i18n.TranslationsResolver;
-import org.apache.isis.core.runtime.system.DeploymentType;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.system.context.IsisContext;
@DomainService(
@@ -83,8 +86,7 @@ public class TranslationServicePo implements TranslationService {
}
protected boolean isPrototypeOrTest() {
- final DeploymentType deploymentType = getDeploymentType();
- return !deploymentType.isProduction();
+ return !getDeploymentCategory().isProduction();
}
@Programmatic
@@ -166,8 +168,8 @@ public class TranslationServicePo implements TranslationService {
// //////////////////////////////////////
- DeploymentType getDeploymentType() {
- return IsisContext.getDeploymentType();
+ DeploymentCategory getDeploymentCategory() {
+ return IsisContext.getDeploymentCategory();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/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 ee7c9ab..4e81765 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
@@ -27,6 +27,7 @@ import java.util.List;
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.fixtures.LogonFixture;
@@ -37,6 +38,7 @@ import org.apache.isis.applib.services.title.TitleService;
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.deployment.DeploymentCategory;
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;
@@ -58,6 +60,7 @@ import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManagerException;
import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProvider;
+import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProviderDefault2;
public class IsisSystem implements ApplicationScopedComponent {
@@ -67,32 +70,36 @@ public class IsisSystem implements ApplicationScopedComponent {
public static final String MSG_CONFIRM = "Confirm";
public static final String MSG_CANCEL = "Cancel";
- private final IsisLocaleInitializer localeInitializer;
- private final IsisTimeZoneInitializer timeZoneInitializer;
- private final DeploymentType deploymentType;
private boolean initialized = false;
private ServiceInitializer serviceInitializer;
private IsisSessionFactory sessionFactory;
- //region > constructors
+ //region > constructors, fields
private final IsisComponentProvider componentProvider;
+ private final DeploymentCategory deploymentCategory;
- public IsisSystem(IsisComponentProvider componentProvider) {
- this.deploymentType = componentProvider.getDeploymentType();
- this.localeInitializer = new IsisLocaleInitializer();
- this.timeZoneInitializer = new IsisTimeZoneInitializer();
+ private final IsisLocaleInitializer localeInitializer;
+ private final IsisTimeZoneInitializer timeZoneInitializer;
- this.componentProvider = componentProvider;
+ public IsisSystem(final AppManifest manifest) {
+ this(new IsisComponentProviderDefault2(
+ manifest, null, null, null, null), DeploymentCategory.PRODUCTION);
}
- //endregion
+ public IsisSystem(final IsisComponentProvider componentProvider, final DeploymentCategory deploymentCategory) {
+
+ this.componentProvider = componentProvider;
+ this.deploymentCategory = deploymentCategory;
+
+ this.localeInitializer = new IsisLocaleInitializer();
+ this.timeZoneInitializer = new IsisTimeZoneInitializer();
+ }
- //region > deploymentType
- public DeploymentType getDeploymentType() {
- return deploymentType;
+ public DeploymentCategory getDeploymentCategory() {
+ return deploymentCategory;
}
//endregion
@@ -131,7 +138,7 @@ public class IsisSystem implements ApplicationScopedComponent {
// 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 (!deploymentType.isProduction() && !Clock.isInitialized()) {
+ if (!getDeploymentCategory().isProduction() && !Clock.isInitialized()) {
FixtureClock.initialize();
}
@@ -156,12 +163,12 @@ public class IsisSystem implements ApplicationScopedComponent {
refiners(authenticationManager, authorizationManager,
new PersistenceSessionFactoryMetamodelRefiner());
final SpecificationLoader specificationLoader =
- componentProvider.provideSpecificationLoader(deploymentType, servicesInjector, metaModelRefiners);
+ componentProvider.provideSpecificationLoader(deploymentCategory, servicesInjector, metaModelRefiners);
servicesInjector.addFallbackIfRequired(SpecificationLoader.class, specificationLoader);
// persistenceSessionFactory
final PersistenceSessionFactory persistenceSessionFactory =
- componentProvider.providePersistenceSessionFactory(deploymentType, servicesInjector);
+ componentProvider.providePersistenceSessionFactory(deploymentCategory, servicesInjector);
servicesInjector.addFallbackIfRequired(PersistenceSessionFactory.class, persistenceSessionFactory);
// wire up components and components into services...
@@ -171,7 +178,7 @@ public class IsisSystem implements ApplicationScopedComponent {
}
// instantiate
- sessionFactory = new IsisSessionFactory(deploymentType, servicesInjector);
+ sessionFactory = new IsisSessionFactory(deploymentCategory, servicesInjector);
IsisContext.set(sessionFactory);
try {
@@ -245,7 +252,7 @@ public class IsisSystem implements ApplicationScopedComponent {
try {
// only allow logon fixtures if not in production mode.
- if (!getDeploymentType().isProduction()) {
+ if (!getDeploymentCategory().isProduction()) {
logonFixture = fixtureInstaller.getLogonFixture();
}
} finally {
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/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 71c8e25..f8596f1 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
@@ -30,11 +30,11 @@ import org.apache.isis.core.commons.authentication.MessageBroker;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.l10n.LocalizationDefault;
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.system.DeploymentType;
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.session.IsisSession;
@@ -142,10 +142,10 @@ public final class IsisContext {
/**
* Convenience method.
*
- * @see IsisSessionFactory#getDeploymentType()
+ * @see IsisSessionFactory#getDeploymentCategory()
*/
- public static DeploymentType getDeploymentType() {
- return getSessionFactory().getDeploymentType();
+ public static DeploymentCategory getDeploymentCategory() {
+ return getSessionFactory().getDeploymentCategory();
}
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/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 74d01ee..661a516 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
@@ -29,11 +29,11 @@ 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.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
-import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProviderUsingInstallers;
@@ -61,7 +61,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
//region > constructor, fields, shutdown
- private final DeploymentType deploymentType;
+ private final DeploymentCategory deploymentCategory;
private final IsisConfiguration configuration;
private final SpecificationLoader specificationLoaderSpi;
private final ServicesInjector servicesInjector;
@@ -71,11 +71,11 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
private final OidMarshaller oidMarshaller;
public IsisSessionFactory(
- final DeploymentType deploymentType,
+ final DeploymentCategory deploymentCategory,
final ServicesInjector servicesInjector) {
this.servicesInjector = servicesInjector;
- this.deploymentType = deploymentType;
+ this.deploymentCategory = deploymentCategory;
this.configuration = servicesInjector.getConfigurationServiceInternal();
this.specificationLoaderSpi = servicesInjector.getSpecificationLoader();
@@ -135,10 +135,10 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
//region > component accessors
/**
* The {@link ApplicationScopedComponent application-scoped}
- * {@link DeploymentType}.
+ * {@link DeploymentCategory}.
*/
- public DeploymentType getDeploymentType() {
- return deploymentType;
+ public DeploymentCategory getDeploymentCategory() {
+ return deploymentCategory;
}
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
index 22a946f..6cd91ce 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
@@ -47,6 +47,7 @@ import org.apache.isis.applib.services.classdiscovery.ClassDiscoveryServiceUsing
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.lang.ClassUtil;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
@@ -58,7 +59,6 @@ import org.apache.isis.core.runtime.fixtures.FixturesInstallerFromConfiguration;
import org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstaller;
import org.apache.isis.core.runtime.services.ServicesInstallerFromAnnotation;
import org.apache.isis.core.runtime.services.ServicesInstallerFromConfiguration;
-import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.IsisSystemException;
import org.apache.isis.core.runtime.system.SystemConstants;
import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
@@ -78,16 +78,13 @@ public abstract class IsisComponentProvider {
//region > constructor, fields
- private final DeploymentType deploymentType;
private final AppManifest appManifestIfAny;
private final IsisConfigurationDefault configuration;
public IsisComponentProvider(
- final DeploymentType deploymentType,
final AppManifest appManifestIfAny,
final IsisConfiguration configuration) {
- this.deploymentType = deploymentType;
this.appManifestIfAny = appManifestIfAny;
this.configuration = (IsisConfigurationDefault) configuration; // REVIEW: HACKY
@@ -102,10 +99,6 @@ public abstract class IsisComponentProvider {
}
- public DeploymentType getDeploymentType() {
- return deploymentType;
- }
-
public AppManifest getAppManifestIfAny() {
return appManifestIfAny;
}
@@ -274,24 +267,23 @@ public abstract class IsisComponentProvider {
}
public SpecificationLoader provideSpecificationLoader(
- final DeploymentType deploymentType,
+ final DeploymentCategory deploymentCategory,
final ServicesInjector servicesInjector,
final Collection<MetaModelRefiner> metaModelRefiners) throws IsisSystemException {
final SpecificationLoaderInstaller reflectorInstaller = new JavaReflectorInstaller(getConfiguration());
- return reflectorInstaller.createReflector(
- deploymentType.getDeploymentCategory(), metaModelRefiners, servicesInjector);
+ return reflectorInstaller.createReflector(deploymentCategory, metaModelRefiners, servicesInjector);
}
public PersistenceSessionFactory providePersistenceSessionFactory(
- final DeploymentType deploymentType,
+ final DeploymentCategory deploymentCategory,
final ServicesInjector servicesInjector) {
final PersistenceMechanismInstaller persistenceMechanismInstaller =
new DataNucleusPersistenceMechanismInstaller(getConfiguration());
return persistenceMechanismInstaller.createPersistenceSessionFactory(
- deploymentType, servicesInjector);
+ deploymentCategory, servicesInjector);
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
index cfcffaf..6a5dbd1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
@@ -45,7 +45,6 @@ import org.apache.isis.core.runtime.authorization.standard.AuthorizationManagerS
import org.apache.isis.core.runtime.fixtures.FixturesInstallerFromConfiguration;
import org.apache.isis.core.runtime.services.ServicesInstallerFromConfiguration;
import org.apache.isis.core.runtime.services.ServicesInstallerFromConfigurationAndAnnotation;
-import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.IsisSystemException;
import org.apache.isis.progmodels.dflt.JavaReflectorHelper;
import org.apache.isis.progmodels.dflt.ProgrammingModelFacetsJava5;
@@ -56,13 +55,12 @@ public class IsisComponentProviderDefault2 extends IsisComponentProvider {
private final MetaModelValidator metaModelValidator;
public IsisComponentProviderDefault2(
- final DeploymentType deploymentType,
final AppManifest appManifestIfAny,
final List<Object> servicesOverride,
final List<InstallableFixture> fixturesOverride,
final IsisConfiguration configurationOverride,
final MetaModelValidator metaModelValidatorOverride) {
- super(deploymentType, appManifestIfAny, elseDefault(configurationOverride));
+ super(appManifestIfAny, elseDefault(configurationOverride));
this.services = appManifestIfAny != null
? new ServicesInstallerFromConfigurationAndAnnotation(getConfiguration()).getServices()
@@ -130,12 +128,10 @@ public class IsisComponentProviderDefault2 extends IsisComponentProvider {
@Override
public SpecificationLoader provideSpecificationLoader(
- final DeploymentType deploymentType,
+ final DeploymentCategory deploymentCategory,
final ServicesInjector servicesInjector,
final Collection<MetaModelRefiner> metaModelRefiners) throws IsisSystemException {
- final DeploymentCategory deploymentCategory = deploymentType.getDeploymentCategory();
-
final List<LayoutMetadataReader> layoutMetadataReaders =
Lists.<LayoutMetadataReader>newArrayList(new LayoutMetadataReaderFromJson());
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
index 1db3e52..7137fae 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderUsingInstallers.java
@@ -42,7 +42,6 @@ import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
import org.apache.isis.core.runtime.fixtures.FixturesInstallerFromConfiguration;
import org.apache.isis.core.runtime.services.ServicesInstaller;
import org.apache.isis.core.runtime.services.ServicesInstallerFromConfigurationAndAnnotation;
-import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.SystemConstants;
@@ -55,18 +54,15 @@ public class IsisComponentProviderUsingInstallers extends IsisComponentProvider
public IsisComponentProviderUsingInstallers(
- final DeploymentType deploymentType,
- final AppManifest appManifestIfAny,
- final IsisConfiguration configuration) {
- this(deploymentType, appManifestIfAny, configuration, new InstallerLookup(configuration));
+ final IsisConfiguration configuration, final AppManifest appManifestIfAny) {
+ this(appManifestIfAny, configuration, new InstallerLookup(configuration));
}
private IsisComponentProviderUsingInstallers(
- final DeploymentType deploymentType,
final AppManifest appManifestIfAny,
final IsisConfiguration configuration,
final InstallerLookup installerLookup) {
- super(deploymentType,
+ super(
appManifestIfAny(appManifestIfAny, configuration),
configuration);
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
index 789b778..00b623a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
@@ -35,6 +35,7 @@ import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
import org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;
import org.apache.isis.core.commons.resource.ResourceStreamSourceCurrentClassClassPath;
import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
import org.apache.isis.core.runtime.runner.IsisInjectModule;
import org.apache.isis.core.runtime.runner.opts.OptionHandlerInitParameters;
@@ -90,7 +91,7 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
final IsisConfigurationDefault isisConfiguration = isisConfigurationBuilder.getConfiguration();
- injector = createGuiceInjector(isisConfiguration, deploymentType);
+ injector = createGuiceInjector(isisConfiguration, deploymentType.getDeploymentCategory());
final IsisSystem system = injector.getInstance(IsisSystem.class);
servletContext.setAttribute(WebAppConstants.ISIS_SYSTEM_KEY, system);
@@ -149,8 +150,8 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
private Injector createGuiceInjector(
final IsisConfigurationDefault isisConfiguration,
- final DeploymentType deploymentType) {
- final IsisInjectModule isisModule = new IsisInjectModule(deploymentType, isisConfiguration);
+ final DeploymentCategory deploymentCategory) {
+ final IsisInjectModule isisModule = new IsisInjectModule(deploymentCategory, isisConfiguration);
return Guice.createInjector(isisModule);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
index 5d8350a..3bb047e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
@@ -80,7 +80,7 @@ public class AuthenticationSessionStrategyDefault extends AuthenticationSessionS
final LogonFixture logonFixture = system.getLogonFixture();
// see if exploration is supported
- if (system.getDeploymentType().isExploring()) {
+ if (system.getDeploymentCategory().isExploring()) {
authSession = authenticationManager.authenticate(new AuthenticationRequestExploration(logonFixture));
if (authSession != null) {
return authSession;
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
index 2b41de3..f5d9850 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
@@ -25,10 +25,10 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.components.InstallerAbstract;
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.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.installerregistry.installerapi.PersistenceMechanismInstaller;
-import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
@@ -65,7 +65,7 @@ public class DataNucleusPersistenceMechanismInstaller extends InstallerAbstract
//region > createPersistenceSessionFactory
@Override
public PersistenceSessionFactory createPersistenceSessionFactory(
- final DeploymentType deploymentType,
+ final DeploymentCategory deploymentCategory,
final ServicesInjector servicesInjector) {
return new PersistenceSessionFactory(getConfiguration());
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext3.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext3.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext3.java
index 56f5097..8663a6a 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext3.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/RendererContext3.java
@@ -18,13 +18,13 @@
*/
package org.apache.isis.viewer.restfulobjects.rendering;
-import org.apache.isis.core.runtime.system.DeploymentType;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
/**
* TODO: roll-up in the future (introduced only so that API does not break)
*/
public interface RendererContext3 extends RendererContext2 {
- public DeploymentType getDeploymentType();
+ public DeploymentCategory getDeploymentCategory();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
index f3c2c0c..0cc3335 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
@@ -25,8 +25,8 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -43,7 +43,7 @@ public abstract class ReprRendererAbstract<R extends ReprRendererAbstract<R, T>,
protected final JsonRepresentation representation;
private final Map<String,String> mediaTypeParams = Maps.newLinkedHashMap();
- private final DeploymentType deploymentType;
+ private final DeploymentCategory deploymentCategory;
private final InteractionInitiatedBy interactionInitiatedBy;
protected boolean includesSelf;
@@ -58,15 +58,15 @@ public abstract class ReprRendererAbstract<R extends ReprRendererAbstract<R, T>,
this.representationType = representationType;
this.representation = representation;
- this.deploymentType = determineDeploymentTypeFrom(this.rendererContext);
+ this.deploymentCategory = determineDeploymentCategoryFrom(this.rendererContext);
this.interactionInitiatedBy = determineInteractionInitiatedByFrom(this.rendererContext);
}
- private static DeploymentType determineDeploymentTypeFrom(final RendererContext rendererContext) {
+ private static DeploymentCategory determineDeploymentCategoryFrom(final RendererContext rendererContext) {
if(rendererContext instanceof RendererContext3) {
- return ((RendererContext3) rendererContext).getDeploymentType();
+ return ((RendererContext3) rendererContext).getDeploymentCategory();
} else {
- return DeploymentType.SERVER; // fallback
+ return DeploymentCategory.PRODUCTION; // fallback
}
}
@@ -80,8 +80,8 @@ public abstract class ReprRendererAbstract<R extends ReprRendererAbstract<R, T>,
}
}
- protected DeploymentType getDeploymentType() {
- return deploymentType;
+ protected DeploymentCategory getDeploymentCategory() {
+ return deploymentCategory;
}
protected InteractionInitiatedBy getInteractionInitiatedBy() {
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
index e2af847..9a437f6 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
@@ -25,7 +25,7 @@ import org.jboss.resteasy.annotations.DecorateTypes;
import org.jboss.resteasy.spi.interception.DecoratorProcessor;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.system.DeploymentType;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.system.context.IsisContext;
@DecorateTypes({"text/*+xml", "application/*+xml"})
@@ -42,8 +42,8 @@ public class IsisPrettyPrintingProcessor implements DecoratorProcessor<Marshalle
protected boolean shouldPrettyPrint() {
try {
- final DeploymentType deploymentType = getDeploymentType();
- return getConfiguration().getBoolean(KEY_PRETTY_PRINT, !deploymentType.isProduction());
+ final DeploymentCategory deploymentCategory = getDeploymentCategory();
+ return getConfiguration().getBoolean(KEY_PRETTY_PRINT, !deploymentCategory.isProduction());
} catch (Exception e) {
return true;
}
@@ -58,8 +58,8 @@ public class IsisPrettyPrintingProcessor implements DecoratorProcessor<Marshalle
}
}
- protected DeploymentType getDeploymentType() {
- return IsisContext.getDeploymentType();
+ protected DeploymentCategory getDeploymentCategory() {
+ return IsisContext.getDeploymentCategory();
}
protected IsisConfiguration getConfiguration() {
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
index 7088f82..40b89a6 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.restfulobjects.rendering.util;
import java.io.IOException;
-import org.apache.isis.core.runtime.system.DeploymentType;
+
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.restfulobjects.applib.util.JsonMapper;
@@ -28,7 +29,7 @@ public final class JsonWriterUtil {
private JsonWriterUtil(){}
public static String jsonFor(final Object object) {
- final JsonMapper.PrettyPrinting prettyPrinting = inferPrettyPrinting(IsisContext.getDeploymentType());
+ final JsonMapper.PrettyPrinting prettyPrinting = inferPrettyPrinting(IsisContext.getDeploymentCategory());
try {
return JsonMapper.instance(prettyPrinting).write(object);
} catch (final IOException e) {
@@ -36,7 +37,7 @@ public final class JsonWriterUtil {
}
}
- private static JsonMapper.PrettyPrinting inferPrettyPrinting(final DeploymentType deploymentType) {
- return deploymentType.isProduction() ? JsonMapper.PrettyPrinting.DISABLE : JsonMapper.PrettyPrinting.ENABLE;
+ private static JsonMapper.PrettyPrinting inferPrettyPrinting(final DeploymentCategory deploymentCategory) {
+ return deploymentCategory.isProduction() ? JsonMapper.PrettyPrinting.DISABLE : JsonMapper.PrettyPrinting.ENABLE;
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
index 226ae18..e298c40 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext.java
@@ -43,9 +43,9 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
@@ -67,7 +67,7 @@ public class ResourceContext implements RendererContext6 {
private final HttpServletResponse httpServletResponse;
private final SecurityContext securityContext;
- private final DeploymentType deploymentType;
+ private final DeploymentCategory deploymentCategory;
private final IsisConfiguration configuration;
private final ServicesInjector servicesInjector;
private final SpecificationLoader specificationLoader;
@@ -98,7 +98,7 @@ public class ResourceContext implements RendererContext6 {
final HttpServletRequest httpServletRequest,
final HttpServletResponse httpServletResponse,
final SecurityContext securityContext,
- final DeploymentType deploymentType,
+ final DeploymentCategory deploymentCategory,
final IsisConfiguration configuration,
final ServicesInjector servicesInjector,
final SpecificationLoader specificationLoader,
@@ -123,7 +123,7 @@ public class ResourceContext implements RendererContext6 {
this.authenticationSession = authenticationSession;
this.persistenceSession = persistenceSession;
this.specificationLoader = specificationLoader;
- this.deploymentType = deploymentType;
+ this.deploymentCategory = deploymentCategory;
this.interactionInitiatedBy = interactionInitiatedBy;
init(representationType);
@@ -252,8 +252,8 @@ public class ResourceContext implements RendererContext6 {
}
@Override
- public DeploymentType getDeploymentType() {
- return deploymentType;
+ public DeploymentCategory getDeploymentCategory() {
+ return deploymentCategory;
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
index 916d500..f4b9ea4 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainResourceHelper.java
@@ -30,12 +30,12 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
@@ -104,8 +104,8 @@ public class DomainResourceHelper {
}
@Override
- public DeploymentType getDeploymentType() {
- return rendererContext.getDeploymentType();
+ public DeploymentCategory getDeploymentCategory() {
+ return rendererContext.getDeploymentCategory();
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
index eed78abd..1eb2445 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
@@ -36,13 +36,12 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.url.UrlEncodingUtils;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.ServiceUtil;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
-import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
@@ -122,7 +121,7 @@ public abstract class ResourceAbstract {
this.resourceContext = new ResourceContext(
representationType, httpHeaders, providers, uriInfo, request, where, intent, urlUnencodedQueryString, httpServletRequest, httpServletResponse,
securityContext,
- getDeploymentType(), getConfiguration(),
+ getDeploymentCategory(), getConfiguration(),
getServicesInjector(), getSpecificationLoader(),
getAuthenticationSession(), getLocalization(),
getPersistenceSession(), InteractionInitiatedBy.USER);
@@ -168,8 +167,8 @@ public abstract class ResourceAbstract {
// Dependencies (from singletons)
// //////////////////////////////////////////////////////////////
- protected DeploymentType getDeploymentType() {
- return IsisContext.getDeploymentType();
+ protected DeploymentCategory getDeploymentCategory() {
+ return IsisContext.getDeploymentCategory();
}
protected IsisConfiguration getConfiguration () {
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 50f045c..b9f0ddb 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -248,7 +248,7 @@ public class IsisWicketApplication
requestCycleListeners.add(requestCycleListenerForIsis);
requestCycleListeners.add(new PageRequestHandlerTracker());
- final IsisInjectModule isisModule = newIsisModule(deploymentType, configuration);
+ final IsisInjectModule isisModule = newIsisModule(deploymentType.getDeploymentCategory(), configuration);
final Injector injector = Guice.createInjector(isisModule, newIsisWicketModule());
initWicketComponentInjection(injector);
injector.injectMembers(this);
@@ -651,9 +651,9 @@ public class IsisWicketApplication
}
protected IsisInjectModule newIsisModule(
- final DeploymentType deploymentType,
+ final DeploymentCategory deploymentCategory,
final IsisConfigurationDefault isisConfiguration) {
- return new IsisInjectModule(deploymentType, isisConfiguration);
+ return new IsisInjectModule(deploymentCategory, isisConfiguration);
}
// //////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java
index f8f93c3..e2f99c5 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionUtil.java
@@ -57,7 +57,7 @@ public final class EntityActionUtil {
public static List<LinkAndLabel> getEntityActionLinksForAssociation(
final ScalarModel scalarModel,
- final DeploymentType deploymentType) {
+ final DeploymentCategory deploymentCategory) {
final List<LinkAndLabel> entityActions = Lists.newArrayList();
if (scalarModel.getKind() != ScalarModel.Kind.PROPERTY) {
@@ -67,7 +67,8 @@ public final class EntityActionUtil {
final EntityModel parentEntityModel = new EntityModel(parentMemento);
final OneToOneAssociation oneToOneAssociation = scalarModel.getPropertyMemento().getProperty();
- final List<ObjectAction> associatedActions = getObjectActionsForAssociation(parentEntityModel, oneToOneAssociation, deploymentType);
+ final List<ObjectAction> associatedActions = getObjectActionsForAssociation(parentEntityModel, oneToOneAssociation,
+ deploymentCategory);
entityActions.addAll(asLinkAndLabelsForAdditionalLinksPanel(parentEntityModel, associatedActions));
return entityActions;
@@ -176,11 +177,11 @@ public final class EntityActionUtil {
public static List<ObjectAction> getTopLevelActions(
final ObjectAdapter adapter,
- final DeploymentType deploymentType) {
+ final DeploymentCategory deploymentCategory) {
final List<ObjectAction> topLevelActions = Lists.newArrayList();
addTopLevelActions(adapter, ActionType.USER, topLevelActions);
- if(deploymentType.isPrototyping()) {
+ if(deploymentCategory.isPrototyping()) {
addTopLevelActions(adapter, ActionType.EXPLORATION, topLevelActions);
addTopLevelActions(adapter, ActionType.PROTOTYPE, topLevelActions);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
index d03928e..770dc93 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
@@ -29,8 +29,6 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
@@ -68,7 +66,7 @@ public class CollectionPanel extends PanelAbstract<EntityCollectionModel> implem
final EntityModel entityModel = collectionModel.getEntityModel();
final List<ObjectAction> associatedActions =
- EntityActionUtil.getObjectActionsForAssociation(entityModel, otma, getDeploymentType());
+ EntityActionUtil.getObjectActionsForAssociation(entityModel, otma, getDeploymentCategory());
entityActionLinks.addAll(
EntityActionUtil.asLinkAndLabelsForAdditionalLinksPanel(entityModel, associatedActions));
@@ -108,13 +106,4 @@ public class CollectionPanel extends PanelAbstract<EntityCollectionModel> implem
//endregion
-
- //region > dependencies
-
- protected DeploymentType getDeploymentType() {
- return IsisContext.getDeploymentType();
- }
-
- //endregion
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
index b54a4d7..db9888a 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
@@ -81,10 +81,10 @@ public class BulkActionsHelper implements Serializable {
//region > from context
public boolean isExploring() {
- return IsisContext.getDeploymentType().isExploring();
+ return IsisContext.getDeploymentCategory().isExploring();
}
public boolean isPrototyping() {
- return IsisContext.getDeploymentType().isPrototyping();
+ return IsisContext.getDeploymentCategory().isPrototyping();
}
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
index 080e5c9..5fdad19 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
@@ -191,7 +191,7 @@ public class CollectionContentsSortableDataProvider extends SortableDataProvider
}
protected DeploymentCategory getDeploymentCategory() {
- return IsisContext.getDeploymentType().getDeploymentCategory();
+ return IsisContext.getDeploymentCategory();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
index 5f382a9..02408e3 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/header/EntityHeaderPanel.java
@@ -25,8 +25,6 @@ import org.apache.wicket.Component;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
@@ -83,7 +81,7 @@ public class EntityHeaderPanel extends PanelAbstract<EntityModel> {
final EntityModel model = getModel();
final ObjectAdapter adapter = model.getObject();
if (adapter != null) {
- final List<ObjectAction> topLevelActions = EntityActionUtil.getTopLevelActions(adapter, getDeploymentType());
+ final List<ObjectAction> topLevelActions = EntityActionUtil.getTopLevelActions(adapter, getDeploymentCategory());
final List<LinkAndLabel> entityActionLinks = EntityActionUtil.asLinkAndLabelsForAdditionalLinksPanel(model, topLevelActions);
@@ -94,13 +92,5 @@ public class EntityHeaderPanel extends PanelAbstract<EntityModel> {
}
- // ///////////////////////////////////////////////
- // Dependency Injection
- // ///////////////////////////////////////////////
-
- protected DeploymentType getDeploymentType() {
- return IsisContext.getDeploymentType();
- }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.java
index 598dad3..990f3df 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/clearfix/ClearFix.java
@@ -21,8 +21,6 @@ package org.apache.isis.viewer.wicket.ui.components.layout.bs3.clearfix;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.isis.applib.layout.grid.bootstrap3.BS3ClearFix;
-import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.components.layout.bs3.Util;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
@@ -58,12 +56,5 @@ public class ClearFix extends PanelAbstract<EntityModel> {
this.addOrReplace(div);
}
- ///////////////////////////////////////////////////////
- // Dependencies (from context)
- ///////////////////////////////////////////////////////
-
- protected DeploymentType getDeploymentType() {
- return IsisContext.getDeploymentType();
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
index 53c8cae..96b796d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
@@ -43,8 +43,6 @@ import org.apache.isis.applib.layout.grid.bootstrap3.BS3TabGroup;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
@@ -316,12 +314,5 @@ public class Col extends PanelAbstract<EntityModel> implements HasDynamicallyVis
return visible;
}
- ///////////////////////////////////////////////////////
- // Dependencies (from context)
- ///////////////////////////////////////////////////////
-
- protected DeploymentType getDeploymentType() {
- return IsisContext.getDeploymentType();
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.java
index 06327b2..73cbde8 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/row/Row.java
@@ -96,12 +96,5 @@ public class Row extends PanelAbstract<EntityModel> implements HasDynamicallyVis
return visible;
}
- ///////////////////////////////////////////////////////
- // Dependencies (from context)
- ///////////////////////////////////////////////////////
-
- protected DeploymentType getDeploymentType() {
- return IsisContext.getDeploymentType();
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 90bb5b1..42a5e83 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -43,8 +43,6 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacet;
-import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.models.ActionPrompt;
import org.apache.isis.viewer.wicket.model.models.ActionPromptProvider;
@@ -415,10 +413,6 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
// ///////////////////////////////////////////////////////////////////
- protected DeploymentType getDeploymentType() {
- return IsisContext.getDeploymentType();
- }
-
@Override
public AdapterManager getAdapterManager() {
return getPersistenceSession();
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index 1985440..311e3ce 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -115,7 +115,7 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
// find the links...
- final List<LinkAndLabel> entityActions = EntityActionUtil.getEntityActionLinksForAssociation(this.scalarModel, getDeploymentType());
+ final List<LinkAndLabel> entityActions = EntityActionUtil.getEntityActionLinksForAssociation(this.scalarModel, getDeploymentCategory());
addPositioningCssTo(labelIfRegular, entityActions);
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
index 03ced44..01b79e9 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
@@ -98,7 +98,7 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
labelIfRegular.add(scalarName);
// find the links...
- final List<LinkAndLabel> entityActions = EntityActionUtil.getEntityActionLinksForAssociation(this.scalarModel, getDeploymentType());
+ final List<LinkAndLabel> entityActions = EntityActionUtil.getEntityActionLinksForAssociation(this.scalarModel, getDeploymentCategory());
addPositioningCssTo(labelIfRegular, entityActions);
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
index a58233b..75f766e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
@@ -90,7 +90,7 @@ public class BooleanPanel extends ScalarPanelAbstract {
scalarName.setEscapeModelStrings(namedFacet.escaped());
}
- final List<LinkAndLabel> entityActions = EntityActionUtil.getEntityActionLinksForAssociation(this.scalarModel, getDeploymentType());
+ final List<LinkAndLabel> entityActions = EntityActionUtil.getEntityActionLinksForAssociation(this.scalarModel, getDeploymentCategory());
addPositioningCssTo(labelIfRegular, entityActions);
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index 36759f8..fea7da6 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -145,7 +145,7 @@ public class ReferencePanel extends ScalarPanelAbstract {
}
// find the links...
- final List<LinkAndLabel> entityActions = EntityActionUtil.getEntityActionLinksForAssociation(this.scalarModel, getDeploymentType());
+ final List<LinkAndLabel> entityActions = EntityActionUtil.getEntityActionLinksForAssociation(this.scalarModel, getDeploymentCategory());
addPositioningCssTo(labelIfRegular, entityActions);
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
index e340d72..8b65cfc 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
@@ -138,7 +138,7 @@ public abstract class FormComponentPanelAbstract<T> extends FormComponentPanel<T
}
public DeploymentCategory getDeploymentCategory() {
- return IsisContext.getDeploymentType().getDeploymentCategory();
+ return IsisContext.getDeploymentCategory();
}
// ///////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
index 81c4b05..84b170e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
@@ -102,7 +102,7 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
}
// find the links...
- final List<LinkAndLabel> entityActions = EntityActionUtil.getEntityActionLinksForAssociation(this.scalarModel, getDeploymentType());
+ final List<LinkAndLabel> entityActions = EntityActionUtil.getEntityActionLinksForAssociation(this.scalarModel, getDeploymentCategory());
addPositioningCssTo(labelIfRegular, entityActions);
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
index 79eab8c..d011c5c 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
@@ -36,7 +36,6 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facets.object.grid.GridFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
@@ -196,12 +195,8 @@ public class EntityPage extends PageAbstract {
addBookmarkedPages(entityPageContainer);
}
- private DeploymentType getDeploymentType() {
- return IsisContext.getDeploymentType();
- }
-
protected DeploymentCategory getDeploymentCategory() {
- return getDeploymentType().getDeploymentCategory();
+ return IsisContext.getDeploymentCategory();
}
[35/50] [abbrv] isis git commit: ISIS-1436: fixing behaviour of
toggling when 'showAll' is invoked
Posted by da...@apache.org.
ISIS-1436: fixing behaviour of toggling when 'showAll' is invoked
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/df8cad24
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/df8cad24
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/df8cad24
Branch: refs/heads/master
Commit: df8cad24e1cc70de485e0e80ae97d9eecde65f26
Parents: 7dd5042
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Jun 14 20:24:20 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Jun 14 20:24:20 2016 +0100
----------------------------------------------------------------------
.../collection/bulk/BulkActionsLinkFactory.java | 1 +
.../CollectionContentsAsAjaxTablePanel.java | 5 ++---
.../CollectionContentsSortableDataProvider.java | 6 ++++--
.../ajaxtable/IsisAjaxFallbackDataTable.java | 19 ++++++++++++-------
.../IsisAjaxFallbackHeadersToolbar.java | 12 ++++++------
.../ajaxtable/IsisAjaxNavigationToolbar.java | 13 ++++++++++++-
.../checkbox/ContainedToggleboxPanel.java | 3 ++-
7 files changed, 39 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/df8cad24/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
index 4a99c7a..0122148 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
@@ -150,6 +150,7 @@ public final class BulkActionsLinkFactory implements ActionLinkFactory {
model.clearToggleMementosList();
toggleboxColumn.clearToggles();
+
final ActionModel actionModel = model.getActionModelHint();
if(actionModel != null && actionModel.getActionMemento().getAction(getSpecificationLoader()).getSemantics().isIdempotentInNature()) {
ObjectAdapter resultAdapter = actionModel.getObject();
http://git-wip-us.apache.org/repos/asf/isis/blob/df8cad24/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index ece85d6..d37b8e5 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -27,7 +27,6 @@ import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.model.Model;
import org.apache.isis.applib.annotation.Where;
@@ -100,8 +99,8 @@ public class CollectionContentsAsAjaxTablePanel
addTitleColumn(columns, model.getParentObjectAdapterMemento(), getSettings().getMaxTitleLengthInStandaloneTables(), getSettings().getMaxTitleLengthInStandaloneTables());
addPropertyColumnsIfRequired(columns);
- final SortableDataProvider<ObjectAdapter,String> dataProvider = new CollectionContentsSortableDataProvider(model);
- dataTable = new IsisAjaxFallbackDataTable<>(ID_TABLE, columns, dataProvider, model.getPageSize());
+ final CollectionContentsSortableDataProvider dataProvider = new CollectionContentsSortableDataProvider(model);
+ dataTable = new IsisAjaxFallbackDataTable<>(ID_TABLE, columns, dataProvider, model.getPageSize(), toggleboxColumn);
addOrReplace(dataTable);
dataTable.honourHints();
http://git-wip-us.apache.org/repos/asf/isis/blob/df8cad24/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
index a41acd0..0c2b36e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
@@ -36,14 +36,12 @@ import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
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.interactions.InteractionUtils;
import org.apache.isis.core.metamodel.interactions.ObjectVisibilityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
@@ -76,6 +74,10 @@ public class CollectionContentsSortableDataProvider extends SortableDataProvider
model.detach();
}
+ public EntityCollectionModel getEntityCollectionModel() {
+ return model;
+ }
+
@Override
public Iterator<ObjectAdapter> iterator(final long first, final long count) {
http://git-wip-us.apache.org/repos/asf/isis/blob/df8cad24/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java
index 813e8f8..3841ec8 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackDataTable.java
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.event.Broadcast;
import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
@@ -39,9 +38,9 @@ import org.apache.wicket.util.lang.Generics;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.viewer.wicket.model.hints.IsisSelectorEvent;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterToggleboxColumn;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
public class IsisAjaxFallbackDataTable<T, S> extends DataTable<T, S> {
@@ -50,16 +49,22 @@ public class IsisAjaxFallbackDataTable<T, S> extends DataTable<T, S> {
static final String UIHINT_PAGE_NUMBER = "pageNumber";
- private final ISortableDataProvider<T, S> dataProvider;
+ private final CollectionContentsSortableDataProvider dataProvider;
+ private final ObjectAdapterToggleboxColumn toggleboxColumn;
private IsisAjaxFallbackHeadersToolbar<S> headersToolbar;
private IsisAjaxNavigationToolbar navigationToolbar;
- public IsisAjaxFallbackDataTable(final String id, final List<? extends IColumn<T, S>> columns,
- final ISortableDataProvider<T, S> dataProvider, final int rowsPerPage)
+ public IsisAjaxFallbackDataTable(
+ final String id,
+ final List<? extends IColumn<T, S>> columns,
+ final CollectionContentsSortableDataProvider dataProvider,
+ final int rowsPerPage,
+ final ObjectAdapterToggleboxColumn toggleboxColumn)
{
- super(id, columns, dataProvider, rowsPerPage);
+ super(id, columns, (ISortableDataProvider<T, S>)dataProvider, rowsPerPage);
this.dataProvider = dataProvider;
+ this.toggleboxColumn = toggleboxColumn;
setOutputMarkupId(true);
setVersioned(false);
setItemReuseStrategy(new PreserveModelReuseStrategy());
@@ -75,7 +80,7 @@ public class IsisAjaxFallbackDataTable<T, S> extends DataTable<T, S> {
headersToolbar = new IsisAjaxFallbackHeadersToolbar<>(this, this.dataProvider);
addTopToolbar(headersToolbar);
- navigationToolbar = new IsisAjaxNavigationToolbar(this);
+ navigationToolbar = new IsisAjaxNavigationToolbar(this, this.toggleboxColumn);
addBottomToolbar(navigationToolbar);
addBottomToolbar(new NoRecordsToolbar(this));
http://git-wip-us.apache.org/repos/asf/isis/blob/df8cad24/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackHeadersToolbar.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackHeadersToolbar.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackHeadersToolbar.java
index 82d6e83..425a6da 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackHeadersToolbar.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxFallbackHeadersToolbar.java
@@ -31,12 +31,14 @@ import org.apache.isis.viewer.wicket.model.models.EntityModel;
public class IsisAjaxFallbackHeadersToolbar<S> extends IsisAjaxHeadersToolbar<S>
{
private static final long serialVersionUID = 1L;
- private final ISortStateLocator<S> stateLocator;
+ private final CollectionContentsSortableDataProvider stateLocator;
private IsisAjaxFallbackDataTable<?, S> table;
- public IsisAjaxFallbackHeadersToolbar(final IsisAjaxFallbackDataTable<?, S> table, final ISortStateLocator<S> stateLocator)
+ public IsisAjaxFallbackHeadersToolbar(
+ final IsisAjaxFallbackDataTable<?, S> table,
+ final CollectionContentsSortableDataProvider stateLocator)
{
- super(table, stateLocator);
+ super(table, (ISortStateLocator<S>)stateLocator);
this.table = table;
table.setOutputMarkupId(true);
this.stateLocator = stateLocator;
@@ -77,9 +79,7 @@ public class IsisAjaxFallbackHeadersToolbar<S> extends IsisAjaxHeadersToolbar<S>
for (SortOrder sortOrder : SortOrder.values()) {
String property = uiHintContainer.getHint(table, sortOrder.name());
if(property != null) {
- // bit hacky... how know this cast is safe?
- S propertyS = (S) property;
- stateLocator.getSortState().setPropertySortOrder(propertyS, sortOrder);
+ stateLocator.getSortState().setPropertySortOrder(property, sortOrder);
}
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/df8cad24/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
index 1442072..be3c96e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/IsisAjaxNavigationToolbar.java
@@ -24,7 +24,9 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
+import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterToggleboxColumn;
public class IsisAjaxNavigationToolbar extends AjaxNavigationToolbar {
@@ -32,9 +34,11 @@ public class IsisAjaxNavigationToolbar extends AjaxNavigationToolbar {
private static final String ID_SHOW_ALL = "showAll";
private static final String HINT_KEY_SHOW_ALL = "showAll";
+ private final ObjectAdapterToggleboxColumn toggleboxColumn;
- public IsisAjaxNavigationToolbar(final DataTable<?, ?> table) {
+ public IsisAjaxNavigationToolbar(final DataTable<?, ?> table, final ObjectAdapterToggleboxColumn toggleboxColumn) {
super(table);
+ this.toggleboxColumn = toggleboxColumn;
addShowAllButton(table);
}
@@ -46,6 +50,13 @@ public class IsisAjaxNavigationToolbar extends AjaxNavigationToolbar {
@Override
public void onClick(AjaxRequestTarget target) {
showAllItemsOn(table);
+
+ final DataTable<?, ?> dataTable = getTable();
+ final CollectionContentsSortableDataProvider dataProvider = (CollectionContentsSortableDataProvider) dataTable.getDataProvider();
+ final EntityCollectionModel collectionModel = dataProvider.getEntityCollectionModel();
+ collectionModel.clearToggleMementosList();
+ toggleboxColumn.clearToggles();
+
final UiHintContainer hintContainer = getUiHintContainer();
if(hintContainer != null) {
hintContainer.setHint(table, HINT_KEY_SHOW_ALL, "true");
http://git-wip-us.apache.org/repos/asf/isis/blob/df8cad24/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
index af2ea6c..d3676e3 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/checkbox/ContainedToggleboxPanel.java
@@ -53,7 +53,7 @@ public class ContainedToggleboxPanel extends PanelAbstract<Model<Boolean>> {
@Override
protected void onUpdate(AjaxRequestTarget target) {
- ContainedToggleboxPanel.this.onSubmit(target);
+ ContainedToggleboxPanel.this.toggle(target);
}
};
form.add(checkbox);
@@ -77,6 +77,7 @@ public class ContainedToggleboxPanel extends PanelAbstract<Model<Boolean>> {
*/
public void toggle(AjaxRequestTarget target) {
checkbox.setModelObject(!checkbox.getModelObject());
+ final boolean checkboxValue = checkbox.getModelObject();
onSubmit(target);
}
[34/50] [abbrv] isis git commit: ISIS-1418: allows @Nullable to be
annotated on either properties or parameters.
Posted by da...@apache.org.
ISIS-1418: allows @Nullable to be annotated on either properties or parameters.
The appropriate facet is installed, and a MetaModelValidator is used to check that there are no conflicting annotations (ie @Mandatory vs @Nullable vs @Optional vs @Property#optionality or @Parameter#optionality).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7dd5042d
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7dd5042d
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7dd5042d
Branch: refs/heads/master
Commit: 7dd5042d117cbd55a6af3ba52c0f0a4c9ce27bb4
Parents: bd447a2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Jun 14 07:15:44 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Jun 14 07:15:44 2016 +0100
----------------------------------------------------------------------
.../isis/core/commons/lang/ArrayExtensions.java | 8 +--
.../isis/core/metamodel/facets/Annotations.java | 1 +
.../ParameterAnnotationFacetFactory.java | 34 +++++++---
...InvertedByNullableAnnotationOnParameter.java | 53 ++++++++++++++++
.../PropertyAnnotationFacetFactory.java | 43 +++++++++----
...tInvertedByNullableAnnotationOnProperty.java | 55 ++++++++++++++++
.../validator/MetaModelValidatorAbstract.java | 2 -
...ModelValidatorForConflictingOptionality.java | 66 ++++++++++++++++++++
...toryFromJdoColumnAnnotationFacetFactory.java | 2 +-
9 files changed, 239 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7dd5042d/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ArrayExtensions.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ArrayExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ArrayExtensions.java
index dfc692d..f4b611c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ArrayExtensions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ArrayExtensions.java
@@ -123,10 +123,10 @@ public final class ArrayExtensions {
return list;
}
- public static <T> T coalesce(final T... strings) {
- for (final T str : strings) {
- if (str != null) {
- return str;
+ public static <T> T coalesce(final T... objects) {
+ for (final T object : objects) {
+ if (object != null) {
+ return object;
}
}
return null;
http://git-wip-us.apache.org/repos/asf/isis/blob/7dd5042d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java
index aa17a4c..f1e2d40 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/Annotations.java
@@ -280,6 +280,7 @@ public final class Annotations {
Collection.class,
CollectionLayout.class,
MemberOrder.class,
+ javax.annotation.Nullable.class,
Title.class,
javax.jdo.annotations.Column.class
)
http://git-wip-us.apache.org/repos/asf/isis/blob/7dd5042d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
index 4518e94..a54bd02 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/ParameterAnnotationFacetFactory.java
@@ -22,6 +22,8 @@ package org.apache.isis.core.metamodel.facets.param.parameter;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
+import javax.annotation.Nullable;
+
import org.apache.isis.applib.annotation.MaxLength;
import org.apache.isis.applib.annotation.MustSatisfy;
import org.apache.isis.applib.annotation.Optional;
@@ -35,9 +37,11 @@ import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
+import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.regex.RegExFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.regex.TitleFacetFormattedByRegex;
import org.apache.isis.core.metamodel.facets.param.parameter.mandatory.MandatoryFacetForParameterAnnotation;
+import org.apache.isis.core.metamodel.facets.param.parameter.mandatory.MandatoryFacetInvertedByNullableAnnotationOnParameter;
import org.apache.isis.core.metamodel.facets.param.parameter.mandatory.MandatoryFacetInvertedByOptionalAnnotationOnParameter;
import org.apache.isis.core.metamodel.facets.param.parameter.maxlen.MaxLengthFacetForMaxLengthAnnotationOnParameter;
import org.apache.isis.core.metamodel.facets.param.parameter.maxlen.MaxLengthFacetForParameterAnnotation;
@@ -47,6 +51,7 @@ import org.apache.isis.core.metamodel.facets.param.parameter.regex.RegExFacetFor
import org.apache.isis.core.metamodel.facets.param.parameter.regex.RegExFacetFromRegExAnnotationOnParameter;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForConflictingOptionality;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
public class ParameterAnnotationFacetFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
@@ -55,6 +60,7 @@ public class ParameterAnnotationFacetFactory extends FacetFactoryAbstract implem
private final MetaModelValidatorForDeprecatedAnnotation mustSatisfyValidator = new MetaModelValidatorForDeprecatedAnnotation(MustSatisfy.class);
private final MetaModelValidatorForDeprecatedAnnotation regexValidator = new MetaModelValidatorForDeprecatedAnnotation(RegEx.class);
private final MetaModelValidatorForDeprecatedAnnotation optionalValidator = new MetaModelValidatorForDeprecatedAnnotation(Optional.class);
+ private final MetaModelValidatorForConflictingOptionality conflictingOptionalityValidator = new MetaModelValidatorForConflictingOptionality();
public ParameterAnnotationFacetFactory() {
super(FeatureType.PARAMETERS_ONLY);
@@ -177,9 +183,21 @@ public class ParameterAnnotationFacetFactory extends FacetFactoryAbstract implem
final Class<?> parameterType = parameterTypes[paramNum];
if (parameterAnnotation instanceof Optional) {
final Optional annotation = (Optional) parameterAnnotation;
- final Facet facet = MandatoryFacetInvertedByOptionalAnnotationOnParameter.create(annotation, parameterType, holder);
- FacetUtil.addFacet(optionalValidator.flagIfPresent(facet, processParameterContext));
- return;
+ FacetUtil.addFacet(optionalValidator.flagIfPresent(
+ MandatoryFacetInvertedByOptionalAnnotationOnParameter.create(
+ annotation, parameterType, holder), processParameterContext));
+ }
+ }
+
+ for (final Annotation parameterAnnotation : parameterAnnotations) {
+ final Class<?> parameterType = parameterTypes[paramNum];
+ if (parameterAnnotation instanceof javax.annotation.Nullable) {
+ final Nullable annotation = (Nullable) parameterAnnotation;
+ final MandatoryFacet facet =
+ MandatoryFacetInvertedByNullableAnnotationOnParameter.create(annotation, parameterType, holder);
+ FacetUtil.addFacet(facet);
+ conflictingOptionalityValidator.flagIfConflict(
+ facet, "Conflicting @Nullable with other optionality annotation");
}
}
@@ -187,9 +205,11 @@ public class ParameterAnnotationFacetFactory extends FacetFactoryAbstract implem
if (parameterAnnotation instanceof Parameter) {
final Parameter parameter = (Parameter) parameterAnnotation;
final Class<?> parameterType = parameterTypes[paramNum];
- FacetUtil.addFacet(
- MandatoryFacetForParameterAnnotation.create(parameter, parameterType, holder));
- return;
+ final MandatoryFacet facet =
+ MandatoryFacetForParameterAnnotation.create(parameter, parameterType, holder);
+ FacetUtil.addFacet(facet);
+ conflictingOptionalityValidator.flagIfConflict(
+ facet, "Conflicting @Parameter#optionality with other optionality annotation");
}
}
}
@@ -200,9 +220,9 @@ public class ParameterAnnotationFacetFactory extends FacetFactoryAbstract implem
metaModelValidator.add(mustSatisfyValidator);
metaModelValidator.add(regexValidator);
metaModelValidator.add(optionalValidator);
+ metaModelValidator.add(conflictingOptionalityValidator);
}
-
@Override
public void setServicesInjector(final ServicesInjector servicesInjector) {
super.setServicesInjector(servicesInjector);
http://git-wip-us.apache.org/repos/asf/isis/blob/7dd5042d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mandatory/MandatoryFacetInvertedByNullableAnnotationOnParameter.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mandatory/MandatoryFacetInvertedByNullableAnnotationOnParameter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mandatory/MandatoryFacetInvertedByNullableAnnotationOnParameter.java
new file mode 100644
index 0000000..a1dc49d
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/parameter/mandatory/MandatoryFacetInvertedByNullableAnnotationOnParameter.java
@@ -0,0 +1,53 @@
+/*
+ * 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.metamodel.facets.param.parameter.mandatory;
+
+import javax.annotation.Nullable;
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetedMethodParameter;
+import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacetAbstract;
+
+/**
+ * Derived by presence of an {@link Nullable} annotation on parameter.
+ *
+ * <p>
+ * This implementation indicates that the {@link FacetHolder} is <i>not</i>
+ * mandatory, as per {@link #isInvertedSemantics()}.
+ */
+public class MandatoryFacetInvertedByNullableAnnotationOnParameter extends MandatoryFacetAbstract {
+
+ public static MandatoryFacet create(final Nullable annotation, final Class<?> parameterType, final FacetedMethodParameter holder) {
+ if(annotation == null) {
+ return null;
+ }
+ if(parameterType.isPrimitive()) {
+ return null;
+ }
+ return new MandatoryFacetInvertedByNullableAnnotationOnParameter(holder);
+ }
+
+ private MandatoryFacetInvertedByNullableAnnotationOnParameter(final FacetHolder holder) {
+ super(holder, Semantics.OPTIONAL);
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/7dd5042d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
index 76f1f32..82989f4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactory.java
@@ -21,6 +21,8 @@ package org.apache.isis.core.metamodel.facets.properties.property;
import java.lang.reflect.Method;
+import javax.annotation.Nullable;
+
import org.apache.isis.applib.annotation.Disabled;
import org.apache.isis.applib.annotation.Hidden;
import org.apache.isis.applib.annotation.Mandatory;
@@ -60,6 +62,7 @@ import org.apache.isis.core.metamodel.facets.properties.property.hidden.HiddenFa
import org.apache.isis.core.metamodel.facets.properties.property.hidden.HiddenFacetForPropertyAnnotation;
import org.apache.isis.core.metamodel.facets.properties.property.mandatory.MandatoryFacetForMandatoryAnnotationOnProperty;
import org.apache.isis.core.metamodel.facets.properties.property.mandatory.MandatoryFacetForPropertyAnnotation;
+import org.apache.isis.core.metamodel.facets.properties.property.mandatory.MandatoryFacetInvertedByNullableAnnotationOnProperty;
import org.apache.isis.core.metamodel.facets.properties.property.mandatory.MandatoryFacetInvertedByOptionalAnnotationOnProperty;
import org.apache.isis.core.metamodel.facets.properties.property.maxlength.MaxLengthFacetForMaxLengthAnnotationOnProperty;
import org.apache.isis.core.metamodel.facets.properties.property.maxlength.MaxLengthFacetForPropertyAnnotation;
@@ -87,6 +90,7 @@ import org.apache.isis.core.metamodel.facets.properties.update.clear.PropertyCle
import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySetterFacet;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForConflictingOptionality;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
import org.apache.isis.core.metamodel.util.EventUtil;
@@ -102,6 +106,8 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme
private final MetaModelValidatorForDeprecatedAnnotation maxLengthValidator = new MetaModelValidatorForDeprecatedAnnotation(MaxLength.class);
private final MetaModelValidatorForDeprecatedAnnotation mustSatisfyValidator = new MetaModelValidatorForDeprecatedAnnotation(MustSatisfy.class);
private final MetaModelValidatorForDeprecatedAnnotation notPersistedValidator = new MetaModelValidatorForDeprecatedAnnotation(NotPersisted.class);
+ private final MetaModelValidatorForConflictingOptionality conflictingOptionalityValidator = new MetaModelValidatorForConflictingOptionality();
+
public PropertyAnnotationFacetFactory() {
super(FeatureType.PROPERTIES_AND_ACTIONS);
@@ -386,23 +392,37 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme
final FacetHolder holder = processMethodContext.getFacetHolder();
- // check for deprecated @Optional first
+ // check for deprecated @Optional
final Optional optionalAnnotation = Annotations.getAnnotation(method, Optional.class);
- MandatoryFacet facet = optionalValidator.flagIfPresent(MandatoryFacetInvertedByOptionalAnnotationOnProperty.create(optionalAnnotation, method, holder), processMethodContext);
+ FacetUtil.addFacet(
+ optionalValidator.flagIfPresent(
+ MandatoryFacetInvertedByOptionalAnnotationOnProperty.create(optionalAnnotation, method, holder),
+ processMethodContext));
- // else check for deprecated @Mandatory first
+ // check for deprecated @Mandatory
final Mandatory mandatoryAnnotation = Annotations.getAnnotation(method, Mandatory.class);
- if(facet == null) {
- facet = mandatoryValidator.flagIfPresent(MandatoryFacetForMandatoryAnnotationOnProperty.create(mandatoryAnnotation, holder), processMethodContext);
- }
+ final MandatoryFacet facet =
+ mandatoryValidator.flagIfPresent(
+ MandatoryFacetForMandatoryAnnotationOnProperty.create(mandatoryAnnotation, holder),
+ processMethodContext);
+ FacetUtil.addFacet(facet);
+ conflictingOptionalityValidator.flagIfConflict(
+ facet, "Conflicting @Mandatory with other optionality annotation");
+
+ // else check for @Nullable
+ final Nullable nullableAnnotation = Annotations.getAnnotation(method, Nullable.class);
+ final MandatoryFacet facet2 =
+ MandatoryFacetInvertedByNullableAnnotationOnProperty.create(nullableAnnotation, method, holder);
+ FacetUtil.addFacet(facet2);
+ conflictingOptionalityValidator.flagIfConflict(
+ facet2, "Conflicting @Nullable with other optionality annotation");
// else search for @Property(optional=...)
final Property property = Annotations.getAnnotation(method, Property.class);
- if(facet == null) {
- facet = MandatoryFacetForPropertyAnnotation.create(property, method, holder);
- }
-
- FacetUtil.addFacet(facet);
+ final MandatoryFacet facet3 = MandatoryFacetForPropertyAnnotation.create(property, method, holder);
+ FacetUtil.addFacet(facet3);
+ conflictingOptionalityValidator.flagIfConflict(
+ facet3, "Conflicting Property#optionality with other optionality annotation");
}
void processRegEx(final ProcessMethodContext processMethodContext) {
@@ -444,6 +464,7 @@ public class PropertyAnnotationFacetFactory extends FacetFactoryAbstract impleme
metaModelValidator.add(maxLengthValidator);
metaModelValidator.add(mustSatisfyValidator);
metaModelValidator.add(notPersistedValidator);
+ metaModelValidator.add(conflictingOptionalityValidator);
}
// //////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/7dd5042d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mandatory/MandatoryFacetInvertedByNullableAnnotationOnProperty.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mandatory/MandatoryFacetInvertedByNullableAnnotationOnProperty.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mandatory/MandatoryFacetInvertedByNullableAnnotationOnProperty.java
new file mode 100644
index 0000000..dbac2d5
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/property/mandatory/MandatoryFacetInvertedByNullableAnnotationOnProperty.java
@@ -0,0 +1,55 @@
+/*
+ * 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.metamodel.facets.properties.property.mandatory;
+
+import java.lang.reflect.Method;
+
+import javax.annotation.Nullable;
+
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacetAbstract;
+
+/**
+ * Derived by presence of an {@link Nullable} annotation.
+ *
+ * <p>
+ * This implementation indicates that the {@link FacetHolder} is <i>not</i>
+ * mandatory, as per {@link #isInvertedSemantics()}.
+ */
+public class MandatoryFacetInvertedByNullableAnnotationOnProperty extends MandatoryFacetAbstract {
+
+ public MandatoryFacetInvertedByNullableAnnotationOnProperty(final FacetHolder holder) {
+ super(holder, Semantics.OPTIONAL);
+ }
+
+ public static MandatoryFacet create(final Nullable annotation, Method method, final FacetHolder holder) {
+
+ if(annotation == null) {
+ return null;
+ }
+
+ final Class<?> returnType = method.getReturnType();
+ if (returnType.isPrimitive()) {
+ return null;
+ }
+ return new MandatoryFacetInvertedByNullableAnnotationOnProperty(holder);
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/7dd5042d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorAbstract.java
index bde6490..9e492c9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorAbstract.java
@@ -33,6 +33,4 @@ public abstract class MetaModelValidatorAbstract implements MetaModelValidator {
@Override
public void shutdown() {
}
-
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/7dd5042d/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForConflictingOptionality.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForConflictingOptionality.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForConflictingOptionality.java
new file mode 100644
index 0000000..514d1ea
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/validator/MetaModelValidatorForConflictingOptionality.java
@@ -0,0 +1,66 @@
+/*
+ * 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.metamodel.specloader.validator;
+
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
+import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacet;
+import org.apache.isis.core.metamodel.facets.objectvalue.mandatory.MandatoryFacetDefault;
+
+public class MetaModelValidatorForConflictingOptionality extends MetaModelValidatorAbstract {
+
+ private final ValidationFailures failures = new ValidationFailures();
+
+ public MetaModelValidatorForConflictingOptionality() {
+ }
+
+ @Override
+ public void validate(final ValidationFailures validationFailures) {
+ validationFailures.addAll(failures);
+ }
+
+ private Facet addFailure(final Facet facet, final String message) {
+ if(facet != null) {
+ failures.add(message + ": " + ((IdentifiedHolder) facet.getFacetHolder()).getIdentifier().toFullIdentityString());
+ }
+ return facet;
+ }
+
+ public Facet flagIfConflict(final MandatoryFacet facet, final String message) {
+ if(conflictingOptionality(facet)) {
+ addFailure(facet, message);
+ }
+ return facet;
+ }
+
+ private static boolean conflictingOptionality(final MandatoryFacet facet) {
+ if (facet == null) {
+ return false;
+ }
+ final MandatoryFacet underlyingFacet = (MandatoryFacet) facet.getUnderlyingFacet();
+ if(underlyingFacet instanceof MandatoryFacetDefault) {
+ return false;
+ }
+ final boolean conflicting =
+ underlyingFacet != null && facet.isInvertedSemantics() != underlyingFacet.isInvertedSemantics();
+ return conflicting;
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/7dd5042d/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
index 9cd9173..89332b0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java
@@ -113,7 +113,7 @@ public class MandatoryFromJdoColumnAnnotationFacetFactory extends FacetFactoryAb
// per JDO spec
return returnType != null && returnType.isPrimitive();
} else {
- return "false".equalsIgnoreCase(allowsNull.trim());
+ return !"true".equalsIgnoreCase(allowsNull.trim()); // if mis-spelt, then DN assumes is not-nullable
}
}
[19/50] [abbrv] isis git commit: ISIS-1427: renames methods in
IsisSystemForTest,
rationalizes functionality between IsisSystem and IsisSessionFactory
Posted by da...@apache.org.
ISIS-1427: renames methods in IsisSystemForTest, rationalizes functionality between IsisSystem and IsisSessionFactory
The intent being that IsisSystem is just a builder for IsisSessionFactory. The responsibility for calling @PostConstruct and @PreDestroy was held by IsisSystem, meaning that it was necessary to call both shutdown on IsisSessionFactory and then on IsisSystem. Moving the responsibility for services initialization/destroy into IsisSessionFactory therefore simplifies the callers; there is no need to hold onto the IsisSystem, just use the IsisSessionFactory.
As part of this the DeploymentCategoryProviderDefault is now a fallback service, added into ServicesInjector prior to init'ing the guice IsisInjectModel (which creates the IsisSystem and thence IsisSessionFactory).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/346a1534
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/346a1534
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/346a1534
Branch: refs/heads/master
Commit: 346a153407029766b30c132b0b40298fb6b6acd2
Parents: 5d91852
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jun 10 11:11:12 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jun 10 11:11:12 2016 +0100
----------------------------------------------------------------------
.../IntegrationTestAbstract.java | 4 +-
.../integtestsupport/IsisSystemForTest.java | 280 ++++++-------------
.../isis/tool/mavenplugin/IsisMojoAbstract.java | 17 +-
.../isis/tool/mavenplugin/IsisMojoSwagger.java | 6 +-
.../isis/tool/mavenplugin/IsisMojoValidate.java | 8 +-
.../isis/tool/mavenplugin/IsisMojoXsd.java | 6 +-
.../specloader/SpecificationLoader.java | 5 +-
.../specimpl/ObjectSpecificationAbstract.java | 7 +-
.../progmodels/dflt/JavaReflectorHelper.java | 5 +-
.../SpecificationLoaderTestAbstract.java | 3 +-
.../runtime/fixtures/FixturesInstaller.java | 48 ----
.../fixtures/FixturesInstallerAbstract.java | 25 +-
.../fixtures/FixturesInstallerDelegate.java | 151 +++-------
.../FixturesInstallerFromConfiguration.java | 12 +-
.../core/runtime/runner/IsisInjectModule.java | 40 +--
.../DeploymentCategoryProviderDefault.java | 15 +-
.../core/runtime/services/package-info.java | 26 --
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 21 +-
.../AbstractIsisSessionTemplate.java | 24 +-
.../isis/core/runtime/system/IsisSystem.java | 167 ++---------
.../runtime/system/context/IsisContext.java | 11 -
.../system/session/IsisSessionFactory.java | 151 +++++++++-
.../IsisComponentProvider.java | 13 +-
.../core/webapp/IsisWebAppBootstrapper.java | 8 +-
.../AuthenticationSessionStrategyDefault.java | 2 +-
.../IsisTransactionFilterForRestfulObjects.java | 21 +-
.../wicket/viewer/IsisWicketApplication.java | 16 +-
.../password_reset/PasswordResetPanel.java | 21 +-
.../bootstrap/DomainAppSystemInitializer.java | 2 +-
29 files changed, 436 insertions(+), 679 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java
index ce7a929..c9ee2ea 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IntegrationTestAbstract.java
@@ -212,9 +212,9 @@ public abstract class IntegrationTestAbstract {
try {
base.evaluate();
isft.endTran();
- isft.bounceSystem();
+ isft.nextSession();
} catch(final Throwable e) {
- isft.bounceSystem();
+ isft.nextSession();
final List<Throwable> causalChain = Throwables.getCausalChain(e);
// if underlying cause is an applib-defined exception, throw that rather than Isis' wrapper exception
for (final Throwable cause : causalChain) {
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/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 b6d893c..6df861a 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
@@ -24,7 +24,6 @@ import java.util.Set;
import com.google.common.collect.Lists;
-import org.junit.After;
import org.junit.Before;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
@@ -38,21 +37,17 @@ import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
-import org.apache.isis.core.runtime.fixtures.FixturesInstaller;
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.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction.State;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
@@ -68,20 +63,18 @@ import static org.junit.Assert.fail;
public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServiceProvider {
//region > Listener, ListenerAdapter
-
public interface Listener {
void init(IsisConfiguration configuration) throws Exception;
- void preSetupSystem(boolean firstTime) throws Exception;
- void postSetupSystem(boolean firstTime) throws Exception;
+ void preOpenSession(boolean firstTime) throws Exception;
+ void postOpenSession(boolean firstTime) throws Exception;
- void preBounceSystem() throws Exception;
- void postBounceSystem() throws Exception;
+ void preNextSession() throws Exception;
+ void postNextSession() throws Exception;
- void preTeardownSystem() throws Exception;
- void postTeardownSystem() throws Exception;
-
+ void preCloseSession() throws Exception;
+ void postCloseSession() throws Exception;
}
public static abstract class ListenerAdapter implements Listener {
@@ -97,36 +90,35 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
}
@Override
- public void preSetupSystem(boolean firstTime) throws Exception {
+ public void preOpenSession(boolean firstTime) throws Exception {
}
@Override
- public void postSetupSystem(boolean firstTime) throws Exception {
+ public void postOpenSession(boolean firstTime) throws Exception {
}
@Override
- public void preBounceSystem() throws Exception {
+ public void preNextSession() throws Exception {
}
@Override
- public void postBounceSystem() throws Exception {
+ public void postNextSession() throws Exception {
}
@Override
- public void preTeardownSystem() throws Exception {
+ public void preCloseSession() throws Exception {
}
@Override
- public void postTeardownSystem() throws Exception {
+ public void postCloseSession() throws Exception {
}
-
}
//endregion
//region > getElseNull, get, set
- private static ThreadLocal<IsisSystemForTest> ISFT = new ThreadLocal<IsisSystemForTest>();
+ private static ThreadLocal<IsisSystemForTest> ISFT = new ThreadLocal<>();
public static IsisSystemForTest getElseNull() {
return ISFT.get();
@@ -199,18 +191,15 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
@Override
public synchronized void run() {
try {
- isisSystemForTest.tearDownSystem();
+ isisSystemForTest.closeSession();
} catch (Exception e) {
e.printStackTrace();
}
try {
- isisSystemForTest.shutdown();
- } catch (Exception e) {
- e.printStackTrace();
- }
- try {
- isisSystemForTest.isisSystem.getSessionFactory().shutdown();
+ if(isisSystemForTest.isisSessionFactory != null) {
+ isisSystemForTest.isisSessionFactory.destroyServicesAndShutdown();
+ }
} catch (Exception e) {
e.printStackTrace();
}
@@ -283,16 +272,16 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
/**
* Intended to be called from a test's {@link Before} method.
*/
- public IsisSystemForTest setUpSystem() throws RuntimeException {
+ public IsisSystemForTest initIfRequiredThenOpenSession() throws RuntimeException {
try {
- setUpSystem(FireListeners.FIRE);
+ initIfRequiredThenOpenSession(FireListeners.FIRE);
} catch (Exception e) {
throw new RuntimeException(e);
}
return this;
}
- private void setUpSystem(FireListeners fireListeners) throws Exception {
+ private void initIfRequiredThenOpenSession(FireListeners fireListeners) throws Exception {
// exit as quickly as possible for this case... (will already have been logged)
if(IsisContext.getMetaModelInvalidExceptionIfAny() != null) {
@@ -300,9 +289,9 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
return;
}
- boolean firstTime = isisSystem == null;
+ boolean firstTime = isisSessionFactory == null;
if(fireListeners.shouldFire()) {
- fireInitAndPreSetupSystem(firstTime);
+ fireInitAndPreOpenSession(firstTime);
}
if(firstTime) {
@@ -314,15 +303,14 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
configurationOverride
);
- isisSystem = new IsisSystem(componentProvider, DeploymentCategory.PRODUCTION);
+ final IsisSystem isisSystem = new IsisSystem(componentProvider, DeploymentCategory.PRODUCTION);
// ensures that a FixtureClock is installed as the singleton underpinning the ClockService
FixtureClock.initialize();
- isisSystem.init();
-
- // REVIEW: is this required?
- isisSystem.getSessionFactory().closeSession();
+ isisSessionFactory = isisSystem.buildSessionFactory();
+ // REVIEW: does no harm, but is this required?
+ closeSession();
// if the IsisSystem does not initialize properly, then - as a side effect - the resulting
// MetaModelInvalidException will be pushed onto the IsisContext (as a static field).
@@ -342,22 +330,16 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
}
}
- final AuthenticationManager authenticationManager = isisSystem.getSessionFactory().getAuthenticationManager();
+ final AuthenticationManager authenticationManager = isisSessionFactory.getAuthenticationManager();
authenticationSession = authenticationManager.authenticate(authenticationRequestIfAny);
openSession();
- wireAndInstallFixtures();
if(fireListeners.shouldFire()) {
- firePostSetupSystem(firstTime);
+ firePostOpenSession(firstTime);
}
}
- private void wireAndInstallFixtures() {
- FixturesInstaller fixturesInstaller = componentProvider.provideFixturesInstaller();
- fixturesInstaller.installFixtures();
- }
-
public DomainObjectContainer getContainer() {
return getService(DomainObjectContainer.class);
}
@@ -365,17 +347,17 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
//endregion
//region > isisSystem (populated during setup)
- private IsisSystem isisSystem;
+ private IsisSessionFactory isisSessionFactory;
/**
- * The {@link IsisSystem} created during {@link #setUpSystem()}.
+ * The {@link IsisSessionFactory} created during {@link #initIfRequiredThenOpenSession()}.
*/
- public IsisSystem getIsisSystem() {
- return isisSystem;
+ public IsisSessionFactory getIsisSessionFactory() {
+ return isisSessionFactory;
}
/**
- * The {@link AuthenticationSession} created during {@link #setUpSystem()}.
+ * The {@link AuthenticationSession} created during {@link #initIfRequiredThenOpenSession()}.
*/
public AuthenticationSession getAuthenticationSession() {
return authenticationSession;
@@ -385,36 +367,23 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
//region > teardown
- /**
- * Intended to be called from a test's {@link After} method.
- */
- public void tearDownSystem() throws Exception {
- closeSession(FireListeners.FIRE);
- }
-
private void closeSession(final FireListeners fireListeners) throws Exception {
if(fireListeners.shouldFire()) {
- firePreTeardownSystem();
+ firePreCloseSession();
}
- if(isisSystem.getSessionFactory().inSession()) {
- isisSystem.getSessionFactory().closeSession();
+ if(isisSessionFactory.inSession()) {
+ isisSessionFactory.closeSession();
}
if(fireListeners.shouldFire()) {
- firePostTeardownSystem();
+ firePostCloseSession();
}
}
- private void shutdown() {
- if(isisSystem != null) {
- isisSystem.shutdown();
- }
- }
-
- public void bounceSystem() throws Exception {
- firePreBounceSystem();
+ public void nextSession() throws Exception {
+ firePreNextSession();
closeSession();
openSession();
- firePostBounceSystem();
+ firePostNextSession();
}
//endregion
@@ -426,11 +395,11 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
}
public void openSession(AuthenticationSession authenticationSession) throws Exception {
- isisSystem.getSessionFactory().openSession(authenticationSession);
+ isisSessionFactory.openSession(authenticationSession);
}
public void closeSession() throws Exception {
- isisSystem.getSessionFactory().closeSession();
+ closeSession(FireListeners.FIRE);
}
//endregion
@@ -448,122 +417,46 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
}
- private void fireInitAndPreSetupSystem(boolean firstTime) throws Exception {
+ private void fireInitAndPreOpenSession(boolean firstTime) throws Exception {
if(firstTime) {
for(Listener listener: listeners) {
listener.init(componentProvider.getConfiguration());
}
}
for(Listener listener: listeners) {
- listener.preSetupSystem(firstTime);
+ listener.preOpenSession(firstTime);
}
}
- private void firePostSetupSystem(boolean firstTime) throws Exception {
+ private void firePostOpenSession(boolean firstTime) throws Exception {
for(Listener listener: listeners) {
- listener.postSetupSystem(firstTime);
+ listener.postOpenSession(firstTime);
}
}
- private void firePreTeardownSystem() throws Exception {
+ private void firePreCloseSession() throws Exception {
for(Listener listener: listeners) {
- listener.preTeardownSystem();
+ listener.preCloseSession();
}
}
- private void firePostTeardownSystem() throws Exception {
+ private void firePostCloseSession() throws Exception {
for(Listener listener: listeners) {
- listener.postTeardownSystem();
+ listener.postCloseSession();
}
}
- private void firePreBounceSystem() throws Exception {
+ private void firePreNextSession() throws Exception {
for(Listener listener: listeners) {
- listener.preBounceSystem();
+ listener.preNextSession();
}
}
- private void firePostBounceSystem() throws Exception {
+ private void firePostNextSession() throws Exception {
for(Listener listener: listeners) {
- listener.postBounceSystem();
- }
- }
- //endregion
-
- //region > Convenience for tests
-
- public ObjectSpecification loadSpecification(Class<?> cls) {
- return isisSystem.getSessionFactory().getSpecificationLoader().loadSpecification(cls);
- }
-
- public ObjectAdapter persist(Object domainObject) {
- ensureSessionInProgress();
- ensureObjectIsNotPersistent(domainObject);
- getContainer().persist(domainObject);
- return adapterFor(domainObject);
- }
-
- public ObjectAdapter destroy(Object domainObject ) {
- ensureSessionInProgress();
- ensureObjectIsPersistent(domainObject);
- getContainer().remove(domainObject);
- return adapterFor(domainObject);
- }
-
- public ObjectAdapter adapterFor(Object domainObject) {
- ensureSessionInProgress();
- return getAdapterManager().adapterFor(domainObject);
- }
-
- /**
- * @deprecated - unused by framework
- */
- @Deprecated
- public ObjectAdapter reload(RootOid oid) {
- ensureSessionInProgress();
- final PersistenceSession persistenceSession = getPersistenceSession();
- return persistenceSession.loadObjectInTransaction(oid);
- }
-
- /**
- * @deprecated - unused by framework
- */
- @Deprecated
- public ObjectAdapter recreateAdapter(RootOid oid) {
- ensureSessionInProgress();
- return getPersistenceSession().adapterFor(oid);
- }
-
- /**
- * @deprecated - unused by framework
- */
- @Deprecated
- public ObjectAdapter remapAsPersistent(Object pojo, RootOid persistentOid) {
- ensureSessionInProgress();
- ensureObjectIsNotPersistent(pojo);
- final ObjectAdapter adapter = adapterFor(pojo);
- getPersistenceSession().remapAsPersistent(adapter, persistentOid);
- return adapter;
- }
-
- private void ensureSessionInProgress() {
- if(!isisSystem.getSessionFactory().inSession()) {
- throw new IllegalStateException("Session must be in progress");
+ listener.postNextSession();
}
}
-
- private void ensureObjectIsNotPersistent(Object domainObject) {
- if(getContainer().isPersistent(domainObject)) {
- throw new IllegalArgumentException("domain object is already persistent");
- }
- }
-
- private void ensureObjectIsPersistent(Object domainObject) {
- if(!getContainer().isPersistent(domainObject)) {
- throw new IllegalArgumentException("domain object is not persistent");
- }
- }
-
//endregion
//region > JUnit @Rule integration
@@ -573,13 +466,13 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
return new Statement() {
@Override
public void evaluate() throws Throwable {
- setUpSystem();
+ initIfRequiredThenOpenSession();
try {
base.evaluate();
- tearDownSystem();
+ closeSession();
} catch(Throwable ex) {
try {
- tearDownSystem();
+ closeSession();
} catch(Exception ex2) {
// ignore, since already one pending
}
@@ -593,6 +486,10 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
//region > beginTran, endTran, commitTran, abortTran
+ /**
+ * @deprecated - ought to be using regular domain services rather than reaching into the framework
+ */
+ @Deprecated
public void beginTran() {
final IsisTransactionManager transactionManager = getTransactionManager();
final IsisTransaction transaction = transactionManager.getCurrentTransaction();
@@ -600,7 +497,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
if(transaction == null) {
startTransactionForUser(transactionManager);
return;
- }
+ }
final State state = transaction.getState();
switch(state) {
@@ -617,7 +514,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
default:
fail("Unknown transaction state '" + state + "'");
}
-
+
}
private void startTransactionForUser(IsisTransactionManager transactionManager) {
@@ -631,7 +528,10 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
/**
* Either commits or aborts the transaction, depending on the Transaction's {@link org.apache.isis.core.runtime.system.transaction.IsisTransaction#getState()}
+ *
+ * @deprecated - ought to be using regular domain services rather than reaching into the framework
*/
+ @Deprecated
public void endTran() {
final IsisTransactionManager transactionManager = getTransactionManager();
final IsisTransaction transaction = transactionManager.getCurrentTransaction();
@@ -661,8 +561,8 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
/**
* Commits the transaction.
- *
- * @deprecated - typically use just {@link #endTran()}
+ *
+ * @deprecated - ought to be using regular domain services rather than reaching into the framework
*/
@Deprecated
public void commitTran() {
@@ -671,7 +571,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
if(transaction == null) {
fail("No transaction exists");
return;
- }
+ }
final State state = transaction.getState();
switch(state) {
case COMMITTED:
@@ -688,9 +588,9 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
}
/**
- * Commits the transaction.
+ * Aborts the transaction.
*
- * @deprecated - typically use just {@link #abortTran()}
+ * @deprecated - ought to be using regular domain services rather than reaching into the framework
*/
@Deprecated
public void abortTran() {
@@ -699,7 +599,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
if(transaction == null) {
fail("No transaction exists");
return;
- }
+ }
final State state = transaction.getState();
switch(state) {
case ABORTED:
@@ -726,13 +626,13 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
@Override
@SuppressWarnings("unchecked")
public <T> T getService(Class<T> serviceClass) {
- final ServicesInjector servicesInjector = isisSystem.getSessionFactory().getServicesInjector();
+ final ServicesInjector servicesInjector = isisSessionFactory.getServicesInjector();
return servicesInjector.lookupServiceElseFail(serviceClass);
}
@Override
public <T> void replaceService(final T originalService, final T replacementService) {
- final ServicesInjector servicesInjector = isisSystem.getSessionFactory().getServicesInjector();
+ final ServicesInjector servicesInjector = isisSessionFactory.getServicesInjector();
servicesInjector.replaceService(originalService, replacementService);
}
@@ -745,8 +645,8 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
*/
@Deprecated
public void installFixtures(final InstallableFixture... fixtures) {
- final FixturesInstallerDelegate fid = new FixturesInstallerDelegate(getPersistenceSession());
- for (InstallableFixture fixture : fixtures) {
+ final FixturesInstallerDelegate fid = new FixturesInstallerDelegate(isisSessionFactory);
+ for (final InstallableFixture fixture : fixtures) {
fid.addFixture(fixture);
}
fid.installFixtures();
@@ -758,7 +658,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
if(transactionState.canCommit()) {
commitTran();
try {
- bounceSystem();
+ nextSession();
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -770,30 +670,12 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
//region > Dependencies
- protected IsisTransactionManager getTransactionManager() {
+ private IsisTransactionManager getTransactionManager() {
return getPersistenceSession().getTransactionManager();
}
- public PersistenceSession getPersistor() {
- return getPersistenceSession();
- }
-
- public AdapterManager getAdapterManager() {
- return getPersistor();
- }
-
- protected PersistenceSession getPersistenceSession() {
- return isisSystem.getSessionFactory().getCurrentSession().getPersistenceSession();
- }
-
- /**
- * @param container the container to set
- *
- * @deprecated
- */
- @Deprecated
- public void setContainer(DomainObjectContainer container) {
- // no-op
+ private PersistenceSession getPersistenceSession() {
+ return isisSessionFactory.getCurrentSession().getPersistenceSession();
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/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 621c24d..4214a4c 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
@@ -35,6 +35,7 @@ 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.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.tool.mavenplugin.util.MavenProjects;
public abstract class IsisMojoAbstract extends AbstractMojo {
@@ -59,8 +60,9 @@ public abstract class IsisMojoAbstract extends AbstractMojo {
final AppManifest manifest = InstanceUtil.createInstance(this.appManifest, AppManifest.class);
final IsisSystem isisSystem = new IsisSystem(manifest);
+ IsisSessionFactory isisSessionFactory = null;
try {
- isisSystem.init();
+ isisSessionFactory = isisSystem.buildSessionFactory();
if(!isisSystem.isMetaModelValid()) {
MetaModelInvalidException metaModelInvalidException = IsisContext
.getMetaModelInvalidExceptionIfAny();
@@ -68,11 +70,12 @@ public abstract class IsisMojoAbstract extends AbstractMojo {
context.throwFailureException(validationErrors.size() + " meta-model problems found.", validationErrors);
return;
}
- IsisContext.getSessionFactory().doInSession(new Runnable() {
+ final IsisSessionFactory isisSessionFactoryFinal = isisSessionFactory;
+ isisSessionFactory.doInSession(new Runnable() {
@Override
public void run() {
try {
- doExecute(context, isisSystem);
+ doExecute(context, isisSessionFactoryFinal);
} catch (IOException e) {
;
// ignore
@@ -88,12 +91,16 @@ public abstract class IsisMojoAbstract extends AbstractMojo {
}
throw e;
} finally {
- isisSystem.shutdown();
+ if(isisSessionFactory != null) {
+ isisSessionFactory.destroyServicesAndShutdown();
+ }
}
}
- protected abstract void doExecute(final ContextForMojo context, final IsisSystem system)
+ protected abstract void doExecute(
+ final ContextForMojo context,
+ final IsisSessionFactory isisSessionFactory)
throws MojoFailureException, IOException;
//region > Context
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoSwagger.java
----------------------------------------------------------------------
diff --git a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoSwagger.java b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoSwagger.java
index 56b62fb..e49d522 100644
--- a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoSwagger.java
+++ b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoSwagger.java
@@ -34,7 +34,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
import org.apache.isis.applib.services.swagger.SwaggerService;
-import org.apache.isis.core.runtime.system.IsisSystem;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@Mojo(
name = "swagger",
@@ -75,10 +75,10 @@ public class IsisMojoSwagger extends IsisMojoAbstract {
@Override
protected void doExecute(
- final ContextForMojo context, final IsisSystem system)
+ final ContextForMojo context, final IsisSessionFactory isisSessionFactory)
throws MojoFailureException, IOException {
- final SwaggerService swaggerService = system.getSessionFactory().getServicesInjector().lookupService(SwaggerService.class);
+ final SwaggerService swaggerService = isisSessionFactory.getServicesInjector().lookupService(SwaggerService.class);
final MavenProject mavenProject = context.getMavenProject();
final File outputDir = determineOutputDir(mavenProject, output);
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoValidate.java
----------------------------------------------------------------------
diff --git a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoValidate.java b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoValidate.java
index 8d2a644..ea9883a 100644
--- a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoValidate.java
+++ b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoValidate.java
@@ -28,7 +28,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
-import org.apache.isis.core.runtime.system.IsisSystem;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@Mojo(
name = "validate",
@@ -46,10 +46,12 @@ public class IsisMojoValidate extends IsisMojoAbstract {
}
@Override
- protected void doExecute(final ContextForMojo context, final IsisSystem isisSystem)
+ protected void doExecute(
+ final ContextForMojo context,
+ final IsisSessionFactory isisSessionFactory)
throws MojoFailureException {
final SpecificationLoader specificationLoader =
- isisSystem.getSessionFactory().getSpecificationLoader();
+ isisSessionFactory.getSpecificationLoader();
metaModelProcessor.process(context, specificationLoader);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoXsd.java
----------------------------------------------------------------------
diff --git a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoXsd.java b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoXsd.java
index 67e3279..23add36 100644
--- a/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoXsd.java
+++ b/core/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/IsisMojoXsd.java
@@ -36,7 +36,7 @@ import org.apache.maven.project.MavenProject;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.core.commons.factory.InstanceUtil;
-import org.apache.isis.core.runtime.system.IsisSystem;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@Mojo(
name = "xsd",
@@ -78,10 +78,10 @@ public class IsisMojoXsd extends IsisMojoAbstract {
@Override
protected void doExecute(
- final ContextForMojo context, final IsisSystem system)
+ final ContextForMojo context, final IsisSessionFactory isisSessionFactory)
throws MojoFailureException, IOException {
- final JaxbService jaxbService = system.getSessionFactory().getServicesInjector().lookupService(JaxbService.class);
+ final JaxbService jaxbService = isisSessionFactory.getServicesInjector().lookupService(JaxbService.class);
final MavenProject mavenProject = context.getMavenProject();
final File outputDir = determineOutputDir(mavenProject);
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
index 5cf5433..5f487e3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
@@ -103,9 +103,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
final ServicesInjector servicesInjector) {
this.servicesInjector = servicesInjector;
-
this.programmingModel = programmingModel;
-
this.metaModelValidator = metaModelValidator;
this.facetProcessor = new FacetProcessor(programmingModel);
@@ -118,8 +116,10 @@ public class SpecificationLoader implements ApplicationScopedComponent {
LOG.info("finalizing reflector factory " + this);
}
+
//endregion
+
//region > init
private boolean initialized = false;
@@ -513,6 +513,7 @@ public class SpecificationLoader implements ApplicationScopedComponent {
}
return objectSpecification;
}
+
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/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 48a1112..8be8b8a 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
@@ -192,14 +192,11 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
this.servicesInjector = servicesInjector;
this.facetProcessor = facetProcessor;
- this.deploymentCategory = servicesInjector.lookupService(DeploymentCategoryProvider.class).getDeploymentCategory();
this.specificationLoader = servicesInjector.getSpecificationLoader();
+ this.deploymentCategory = servicesInjector.getDeploymentCategory();
}
- protected DeploymentCategory getDeploymentCategory() {
- return deploymentCategory;
- }
//endregion
//region > Stuff immediately derivable from class
@@ -664,7 +661,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
if(oa != null) {
return oa;
}
- if(!getDeploymentCategory().isProduction()) {
+ if(! deploymentCategory.isProduction()) {
// automatically refresh if not in production
// (better support for jrebel)
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
index 43beddd..898bc03 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
@@ -26,7 +26,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.layoutmetadata.LayoutMetadataReader;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
@@ -43,7 +42,6 @@ public final class JavaReflectorHelper {
private JavaReflectorHelper(){}
public static SpecificationLoader createObjectReflector(
- final DeploymentCategory deploymentCategory,
final IsisConfiguration configuration,
final ProgrammingModel programmingModel,
final Collection<MetaModelRefiner> metaModelRefiners,
@@ -62,8 +60,7 @@ public final class JavaReflectorHelper {
programmingModel.refineMetaModelValidator(metaModelValidator, configuration);
}
- return new SpecificationLoader(
- programmingModel, metaModelValidator, layoutMetadataReaders, servicesInjector);
+ return new SpecificationLoader(programmingModel, metaModelValidator, layoutMetadataReaders, servicesInjector);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
index e1cd597..c9b986e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
@@ -114,8 +114,7 @@ public abstract class SpecificationLoaderTestAbstract {
final SpecificationLoader specificationLoader =
new SpecificationLoader(
new ProgrammingModelFacetsJava5(stubConfiguration),
- new MetaModelValidatorDefault(),
- Lists.<LayoutMetadataReader>newArrayList(
+ new MetaModelValidatorDefault(), Lists.<LayoutMetadataReader>newArrayList(
new LayoutMetadataReaderFromJson()), stubServicesInjector);
stubServicesInjector.addFallbackIfRequired(SpecificationLoader.class, specificationLoader);
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstaller.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstaller.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstaller.java
deleted file mode 100644
index bb1b2f8..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstaller.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.fixtures;
-
-import org.apache.isis.applib.fixtures.InstallableFixture;
-import org.apache.isis.applib.fixtures.LogonFixture;
-
-/**
- * A particular mechanism to install fixtures.
- */
-public interface FixturesInstaller {
-
- /**
- * NB: this has the suffix '-installer' because in the command line we must
- * distinguish from the '--fixture' flag meaning a particular fixture to be
- * installed.
- */
- static String TYPE = "fixtures-installer";
-
- void installFixtures();
-
- /**
- * The {@link InstallableFixture} (if any) that is an instance of
- * {@link LogonFixture}.
- *
- * <p>
- * If there is more than one {@link LogonFixture}, then the last one
- * installed is returned.
- */
- LogonFixture getLogonFixture();
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java
index a2e15b4..2765bbe 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerAbstract.java
@@ -23,25 +23,23 @@ import java.util.Collections;
import java.util.List;
import org.apache.isis.applib.fixtures.LogonFixture;
-import org.apache.isis.core.commons.components.InstallerAbstract;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-public abstract class FixturesInstallerAbstract extends InstallerAbstract implements FixturesInstaller {
+public abstract class FixturesInstallerAbstract {
- private final FixturesInstallerDelegate delegate = new FixturesInstallerDelegate();
+ private final FixturesInstallerDelegate delegate;
+ protected final IsisConfiguration configuration;
- private LogonFixture logonFixture;
-
- public FixturesInstallerAbstract(final String name, final IsisConfigurationDefault isisConfiguration) {
- super(name, isisConfiguration);
+ public FixturesInstallerAbstract(
+ final IsisSessionFactory isisSessionFactory) {
+ delegate = new FixturesInstallerDelegate(isisSessionFactory);
+ configuration = isisSessionFactory.getConfiguration();
}
- @Override
public void installFixtures() {
addFixturesTo(delegate);
-
delegate.installFixtures();
- logonFixture = delegate.getLogonFixture();
}
/**
@@ -50,14 +48,13 @@ public abstract class FixturesInstallerAbstract extends InstallerAbstract implem
*/
protected abstract void addFixturesTo(FixturesInstallerDelegate delegate);
- @Override
public LogonFixture getLogonFixture() {
- return logonFixture;
+ return delegate.getLogonFixture();
}
- @Override
public List<Class<?>> getTypes() {
return Collections.emptyList();
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
index 68afcb5..1a3effd 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
@@ -19,10 +19,11 @@
package org.apache.isis.core.runtime.fixtures;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import com.google.common.collect.Lists;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,67 +31,34 @@ import org.apache.isis.applib.fixtures.CompositeFixture;
import org.apache.isis.applib.fixtures.FixtureType;
import org.apache.isis.applib.fixtures.InstallableFixture;
import org.apache.isis.applib.fixtures.LogonFixture;
+import org.apache.isis.applib.fixtures.switchuser.SwitchUserService;
import org.apache.isis.core.commons.lang.ObjectExtensions;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.DeploymentType;
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;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
-/**
- * Helper for {@link FixturesInstaller} implementations.
- *
- * <p>
- * Does the mechanics of actually installing the fixtures.
- *
- * @deprecated - instead, use the replacement FixtureScript API ({@link org.apache.isis.applib.fixturescripts.FixtureScript} and {@link org.apache.isis.applib.fixturescripts.FixtureScripts})
- */
-@Deprecated
+// REVIEW: could probably inline
public class FixturesInstallerDelegate {
private static final Logger LOG = LoggerFactory.getLogger(FixturesInstallerDelegate.class);
- protected final List<Object> fixtures = new ArrayList<Object>();
- private final SwitchUserServiceImpl switchUserService = new SwitchUserServiceImpl();
-
- private final PersistenceSession persistenceSession;
-
- /**
- * The requested {@link LogonFixture}, if any.
- *
- * <p>
- * Each fixture is inspected as it is {@link #installFixture(Object)}; if it
- * implements {@link LogonFixture} then it is remembered so that it can be
- * used later to automatically logon.
- */
- private LogonFixture logonFixture;
+ //region > Constructor, fields
- // /////////////////////////////////////////////////////////
- // Constructor
- // /////////////////////////////////////////////////////////
+ private final IsisSessionFactory isisSessionFactory;
+ private final SwitchUserService switchUserService;
- /**
- * The {@link PersistenceSession} used will be that from
- * {@link IsisContext#getPersistenceSession() IsisContext}.
- */
- public FixturesInstallerDelegate() {
- this(null);
+ //endregion
+ public FixturesInstallerDelegate(final IsisSessionFactory isisSessionFactory) {
+ this.isisSessionFactory = isisSessionFactory;
+ switchUserService = isisSessionFactory.getServicesInjector().lookupService(SwitchUserService.class);
}
- /**
- * For testing, supply own {@link PersistenceSession} rather than lookup
- * from context.
- *
- * @param persistenceSession
- */
- public FixturesInstallerDelegate(final PersistenceSession persistenceSession) {
- this.persistenceSession = persistenceSession;
- }
-
+ //region > addFixture, getFixtures
- // /////////////////////////////////////////////////////////
- // addFixture, getFixtures, clearFixtures
- // /////////////////////////////////////////////////////////
+ protected final List<Object> fixtures = Lists.newArrayList();
/**
* Automatically flattens any {@link List}s, recursively (depth-first) if
@@ -114,16 +82,9 @@ public class FixturesInstallerDelegate {
return Collections.unmodifiableList(fixtures);
}
- /**
- * Allows the set of fixtures to be cleared (for whatever reason).
- */
- public void clearFixtures() {
- fixtures.clear();
- }
+ //endregion
- // /////////////////////////////////////////////////////////
- // installFixtures
- // /////////////////////////////////////////////////////////
+ //region > installFixtures
/**
* Installs all {{@link #addFixture(Object) added fixtures} fixtures (ie as
@@ -136,24 +97,9 @@ public class FixturesInstallerDelegate {
* reused across multiple tests (REVIEW: does that make sense?)
*/
public final void installFixtures() {
- preInstallFixtures(getPersistenceSession());
installFixtures(getFixtures());
- postInstallFixtures(getPersistenceSession());
- }
-
- // ///////////////////////////////////////
- // preInstallFixtures
- // ///////////////////////////////////////
-
- /**
- * Hook - default does nothing.
- */
- protected void preInstallFixtures(final PersistenceSession persistenceSession) {
}
- // ///////////////////////////////////////
- // installFixtures, installFixture
- // ///////////////////////////////////////
private void installFixtures(final List<Object> fixtures) {
for (final Object fixture : fixtures) {
@@ -199,7 +145,7 @@ public class FixturesInstallerDelegate {
}
private void installFixture(final Object fixture) {
- switchUserService.injectInto(fixture);
+ isisSessionFactory.getServicesInjector().injectServicesInto(fixture);
if (fixture instanceof InstallableFixture) {
final InstallableFixture installableFixture = (InstallableFixture) fixture;
@@ -223,28 +169,20 @@ public class FixturesInstallerDelegate {
return true;
}
- private void saveLogonFixtureIfRequired(final Object fixture) {
- if (fixture instanceof LogonFixture) {
- if (logonFixture != null) {
- LOG.warn("Already specified logon fixture, using latest provided");
- }
- this.logonFixture = (LogonFixture) fixture;
- }
- }
+ //endregion
- // ///////////////////////////////////////
- // postInstallFixtures
- // ///////////////////////////////////////
+ //region > logonFixture
/**
- * Hook - default does nothing.
+ * The requested {@link LogonFixture}, if any.
+ *
+ * <p>
+ * Each fixture is inspected as it is {@link #installFixture(Object)}; if it
+ * implements {@link LogonFixture} then it is remembered so that it can be
+ * used later to automatically logon.
*/
- protected void postInstallFixtures(final PersistenceSession persistenceSession) {
- }
+ private LogonFixture logonFixture;
- // /////////////////////////////////////////////////////////
- // LogonFixture
- // /////////////////////////////////////////////////////////
/**
* The {@link LogonFixture}, if any.
@@ -256,30 +194,33 @@ public class FixturesInstallerDelegate {
return logonFixture;
}
- // /////////////////////////////////////////////////////////
- // Dependencies (from either context or via constructor)
- // /////////////////////////////////////////////////////////
-
- /**
- * Returns either the {@link IsisContext#getPersistenceSession() singleton }
- * persistor or the persistor specified in the constructor.
- *
- * <p>
- * Note: if a {@link PersistenceSession persistor} was specified via the
- * constructor, this is not cached (to do so would cause the usage of tests
- * that use the singleton to break).
- */
- private PersistenceSession getPersistenceSession() {
- return persistenceSession != null ? persistenceSession :
- IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+ private void saveLogonFixtureIfRequired(final Object fixture) {
+ if (fixture instanceof LogonFixture) {
+ if (logonFixture != null) {
+ LOG.warn("Already specified logon fixture, using latest provided");
+ }
+ this.logonFixture = (LogonFixture) fixture;
+ }
}
+
+ //endregion
+
+ //region > dependencies (derived)
+
private ServicesInjector getServicesInjector() {
- return getPersistenceSession().getServicesInjector();
+ return isisSessionFactory.getServicesInjector();
+ }
+
+
+ private PersistenceSession getPersistenceSession() {
+ return isisSessionFactory.getCurrentSession().getPersistenceSession();
}
private IsisTransactionManager getTransactionManager() {
return getPersistenceSession().getTransactionManager();
}
+ //endregion
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerFromConfiguration.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerFromConfiguration.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerFromConfiguration.java
index 1e3cbde..285adb0 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerFromConfiguration.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerFromConfiguration.java
@@ -23,10 +23,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.runtime.fixtures.domainservice.ObjectLoaderFixture;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
public class FixturesInstallerFromConfiguration extends FixturesInstallerAbstract {
@@ -42,8 +42,8 @@ public class FixturesInstallerFromConfiguration extends FixturesInstallerAbstrac
private static final String EXPLORATION_OBJECTS = ConfigurationConstants.ROOT + "exploration-objects";
- public FixturesInstallerFromConfiguration(final IsisConfigurationDefault isisConfiguration) {
- super("configuration", isisConfiguration);
+ public FixturesInstallerFromConfiguration(final IsisSessionFactory isisSessionFactory) {
+ super(isisSessionFactory);
}
@Override
@@ -60,7 +60,7 @@ public class FixturesInstallerFromConfiguration extends FixturesInstallerAbstrac
fixtureLoaded = true;
delegate.addFixture(fixture);
}
- if (getConfiguration().getBoolean(EXPLORATION_OBJECTS)) {
+ if (configuration.getBoolean(EXPLORATION_OBJECTS)) {
delegate.addFixture(new ObjectLoaderFixture());
}
if (!fixtureLoaded) {
@@ -123,8 +123,8 @@ public class FixturesInstallerFromConfiguration extends FixturesInstallerAbstrac
private FixtureConfig getFixtureConfig() {
final FixtureConfig fixtureConfig = new FixtureConfig();
- fixtureConfig.setFixtures(getConfiguration().getList(FIXTURES));
- fixtureConfig.setFixturePrefix(getConfiguration().getString(FIXTURES_PREFIX));
+ fixtureConfig.setFixtures(configuration.getList(FIXTURES));
+ fixtureConfig.setFixturePrefix(configuration.getString(FIXTURES_PREFIX));
return fixtureConfig;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/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 9fc4bc4..b2aaa6b 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
@@ -44,7 +44,7 @@ public class IsisInjectModule extends AbstractModule {
*
* <p>
* This is bound in by default in <tt>IsisWicketModule</tt>, but is replaced with null when the system is
- * {@link #provideIsisSystem(AppManifest) created} .
+ * {@link #provideIsisSessionFactory(AppManifest)} created} .
* </p>
*/
private static final AppManifest APP_MANIFEST_NOOP = new AppManifest() {
@@ -90,11 +90,22 @@ public class IsisInjectModule extends AbstractModule {
bind(AppManifest.class).toInstance(APP_MANIFEST_NOOP);
}
+ @Provides
+ @Singleton
+ protected IsisConfiguration provideConfiguration() {
+ return isisConfiguration;
+ }
+
+ @Provides
+ @Singleton
+ protected DeploymentCategory provideDeploymentCategory() {
+ return deploymentCategory;
+ }
@Provides
@Inject
@Singleton
- protected IsisSystem provideIsisSystem(final AppManifest appManifestIfAny) {
+ protected IsisSessionFactory provideIsisSessionFactory(final AppManifest appManifestIfAny) {
final AppManifest appManifest = appManifestIfAny != APP_MANIFEST_NOOP ? appManifestIfAny : null;
@@ -105,30 +116,9 @@ public class IsisInjectModule extends AbstractModule {
// as a side-effect, if the metamodel turns out to be invalid, then
// this will push the MetaModelInvalidException into IsisContext.
- system.init();
-
- return system;
- }
-
- @Provides
- @Inject
- @Singleton
- protected IsisConfiguration provideConfiguration() {
- return isisConfiguration;
- }
-
- @Provides
- @Inject
- @Singleton
- protected DeploymentCategory provideDeploymentCaeg() {
- return deploymentCategory;
- }
+ system.buildSessionFactory();
- @Provides
- @Inject
- @Singleton
- protected IsisSessionFactory provideIsisSessionFactory(final IsisSystem isisSystem) {
- return isisSystem.getSessionFactory();
+ return system.getSessionFactory();
}
@Provides
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java
index 8ef5e00..27f234f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java
@@ -16,19 +16,24 @@
*/
package org.apache.isis.core.runtime.services.deplcat;
-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.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-@DomainService(nature = NatureOfService.DOMAIN)
+// registered as a fallback
public class DeploymentCategoryProviderDefault implements DeploymentCategoryProvider {
+ private final DeploymentCategory deploymentCategory;
+
+ public DeploymentCategoryProviderDefault(final DeploymentCategory deploymentCategory) {
+ this.deploymentCategory = deploymentCategory;
+ }
+
+
@Programmatic
@Override
public DeploymentCategory getDeploymentCategory() {
- return IsisContext.getSessionFactory().getDeploymentCategory();
+ return deploymentCategory;
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/runtime/src/main/java/org/apache/isis/core/runtime/services/package-info.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/package-info.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/package-info.java
deleted file mode 100644
index 939b4e0..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/package-info.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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.
- */
-
-/**
- * Used to specify the set of services (including repositories) to inject into
- * domain objects.
- *
- * @see org.apache.isis.core.runtime.fixtures.FixturesInstaller
- */
-package org.apache.isis.core.runtime.services;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/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 759b2ff..b02646b 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,6 +16,8 @@
*/
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;
@@ -25,8 +27,8 @@ 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.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
/**
* This service allows an XML document to be generated capturing the data of a root entity and specified related
@@ -72,8 +74,8 @@ public class XmlSnapshotServiceDefault extends XmlSnapshotServiceAbstract {
@Programmatic
@Override
public XmlSnapshotService.Snapshot snapshotFor(final Object domainObject) {
- final ObjectAdapter adapter = gerPersistenceSession().adapterFor(domainObject);
- return new XmlSnapshot(adapter, getOidMarshaller());
+ final ObjectAdapter adapter = getPersistenceSession().adapterFor(domainObject);
+ return new XmlSnapshot(adapter, oidMarshaller);
}
/**
@@ -90,13 +92,16 @@ public class XmlSnapshotServiceDefault extends XmlSnapshotServiceAbstract {
// //////////////////////////////////////
- protected PersistenceSession gerPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
- }
- protected OidMarshaller getOidMarshaller() {
- return IsisContext.getSessionFactory().getOidMarshaller();
+ @Inject
+ IsisSessionFactory isisSessionFactory;
+
+ protected PersistenceSession getPersistenceSession() {
+ return isisSessionFactory.getCurrentSession().getPersistenceSession();
}
+ @Inject
+ OidMarshaller oidMarshaller;
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
index eb8dd52..6d763a0 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
@@ -24,6 +24,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
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.IsisSession;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.core.runtime.system.transaction.TransactionalClosure;
@@ -34,16 +35,15 @@ public abstract class AbstractIsisSessionTemplate {
*/
public void execute(final AuthenticationSession authSession, final Object context) {
try {
- IsisContext.getSessionFactory().openSession(authSession);
+ getSessionFactory().openSession(authSession);
PersistenceSession persistenceSession = getPersistenceSession();
persistenceSession.getServicesInjector().injectServicesInto(this);
doExecute(context);
} finally {
- IsisContext.getSessionFactory().closeSession();
+ getSessionFactory().closeSession();
}
}
-
// //////////////////////////////////////
/**
@@ -89,21 +89,27 @@ public abstract class AbstractIsisSessionTemplate {
}
// //////////////////////////////////////
-
- protected PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+
+
+ protected IsisSessionFactory getSessionFactory() {
+ return IsisContext.getSessionFactory();
}
- protected IsisTransactionManager getTransactionManager(PersistenceSession persistenceSession) {
- return persistenceSession.getTransactionManager();
+ protected PersistenceSession getPersistenceSession() {
+ return getSessionFactory().getCurrentSession().getPersistenceSession();
}
protected AdapterManager getAdapterManager() {
return getPersistenceSession();
}
+ protected IsisTransactionManager getTransactionManager(PersistenceSession persistenceSession) {
+ return persistenceSession.getTransactionManager();
+ }
+
protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSessionFactory().getSpecificationLoader();
+ return getSessionFactory().getSpecificationLoader();
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/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 75dbfae..ff06b90 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
@@ -22,7 +22,6 @@ package org.apache.isis.core.runtime.system;
import java.io.File;
import java.util.Arrays;
import java.util.Collection;
-import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,37 +29,28 @@ 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.fixtures.LogonFixture;
import org.apache.isis.applib.fixturescripts.FixtureScripts;
import org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault;
-import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.applib.services.title.TitleService;
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.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.ServiceInitializer;
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.authentication.exploration.ExplorationSession;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
-import org.apache.isis.core.runtime.fixtures.FixturesInstaller;
+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.InitialisationSession;
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.IsisSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
-import org.apache.isis.core.runtime.system.transaction.IsisTransactionManagerException;
import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProvider;
import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProviderDefault2;
@@ -75,7 +65,6 @@ public class IsisSystem implements ApplicationScopedComponent {
private boolean initialized = false;
- private ServiceInitializer serviceInitializer;
private IsisSessionFactory isisSessionFactory;
//region > constructors, fields
@@ -108,7 +97,7 @@ public class IsisSystem implements ApplicationScopedComponent {
//region > sessionFactory
/**
- * Populated after {@link #init()}.
+ * Populated after {@link #buildSessionFactory()}.
*/
public IsisSessionFactory getSessionFactory() {
return isisSessionFactory;
@@ -116,10 +105,10 @@ public class IsisSystem implements ApplicationScopedComponent {
//endregion
- //region > init
+ //region > buildSessionFactory
- public void init() {
+ public IsisSessionFactory buildSessionFactory() {
if (initialized) {
throw new IllegalStateException("Already initialized");
@@ -154,11 +143,16 @@ public class IsisSystem implements ApplicationScopedComponent {
// the IsisSessionFactory will look up each of these components from the ServicesInjector
//
- // services
final ServicesInjector servicesInjector = componentProvider.provideServiceInjector(configuration);
- servicesInjector.addFallbackIfRequired(FixtureScripts.class, new FixtureScriptsDefault());
+
+ // fixtureScripts, deploymentCategory, configuration
+ final DeploymentCategoryProviderDefault deploymentCategoryProvider =
+ new DeploymentCategoryProviderDefault(deploymentCategory);
+ servicesInjector.addFallbackIfRequired(DeploymentCategoryProvider.class, deploymentCategoryProvider);
servicesInjector.addFallbackIfRequired(ConfigurationServiceInternal.class, configuration);
- servicesInjector.validateServices();
+
+ // fixtureScripts
+ servicesInjector.addFallbackIfRequired(FixtureScripts.class, new FixtureScriptsDefault());
// authentication
final AuthenticationManager authenticationManager = componentProvider.provideAuthenticationManager();
@@ -173,7 +167,7 @@ public class IsisSystem implements ApplicationScopedComponent {
refiners(authenticationManager, authorizationManager,
new PersistenceSessionFactoryMetamodelRefiner());
final SpecificationLoader specificationLoader =
- componentProvider.provideSpecificationLoader(deploymentCategory, servicesInjector, metaModelRefiners);
+ componentProvider.provideSpecificationLoader(servicesInjector, metaModelRefiners);
servicesInjector.addFallbackIfRequired(SpecificationLoader.class, specificationLoader);
// persistenceSessionFactory
@@ -181,6 +175,8 @@ public class IsisSystem implements ApplicationScopedComponent {
servicesInjector.addFallbackIfRequired(PersistenceSessionFactory.class, persistenceSessionFactory);
+ servicesInjector.validateServices();
+
// instantiate the IsisSessionFactory
isisSessionFactory = new IsisSessionFactory(deploymentCategory, servicesInjector);
@@ -229,69 +225,7 @@ public class IsisSystem implements ApplicationScopedComponent {
persistenceSessionFactory.init();
- // do postConstruct. We store the initializer to do preDestroy on shutdown
- serviceInitializer = new ServiceInitializer(configuration, servicesInjector.getRegisteredServices());
- serviceInitializer.validate();
-
- isisSessionFactory.openSession(new InitialisationSession());
-
- try {
- //
- // postConstructInSession
- //
-
- IsisTransactionManager transactionManager = getCurrentSessionTransactionManager();
- transactionManager.startTransaction();
- try {
- serviceInitializer.postConstruct();
- } catch(RuntimeException ex) {
- transactionManager.getCurrentTransaction().setAbortCause(new IsisTransactionManagerException(ex));
- } finally {
- // will commit or abort
- transactionManager.endTransaction();
- }
-
-
- //
- // installFixturesIfRequired
- //
- final FixturesInstaller fixtureInstaller = componentProvider.provideFixturesInstaller();
- fixtureInstaller.installFixtures();
-
- // only allow logon fixtures if not in production mode.
- if (!deploymentCategory.isProduction()) {
- logonFixture = fixtureInstaller.getLogonFixture();
- }
-
- //
- // translateServicesAndEnumConstants
- //
- final List<Object> services = servicesInjector.getRegisteredServices();
- final TitleService titleService = servicesInjector.lookupServiceElseFail(TitleService.class);
- for (Object service : services) {
- final String unused = titleService.titleOf(service);
- }
- for (final ObjectSpecification objSpec : servicesInjector.getSpecificationLoader().allSpecifications()) {
- final Class<?> correspondingClass = objSpec.getCorrespondingClass();
- if(correspondingClass.isEnum()) {
- final Object[] enumConstants = correspondingClass.getEnumConstants();
- for (Object enumConstant : enumConstants) {
- final String unused = titleService.titleOf(enumConstant);
- }
- }
- }
-
- // as used by the Wicket UI
- final TranslationService translationService = servicesInjector.lookupServiceElseFail(TranslationService.class);
-
- final String context = IsisSystem.class.getName();
- translationService.translate(context, MSG_ARE_YOU_SURE);
- translationService.translate(context, MSG_CONFIRM);
- translationService.translate(context, MSG_CANCEL);
-
- } finally {
- isisSessionFactory.closeSession();
- }
+ isisSessionFactory.constructServices();
} catch (final MetaModelInvalidException ex) {
@@ -308,55 +242,14 @@ public class IsisSystem implements ApplicationScopedComponent {
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);
}
- private ServicesInjector getServicesInjector() {
- return isisSessionFactory.getServicesInjector();
- }
-
- //endregion
-
- //region > shutdown
-
- public void shutdown() {
- LOG.info("shutting down system");
-
- preDestroyInSession(this.serviceInitializer);
-
- }
-
- private void preDestroyInSession(final ServiceInitializer serviceInitializer) {
-
- // may not be set if the metamodel validation failed during initialization
- if (serviceInitializer == null) {
- return;
- }
-
- // call @PreDestroy (in a session)
- getSessionFactory().openSession(new InitialisationSession());
- IsisTransactionManager transactionManager = getCurrentSessionTransactionManager();
- try {
- transactionManager.startTransaction();
- try {
-
- serviceInitializer.preDestroy();
-
- } catch (RuntimeException ex) {
- transactionManager.getCurrentTransaction().setAbortCause(
- new IsisTransactionManagerException(ex));
- } finally {
- // will commit or abort
- transactionManager.endTransaction();
- }
- } finally {
- getSessionFactory().closeSession();
- }
- }
-
//endregion
// region > metaModel validity
@@ -365,27 +258,5 @@ public class IsisSystem implements ApplicationScopedComponent {
}
//endregion
- //region > logonFixture
- private LogonFixture logonFixture;
-
- /**
- * The {@link LogonFixture}, if any, obtained by running fixtures.
- *
- * <p>
- * Intended to be used when for {@link DeploymentType#SERVER_EXPLORATION
- * exploration} (instead of an {@link ExplorationSession}) or
- * {@link DeploymentType#SERVER_PROTOTYPE prototype} deployments (saves logging
- * in). Should be <i>ignored</i> in other {@link DeploymentType}s.
- */
- public LogonFixture getLogonFixture() {
- return logonFixture;
- }
-
- IsisTransactionManager getCurrentSessionTransactionManager() {
- final IsisSession currentSession = isisSessionFactory.getCurrentSession();
- return currentSession.getPersistenceSession().getTransactionManager();
- }
-
- //endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/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 ab931c5..af705cb 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
@@ -83,16 +83,5 @@ public final class IsisContext {
//endregion
- //region > shutdown
-
- public static void shutdown() {
- if (sessionFactory == null) {
- return;
- }
- sessionFactory.shutdown();
- }
-
- //endregion
-
}
[37/50] [abbrv] isis git commit: ISIS-1429: removes DebugFacet,
impls and corresponding facet factories.
Posted by da...@apache.org.
ISIS-1429: removes DebugFacet, impls and corresponding facet factories.
Neither the Wicket viewer nor RO viewer has any capability to enable a 'debug' mode (and if we did want to support this we would probably use JMX or similar.
Alternatively, we have @Prototype actions
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/adca856b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/adca856b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/adca856b
Branch: refs/heads/master
Commit: adca856b7c4de56f24ba8f7bce9f79a284233962
Parents: e944de3
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 15 04:51:29 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 15 04:51:29 2016 +0100
----------------------------------------------------------------------
.../apache/isis/applib/annotation/Debug.java | 4 +-
.../facets/actions/debug/DebugFacet.java | 37 ----------
.../actions/debug/DebugFacetAbstract.java | 40 ----------
.../debug/annotation/DebugFacetAnnotation.java | 35 ---------
.../annotation/DebugFacetAnnotationFactory.java | 73 ------------------
...ActionNamedDebugExplorationFacetFactory.java | 23 +-----
.../DebugFacetViaNamingConvention.java | 31 --------
.../services/swagger/internal/Util.java | 2 +-
.../isis/core/metamodel/spec/ActionType.java | 12 +--
.../specimpl/ObjectActionDefault.java | 7 +-
.../dflt/ProgrammingModelFacetsJava5.java | 4 -
.../actions/ActionMethodsFacetFactoryTest.java | 78 +-------------------
.../debug/DebugFacetAnnotationFactoryTest.java | 65 ----------------
.../collection/bulk/BulkActionsHelper.java | 4 -
14 files changed, 8 insertions(+), 407 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/adca856b/core/applib/src/main/java/org/apache/isis/applib/annotation/Debug.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Debug.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Debug.java
index 929de4d..e5d6a1a 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Debug.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Debug.java
@@ -26,8 +26,8 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Indicates the an action should be only available for debugging.
- *
+ * This annotation is ignored.
+ *
* @deprecated - use {@link org.apache.isis.applib.annotation.Action#restrictTo()} for prototype-mode
*/
@Inherited
http://git-wip-us.apache.org/repos/asf/isis/blob/adca856b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacet.java
deleted file mode 100644
index dfbaed5..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacet.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.metamodel.facets.actions.debug;
-
-import org.apache.isis.core.metamodel.facetapi.Facet;
-
-/**
- * Indicates that the action should only be available in a special <i>debug</i>
- * mode.
- *
- * <p>
- * In the standard Apache Isis Programming Model, corresponds to annotating the
- * action method using <tt>@Debug</tt>.
- *
- * @deprecated
- */
-@Deprecated
-public interface DebugFacet extends Facet {
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/adca856b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacetAbstract.java
deleted file mode 100644
index b6c90fc..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacetAbstract.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.metamodel.facets.actions.debug;
-
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.MarkerFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public abstract class DebugFacetAbstract extends MarkerFacetAbstract implements DebugFacet {
-
- public static Class<? extends Facet> type() {
- return DebugFacet.class;
- }
-
- public DebugFacetAbstract(final FacetHolder holder) {
- super(type(), holder);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/adca856b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotation.java
deleted file mode 100644
index c41f14c..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotation.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.metamodel.facets.actions.debug.annotation;
-
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacetAbstract;
-
-/**
- * @deprecated
- */
-@Deprecated
-public class DebugFacetAnnotation extends DebugFacetAbstract {
-
- public DebugFacetAnnotation(final FacetHolder holder) {
- super(holder);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/adca856b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotationFactory.java
deleted file mode 100644
index f47c0b7..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/debug/annotation/DebugFacetAnnotationFactory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.metamodel.facets.actions.debug.annotation;
-
-import org.apache.isis.applib.annotation.Debug;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facetapi.FacetUtil;
-import org.apache.isis.core.metamodel.facetapi.FeatureType;
-import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
-import org.apache.isis.core.metamodel.facets.Annotations;
-import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorForDeprecatedAnnotation;
-
-/**
- * {@link DebugFacet} can also be installed via a naming convention, see
- * {@link org.apache.isis.core.metamodel.facets.actions.interaction.ActionNamedDebugExplorationFacetFactory}.
- *
- * @deprecated
- */
-@Deprecated
-public class DebugFacetAnnotationFactory extends FacetFactoryAbstract implements MetaModelValidatorRefiner {
-
- private final MetaModelValidatorForDeprecatedAnnotation validator = new MetaModelValidatorForDeprecatedAnnotation(Debug.class);
-
- public DebugFacetAnnotationFactory() {
- super(FeatureType.ACTIONS_ONLY);
- }
-
- @Override
- public void process(final ProcessMethodContext processMethodContext) {
- final Debug annotation = Annotations.getAnnotation(processMethodContext.getMethod(), Debug.class);
- final DebugFacet facet = create(annotation, processMethodContext.getFacetHolder());
- FacetUtil.addFacet(validator.flagIfPresent(facet, processMethodContext));
- }
-
- private DebugFacet create(final Debug annotation, final FacetHolder holder) {
- return annotation == null ? null : new DebugFacetAnnotation(holder);
- }
-
- @Override
- public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
- metaModelValidator.add(validator);
- }
-
- @Override
- public void setServicesInjector(final ServicesInjector servicesInjector) {
- super.setServicesInjector(servicesInjector);
- IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal();
- validator.setConfiguration(configuration);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/adca856b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java
index 0277cbc..e9356e9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/ActionNamedDebugExplorationFacetFactory.java
@@ -29,7 +29,6 @@ import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelValidatorRefiner;
import org.apache.isis.core.metamodel.facets.MethodPrefixBasedFacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacetInferred;
@@ -42,8 +41,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
* facets that are based on the action's name.
*
* <p>
- * The supporting methods are: {@link ExplorationFacet}
- * and {@link DebugFacet}. In addition a {@link NamedFacet} is inferred from the
+ * The supporting methods are: {@link ExplorationFacet}. In addition a {@link NamedFacet} is inferred from the
* name (taking into account the above well-known prefixes).
*
* @deprecated
@@ -52,13 +50,10 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorFor
public class ActionNamedDebugExplorationFacetFactory extends MethodPrefixBasedFacetFactoryAbstract implements MetaModelValidatorRefiner {
private static final String EXPLORATION_PREFIX = "Exploration";
- private static final String DEBUG_PREFIX = "Debug";
private final MetaModelValidatorForDeprecatedMethodPrefix explorationValidator = new MetaModelValidatorForDeprecatedMethodPrefix(EXPLORATION_PREFIX);
- private final MetaModelValidatorForDeprecatedMethodPrefix debugValidator = new MetaModelValidatorForDeprecatedMethodPrefix(DEBUG_PREFIX);
-
- private static final String[] PREFIXES = { EXPLORATION_PREFIX, DEBUG_PREFIX };
+ private static final String[] PREFIXES = { EXPLORATION_PREFIX };
public ActionNamedDebugExplorationFacetFactory() {
super(FeatureType.ACTIONS_ONLY, OrphanValidation.VALIDATE, PREFIXES);
@@ -72,7 +67,6 @@ public class ActionNamedDebugExplorationFacetFactory extends MethodPrefixBasedFa
public void process(final ProcessMethodContext processMethodContext) {
// DebugFacet, ExplorationFacet
- attachDebugFacetIfActionMethodNamePrefixed(processMethodContext);
attachExplorationFacetIfActionMethodNamePrefixed(processMethodContext);
// inferred name
@@ -80,16 +74,6 @@ public class ActionNamedDebugExplorationFacetFactory extends MethodPrefixBasedFa
attachNamedFacetInferredFromMethodName(processMethodContext);
}
- private void attachDebugFacetIfActionMethodNamePrefixed(final ProcessMethodContext processMethodContext) {
- final Method actionMethod = processMethodContext.getMethod();
- final String capitalizedName = StringExtensions.asCapitalizedName(actionMethod.getName());
- if (!capitalizedName.startsWith(DEBUG_PREFIX)) {
- return;
- }
- final FacetHolder facetedMethod = processMethodContext.getFacetHolder();
- final Facet facet = new DebugFacetViaNamingConvention(facetedMethod);
- FacetUtil.addFacet(debugValidator.flagIfPresent(facet, processMethodContext));
- }
private void attachExplorationFacetIfActionMethodNamePrefixed(final ProcessMethodContext processMethodContext) {
@@ -113,7 +97,6 @@ public class ActionNamedDebugExplorationFacetFactory extends MethodPrefixBasedFa
// this is nasty...
String name = capitalizedName;
- name = StringExtensions.removePrefix(name, DEBUG_PREFIX);
name = StringExtensions.removePrefix(name, EXPLORATION_PREFIX);
name = StringExtensions.asNaturalName2(name);
@@ -125,7 +108,6 @@ public class ActionNamedDebugExplorationFacetFactory extends MethodPrefixBasedFa
@Override
public void refineMetaModelValidator(final MetaModelValidatorComposite metaModelValidator, final IsisConfiguration configuration) {
metaModelValidator.add(explorationValidator);
- metaModelValidator.add(debugValidator);
}
@Override
@@ -133,7 +115,6 @@ public class ActionNamedDebugExplorationFacetFactory extends MethodPrefixBasedFa
super.setServicesInjector(servicesInjector);
IsisConfiguration configuration = servicesInjector.getConfigurationServiceInternal();
explorationValidator.setConfiguration(configuration);
- debugValidator.setConfiguration(configuration);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/adca856b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/DebugFacetViaNamingConvention.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/DebugFacetViaNamingConvention.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/DebugFacetViaNamingConvention.java
deleted file mode 100644
index 0bf7fcd..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/interaction/DebugFacetViaNamingConvention.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.metamodel.facets.actions.interaction;
-
-import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacetAbstract;
-
-public class DebugFacetViaNamingConvention extends DebugFacetAbstract {
-
- public DebugFacetViaNamingConvention(final FacetHolder holder) {
- super(holder);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/adca856b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java
index 6bd0bc1..a0effef 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Util.java
@@ -165,7 +165,7 @@ public final class Util {
case PRIVATE:
return Arrays.asList(ActionType.USER);
case PRIVATE_WITH_PROTOTYPING:
- return Arrays.asList(ActionType.USER, ActionType.EXPLORATION, ActionType.PROTOTYPE, ActionType.DEBUG);
+ return Arrays.asList(ActionType.USER, ActionType.EXPLORATION, ActionType.PROTOTYPE);
}
throw new IllegalArgumentException("Unrecognized type '" + visibility + "'");
}
http://git-wip-us.apache.org/repos/asf/isis/blob/adca856b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ActionType.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ActionType.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ActionType.java
index d8a4016..626ed40 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ActionType.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ActionType.java
@@ -22,23 +22,13 @@ package org.apache.isis.core.metamodel.spec;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-
public enum ActionType {
- DEBUG, EXPLORATION, PROTOTYPE, USER;
+ EXPLORATION, PROTOTYPE, USER;
public String getName() {
return name();
}
- public boolean matchesTypeOf(final ObjectAction action) {
- return action != null && action.getType().equals(this);
- }
-
- public boolean isDebug() {
- return this == DEBUG;
- }
-
public boolean isExploration() {
return this == EXPLORATION;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/adca856b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
index 12db1a0..0b464d1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionDefault.java
@@ -51,7 +51,6 @@ import org.apache.isis.core.metamodel.facets.TypedHolder;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.ActionInvocationFacet;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.CommandUtil;
import org.apache.isis.core.metamodel.facets.actions.bulk.BulkFacet;
-import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
import org.apache.isis.core.metamodel.facets.actions.defaults.ActionDefaultsFacet;
import org.apache.isis.core.metamodel.facets.actions.exploration.ExplorationFacet;
import org.apache.isis.core.metamodel.facets.actions.prototype.PrototypeFacet;
@@ -156,11 +155,7 @@ public class ObjectActionDefault extends ObjectMemberAbstract implements ObjectA
}
private static ActionType getType(final FacetHolder facetHolder) {
- Facet facet = facetHolder.getFacet(DebugFacet.class);
- if (facet != null) {
- return ActionType.DEBUG;
- }
- facet = facetHolder.getFacet(ExplorationFacet.class);
+ Facet facet = facetHolder.getFacet(ExplorationFacet.class);
if (facet != null) {
return ActionType.EXPLORATION;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/adca856b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
index e2ee1cb..63714b7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/ProgrammingModelFacetsJava5.java
@@ -21,11 +21,9 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facets.actions.action.ActionAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.contributing.maxlenannot.MaxLengthFacetOnActionAnnotationFactory;
import org.apache.isis.core.metamodel.facets.actions.contributing.paged.PagedFacetOnActionFactory;
-import org.apache.isis.core.metamodel.facets.actions.debug.annotation.DebugFacetAnnotationFactory;
import org.apache.isis.core.metamodel.facets.actions.defaults.method.ActionDefaultsFacetViaMethodFactory;
import org.apache.isis.core.metamodel.facets.actions.exploration.annotation.ExplorationFacetAnnotationFactory;
import org.apache.isis.core.metamodel.facets.actions.homepage.annotation.HomePageFacetAnnotationFactory;
-import org.apache.isis.core.metamodel.facets.actions.interaction.ActionNamedDebugExplorationFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.layout.ActionLayoutFacetFactory;
import org.apache.isis.core.metamodel.facets.actions.notcontributed.annotation.NotContributedFacetAnnotationFactory;
import org.apache.isis.core.metamodel.facets.actions.notcontributed.derived.NotContributedFacetDerivedFromDomainServiceFacetFactory;
@@ -273,7 +271,6 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
// actions
- addFactory(new ActionNamedDebugExplorationFacetFactory());
addFactory(new ActionValidationFacetViaMethodFactory());
addFactory(new ActionChoicesFacetViaMethodFactory());
addFactory(new ActionParameterChoicesFacetViaMethodFactory());
@@ -322,7 +319,6 @@ public final class ProgrammingModelFacetsJava5 extends ProgrammingModelAbstract
addFactory(new BookmarkPolicyFacetViaBookmarkableAnnotationElseFallbackFactory());
addFactory(new HomePageFacetAnnotationFactory());
addFactory(new ChoicesFacetFromBoundedMarkerInterfaceFactory());
- addFactory(new DebugFacetAnnotationFactory());
addFactory(new DefaultedFacetAnnotationElseConfigurationFactory());
addFactory(new PropertyDefaultFacetDerivedFromTypeFactory());
http://git-wip-us.apache.org/repos/asf/isis/blob/adca856b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
index 26ea27f..f25f438 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
@@ -40,7 +40,6 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
-import org.apache.isis.core.metamodel.facets.actions.debug.DebugFacet;
import org.apache.isis.core.metamodel.facets.actions.defaults.ActionDefaultsFacet;
import org.apache.isis.core.metamodel.facets.actions.defaults.method.ActionDefaultsFacetViaMethod;
import org.apache.isis.core.metamodel.facets.actions.defaults.method.ActionDefaultsFacetViaMethodFactory;
@@ -78,8 +77,8 @@ import org.apache.isis.core.metamodel.facets.param.choices.methodnum.ActionParam
import org.apache.isis.core.metamodel.facets.param.defaults.ActionParameterDefaultsFacet;
import org.apache.isis.core.metamodel.facets.param.defaults.methodnum.ActionParameterDefaultsFacetViaMethod;
import org.apache.isis.core.metamodel.facets.param.defaults.methodnum.ActionParameterDefaultsFacetViaMethodFactory;
-import org.apache.isis.core.metamodel.services.configinternal.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.configinternal.ConfigurationServiceInternal;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.testspec.ObjectSpecificationStub;
@@ -177,33 +176,6 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
}
- public void testPicksUpDebugPrefixAndSetsNameAppropriatelyAlso() {
- final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
-
- facetFactory.setServicesInjector(mockServicesInjector);
-
- // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
- allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
-
- class Customer {
- @SuppressWarnings("unused")
- public void debugAnActionWithDebugPrefix() {
- }
- }
- final Method method = findMethod(Customer.class, "debugAnActionWithDebugPrefix");
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, method, methodRemover, facetedMethod));
-
- Facet facet = facetedMethod.getFacet(DebugFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof DebugFacet);
-
- facet = facetedMethod.getFacet(NamedFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof NamedFacet);
- final NamedFacet namedFacet = (NamedFacet) facet;
- assertEquals("An Action With Debug Prefix", namedFacet.value());
- }
-
public void testPicksUpExplorationPrefixAndSetsNameAppropriatelyAlso() {
final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
@@ -231,54 +203,6 @@ public class ActionMethodsFacetFactoryTest extends AbstractFacetFactoryTest {
assertEquals("An Action With Exploration Prefix", namedFacet.value());
}
- public void testCannotHaveBothDebugAndThenExplorationPrefix() {
- final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
-
- facetFactory.setServicesInjector(mockServicesInjector);
-
- // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
- allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
-
- class Customer {
- @SuppressWarnings("unused")
- public void debugExplorationAnActionWithDebugAndExplorationPrefix() {
- }
- }
- final Method method = findMethod(Customer.class, "debugExplorationAnActionWithDebugAndExplorationPrefix");
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, method, methodRemover, facetedMethod));
-
- Facet facet = facetedMethod.getFacet(DebugFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof DebugFacet);
-
- facet = facetedMethod.getFacet(ExplorationFacet.class);
- assertNull(facet);
- }
-
- public void testCannotHaveBothExplorationAndThenDebugPrefix() {
- final ActionNamedDebugExplorationFacetFactory facetFactory = new ActionNamedDebugExplorationFacetFactory();
-
- facetFactory.setServicesInjector(mockServicesInjector);
-
- // mockSpecificationLoader.setLoadSpecificationStringReturn(voidSpec);
- allowing_specificationLoader_loadSpecification_any_willReturn(this.voidSpec);
-
- class Customer {
- @SuppressWarnings("unused")
- public void explorationDebugAnActionWithExplorationAndDebugPrefix() {
- }
- }
- final Method method = findMethod(Customer.class, "explorationDebugAnActionWithExplorationAndDebugPrefix");
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, method, methodRemover, facetedMethod));
-
- Facet facet = facetedMethod.getFacet(ExplorationFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof ExplorationFacet);
-
- facet = facetedMethod.getFacet(DebugFacet.class);
- assertNull(facet);
- }
-
public void testInstallsValidateMethodNoArgsFacetAndRemovesMethod() {
final ActionValidationFacetViaMethodFactory facetFactory = new ActionValidationFacetViaMethodFactory();
http://git-wip-us.apache.org/repos/asf/isis/blob/adca856b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacetAnnotationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacetAnnotationFactoryTest.java
deleted file mode 100644
index 3b2c74f..0000000
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/debug/DebugFacetAnnotationFactoryTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.metamodel.facets.actions.debug;
-
-import java.lang.reflect.Method;
-
-import org.apache.isis.applib.annotation.Debug;
-import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
-import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.core.metamodel.facets.actions.debug.annotation.DebugFacetAnnotationFactory;
-
-public class DebugFacetAnnotationFactoryTest extends AbstractFacetFactoryTest {
-
- private DebugFacetAnnotationFactory facetFactory;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- facetFactory = new DebugFacetAnnotationFactory();
- }
-
- @Override
- protected void tearDown() throws Exception {
- facetFactory = null;
- super.tearDown();
- }
-
- public void testDebugAnnotationPickedUp() {
- class Customer {
- @SuppressWarnings("unused")
- @Debug
- public void someAction() {
- }
- }
- final Method actionMethod = findMethod(Customer.class, "someAction");
-
- facetFactory.process(new ProcessMethodContext(Customer.class, null, null, actionMethod, methodRemover, facetedMethod));
-
- final Facet facet = facetedMethod.getFacet(DebugFacet.class);
- assertNotNull(facet);
- assertTrue(facet instanceof DebugFacetAbstract);
-
- assertNoMethodsRemoved();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/adca856b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
index 3ecb97d..42627e0 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
@@ -67,10 +67,6 @@ public class BulkActionsHelper implements Serializable {
objectActions.addAll(explorationActions);
objectActions.addAll(prototypeActions);
}
- if (isDebugMode()) {
- List<ObjectAction> debugActions = typeSpec.getObjectActions(ActionType.DEBUG, Contributed.INCLUDED, Filters.<ObjectAction>any());
- objectActions.addAll(debugActions);
- }
List<ObjectAction> flattenedActions = objectActions;
[18/50] [abbrv] isis git commit: ISIS-1427: renames methods in
IsisSystemForTest,
rationalizes functionality between IsisSystem and IsisSessionFactory
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/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 67aac63..fcdd953 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
@@ -26,6 +26,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.fixtures.LogonFixture;
+import org.apache.isis.applib.services.i18n.TranslationService;
+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;
@@ -33,12 +36,20 @@ 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;
+import org.apache.isis.core.metamodel.specloader.ServiceInitializer;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
+import org.apache.isis.core.runtime.authentication.exploration.ExplorationSession;
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.internal.InitialisationSession;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
+import org.apache.isis.core.runtime.system.transaction.IsisTransactionManagerException;
import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProviderUsingInstallers;
/**
@@ -62,7 +73,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
@SuppressWarnings("unused")
private final static Logger LOG = LoggerFactory.getLogger(IsisSessionFactory.class);
- //region > constructor, fields, shutdown
+ //region > constructor, fields
private final DeploymentCategory deploymentCategory;
private final IsisConfiguration configuration;
@@ -89,8 +100,117 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
this.oidMarshaller = new OidMarshaller();
}
+
+ //endregion
+
+ //region > constructServices, destroyServicesAndShutdown
+
+ private ServiceInitializer serviceInitializer;
+
+ @Programmatic
+ public void constructServices() {
+
+ // do postConstruct. We store the initializer to do preDestroy on shutdown
+ serviceInitializer = new ServiceInitializer(configuration, servicesInjector.getRegisteredServices());
+ serviceInitializer.validate();
+
+ openSession(new InitialisationSession());
+
+ try {
+ //
+ // postConstructInSession
+ //
+
+ IsisTransactionManager transactionManager = getCurrentSessionTransactionManager();
+ transactionManager.startTransaction();
+ try {
+ serviceInitializer.postConstruct();
+ } catch(RuntimeException ex) {
+ transactionManager.getCurrentTransaction().setAbortCause(new IsisTransactionManagerException(ex));
+ } finally {
+ // will commit or abort
+ transactionManager.endTransaction();
+ }
+
+
+ //
+ // installFixturesIfRequired
+ //
+ final FixturesInstallerFromConfiguration fixtureInstaller =
+ new FixturesInstallerFromConfiguration(this);
+ fixtureInstaller.installFixtures();
+
+ // only allow logon fixtures if not in production mode.
+ if (!deploymentCategory.isProduction()) {
+ logonFixture = fixtureInstaller.getLogonFixture();
+ }
+
+ //
+ // translateServicesAndEnumConstants
+ //
+ final List<Object> services = servicesInjector.getRegisteredServices();
+ final TitleService titleService = servicesInjector.lookupServiceElseFail(TitleService.class);
+ for (Object service : services) {
+ final String unused = titleService.titleOf(service);
+ }
+ for (final ObjectSpecification objSpec : servicesInjector.getSpecificationLoader().allSpecifications()) {
+ final Class<?> correspondingClass = objSpec.getCorrespondingClass();
+ if(correspondingClass.isEnum()) {
+ final Object[] enumConstants = correspondingClass.getEnumConstants();
+ for (Object enumConstant : enumConstants) {
+ final String unused = titleService.titleOf(enumConstant);
+ }
+ }
+ }
+
+ // 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);
+
+ } finally {
+ closeSession();
+ }
+ }
+
+
@Programmatic
- public void shutdown() {
+ public void destroyServicesAndShutdown() {
+ destroyServices();
+ shutdown();
+ }
+
+ private void destroyServices() {
+ // may not be set if the metamodel validation failed during initialization
+ if (serviceInitializer == null) {
+ return;
+ }
+
+ // call @PreDestroy (in a session)
+ openSession(new InitialisationSession());
+ IsisTransactionManager transactionManager = getCurrentSessionTransactionManager();
+ try {
+ transactionManager.startTransaction();
+ try {
+
+ serviceInitializer.preDestroy();
+
+ } catch (RuntimeException ex) {
+ transactionManager.getCurrentTransaction().setAbortCause(
+ new IsisTransactionManagerException(ex));
+ } finally {
+ // will commit or abort
+ transactionManager.endTransaction();
+ }
+ } finally {
+ closeSession();
+ }
+ }
+
+ private void shutdown() {
persistenceSessionFactory.shutdown();
authenticationManager.shutdown();
specificationLoader.shutdown();
@@ -98,6 +218,25 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
//endregion
+ //region > logonFixture
+
+ private LogonFixture logonFixture;
+
+ /**
+ * The {@link LogonFixture}, if any, obtained by running fixtures.
+ *
+ * <p>
+ * Intended to be used when for {@link DeploymentType#SERVER_EXPLORATION
+ * exploration} (instead of an {@link ExplorationSession}) or
+ * {@link DeploymentType#SERVER_PROTOTYPE prototype} deployments (saves logging
+ * in). Should be <i>ignored</i> in other {@link DeploymentType}s.
+ */
+ public LogonFixture getLogonFixture() {
+ return logonFixture;
+ }
+
+ //endregion
+
//region > openSession, closeSession, currentSession, inSession
private final ThreadLocal<IsisSession> currentSession = new ThreadLocal<>();
@@ -132,6 +271,11 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
return currentSession.get();
}
+ private IsisTransactionManager getCurrentSessionTransactionManager() {
+ final IsisSession currentSession = getCurrentSession();
+ return currentSession.getPersistenceSession().getTransactionManager();
+ }
+
@Programmatic
public boolean inSession() {
return getCurrentSession() != null;
@@ -197,6 +341,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
}
}
+
//endregion
//region > component accessors
@@ -286,6 +431,8 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
return oidMarshaller;
}
+
+
//endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
index b4f57e2..6616d68 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
@@ -48,7 +48,6 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.commons.lang.ClassUtil;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.layoutmetadata.LayoutMetadataReader;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
@@ -58,7 +57,6 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
-import org.apache.isis.core.runtime.fixtures.FixturesInstaller;
import org.apache.isis.core.runtime.fixtures.FixturesInstallerFromConfiguration;
import org.apache.isis.core.runtime.services.ServicesInstallerFromAnnotation;
import org.apache.isis.core.runtime.services.ServicesInstallerFromConfiguration;
@@ -250,18 +248,9 @@ public abstract class IsisComponentProvider {
//endregion
- //region > provideFixturesInstaller
-
- public FixturesInstaller provideFixturesInstaller() {
- return new FixturesInstallerFromConfiguration(getConfiguration());
- }
-
- //endregion
-
//region > provideSpecificationLoader
public SpecificationLoader provideSpecificationLoader(
- final DeploymentCategory deploymentCategory,
final ServicesInjector servicesInjector,
final Collection<MetaModelRefiner> metaModelRefiners) throws IsisSystemException {
@@ -272,7 +261,7 @@ public abstract class IsisComponentProvider {
final List<LayoutMetadataReader> layoutMetadataReaders = createLayoutMetadataReaders();
return JavaReflectorHelper.createObjectReflector(
- deploymentCategory, configuration, programmingModel, metaModelRefiners,
+ configuration, programmingModel, metaModelRefiners,
layoutMetadataReaders, mmv,
servicesInjector);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
index b6c2b82..f36e89e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
@@ -42,7 +42,6 @@ import org.apache.isis.core.runtime.runner.opts.OptionHandlerInitParameters;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.SystemConstants;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.webapp.config.ResourceStreamSourceForWebInf;
/**
@@ -215,11 +214,10 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
final ServletContext servletContext = ev.getServletContext();
try {
- final IsisSystem system = (IsisSystem) servletContext.getAttribute(WebAppConstants.ISIS_SYSTEM_KEY);
- if (system != null) {
+ final IsisSystem isisSystem = (IsisSystem) servletContext.getAttribute(WebAppConstants.ISIS_SYSTEM_KEY);
+ if (isisSystem != null) {
LOG.info("calling system shutdown");
- system.shutdown();
- IsisContext.shutdown();
+ isisSystem.getSessionFactory().destroyServicesAndShutdown();
}
} finally {
servletContext.removeAttribute(WebAppConstants.ISIS_SYSTEM_KEY);
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
index 58a8536..9103685 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
@@ -77,7 +77,7 @@ public class AuthenticationSessionStrategyDefault extends AuthenticationSessionS
// not expected to happen...
return null;
}
- final LogonFixture logonFixture = system.getLogonFixture();
+ final LogonFixture logonFixture = system.getSessionFactory().getLogonFixture();
// see if exploration is supported
if (system.getDeploymentCategory().isExploring()) {
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
index 74e6264..2b19f0a 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
@@ -26,6 +26,7 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
public class IsisTransactionFilterForRestfulObjects implements Filter {
@@ -37,7 +38,7 @@ public class IsisTransactionFilterForRestfulObjects implements Filter {
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
// no-op if no session available.
- if(!IsisContext.getSessionFactory().inSession()) {
+ if(!getSessionFactory().inSession()) {
chain.doFilter(request, response);
return;
}
@@ -53,16 +54,22 @@ public class IsisTransactionFilterForRestfulObjects implements Filter {
}
}
- protected boolean inTransaction() {
- return IsisContext.getSessionFactory().inTransaction();
+ @Override
+ public void destroy() {
}
- protected IsisTransactionManager getTransactionManager() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager();
+
+ // REVIEW: ought to be able to obtain from thread or as a request attribute
+ protected IsisSessionFactory getSessionFactory() {
+ return IsisContext.getSessionFactory();
}
- @Override
- public void destroy() {
+ protected boolean inTransaction() {
+ return getSessionFactory().inTransaction();
+ }
+
+ protected IsisTransactionManager getTransactionManager() {
+ return getSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 3ac1de0..7fc2c0b 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -66,7 +66,6 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidExcep
import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
import org.apache.isis.core.runtime.runner.IsisInjectModule;
import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.webapp.IsisWebAppBootstrapper;
@@ -181,12 +180,6 @@ public class IsisWicketApplication
* {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
*/
@com.google.inject.Inject
- private IsisSystem isisSystem;
-
- /**
- * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
- */
- @com.google.inject.Inject
private IsisSessionFactory isisSessionFactory;
/**
@@ -265,7 +258,8 @@ public class IsisWicketApplication
requestCycleListeners.add(requestCycleListenerForIsis);
requestCycleListeners.add(new PageRequestHandlerTracker());
- final IsisInjectModule isisModule = newIsisModule(deploymentType.getDeploymentCategory(), configuration);
+ final DeploymentCategory deploymentCategory = deploymentType.getDeploymentCategory();
+ final IsisInjectModule isisModule = newIsisModule(deploymentCategory, configuration);
final Injector injector = Guice.createInjector(isisModule, newIsisWicketModule());
initWicketComponentInjection(injector);
injector.injectMembers(this);
@@ -642,10 +636,9 @@ public class IsisWicketApplication
@Override
protected void onDestroy() {
try {
- if (isisSystem != null) {
- isisSystem.shutdown();
+ if (isisSessionFactory != null) {
+ isisSessionFactory.destroyServicesAndShutdown();
}
- IsisContext.shutdown();
super.onDestroy();
} catch(final RuntimeException ex) {
// symmetry with #init()
@@ -783,4 +776,5 @@ public class IsisWicketApplication
public DeploymentCategory getDeploymentCategory() {
return deploymentCategory;
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
index 47f64b3..2d1ff28 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
@@ -19,13 +19,12 @@
package org.apache.isis.viewer.wicket.ui.pages.accmngt.password_reset;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.INotificationMessage;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationMessage;
-
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Callable;
+
import javax.inject.Inject;
+
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.PasswordTextField;
@@ -34,12 +33,17 @@ import org.apache.wicket.markup.html.form.validation.EqualPasswordInputValidator
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
+
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountConfirmationMap;
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.INotificationMessage;
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationMessage;
+
/**
* A panel with a form for creation of new users
*/
@@ -76,14 +80,13 @@ public class PasswordResetPanel extends Panel {
final AccountConfirmationMap accountConfirmationMap = getApplication().getMetaData(AccountConfirmationMap.KEY);
- Boolean passwordUpdated = IsisContext.getSessionFactory().doInSession(new Callable<Boolean>() {
+ Boolean passwordUpdated = getSessionFactory().doInSession(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
String email = accountConfirmationMap.get(uuid);
- UserRegistrationService userRegistrationService = IsisContext.getSessionFactory()
- .getCurrentSession().getPersistenceSession().getServicesInjector()
- .lookupService(UserRegistrationService.class);
+ UserRegistrationService userRegistrationService = getSessionFactory().getServicesInjector()
+ .lookupServiceElseFail(UserRegistrationService.class);
return userRegistrationService.updatePasswordByEmail(email, password);
}
});
@@ -114,6 +117,10 @@ public class PasswordResetPanel extends Panel {
@Inject
private PageClassRegistry pageClassRegistry;
+ protected IsisSessionFactory getSessionFactory() {
+ return IsisContext.getSessionFactory();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/346a1534/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/bootstrap/DomainAppSystemInitializer.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/bootstrap/DomainAppSystemInitializer.java b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/bootstrap/DomainAppSystemInitializer.java
index bc2b6b3..dec906b 100644
--- a/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/bootstrap/DomainAppSystemInitializer.java
+++ b/example/application/simpleapp/integtests/src/test/java/domainapp/integtests/bootstrap/DomainAppSystemInitializer.java
@@ -33,7 +33,7 @@ public class DomainAppSystemInitializer {
.with(new DomainAppAppManifest())
.with(new IsisConfigurationForJdoIntegTests())
.build();
- isft.setUpSystem();
+ isft.initIfRequiredThenOpenSession();
IsisSystemForTest.set(isft);
}
}
[23/50] [abbrv] isis git commit: ISIS-1427: consolidating to only
necessary calls to IsisContext#getIsisSessionFactory;
also fully qualify @Inject (as either javax or com.google) throughout.
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
index 56e5a53..0269ed3 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
@@ -291,10 +291,10 @@ public class BackgroundServiceDefault implements BackgroundService2 {
@javax.inject.Inject
private FactoryService factoryService;
- @Inject
+ @javax.inject.Inject
private SpecificationLoader specificationLoader;
- @Inject
+ @javax.inject.Inject
private IsisSessionFactory isisSessionFactory;
protected AdapterManager getAdapterManager() {
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
index f1814fe..d36b22e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
@@ -37,14 +37,14 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.CommandUtil;
import org.apache.isis.core.metamodel.services.command.CommandDtoServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.isis.core.runtime.services.memento.MementoServiceDefault;
-import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.schema.cmd.v1.ActionDto;
import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.schema.cmd.v1.ParamDto;
@@ -97,7 +97,7 @@ public class CommandDtoServiceInternalDefault implements CommandDtoServiceIntern
}
private ObjectSpecification getSpecification(final Class<?> type) {
- return getSpecificationLoader().loadSpecification(type);
+ return specificationLoader.loadSpecification(type);
}
@@ -234,21 +234,21 @@ public class CommandDtoServiceInternalDefault implements CommandDtoServiceIntern
// //////////////////////////////////////
-
+ //region > injected services
@javax.inject.Inject
private BookmarkService bookmarkService;
+ @javax.inject.Inject
+ SpecificationLoader specificationLoader;
- // //////////////////////////////////////
-
- protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSessionFactory().getSpecificationLoader();
- }
+ @javax.inject.Inject
+ IsisSessionFactory isisSessionFactory;
protected AdapterManager getAdapterManager() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+ return isisSessionFactory.getCurrentSession().getPersistenceSession();
}
+ //endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandServiceDefault.java
index b379efa..5f2be6e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandServiceDefault.java
@@ -59,7 +59,7 @@ public class CommandServiceDefault implements CommandService {
return false;
}
- @Inject
+ @javax.inject.Inject
ClockService clockService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
index d2db71b..96e9562 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
@@ -38,7 +38,6 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.email.EmailService;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.system.context.IsisContext;
/**
* A service that sends email notifications when specific events occur
@@ -97,23 +96,23 @@ public class EmailServiceDefault implements EmailService {
}
protected String getSenderEmailAddress() {
- return getConfiguration().getString(ISIS_SERVICE_EMAIL_SENDER_ADDRESS);
+ return configuration.getString(ISIS_SERVICE_EMAIL_SENDER_ADDRESS);
}
protected String getSenderEmailPassword() {
- return getConfiguration().getString(ISIS_SERVICE_EMAIL_SENDER_PASSWORD);
+ return configuration.getString(ISIS_SERVICE_EMAIL_SENDER_PASSWORD);
}
protected String getSenderEmailHostName() {
- return getConfiguration().getString(ISIS_SERVICE_EMAIL_SENDER_HOSTNAME, ISIS_SERVICE_EMAIL_SENDER_HOSTNAME_DEFAULT);
+ return configuration.getString(ISIS_SERVICE_EMAIL_SENDER_HOSTNAME, ISIS_SERVICE_EMAIL_SENDER_HOSTNAME_DEFAULT);
}
protected Integer getSenderEmailPort() {
- return getConfiguration().getInteger(ISIS_SERVICE_EMAIL_PORT, ISIS_SERVICE_EMAIL_PORT_DEFAULT);
+ return configuration.getInteger(ISIS_SERVICE_EMAIL_PORT, ISIS_SERVICE_EMAIL_PORT_DEFAULT);
}
protected Boolean getSenderEmailTlsEnabled() {
- return getConfiguration().getBoolean(ISIS_SERVICE_EMAIL_TLS_ENABLED, ISIS_SERVICE_EMAIL_TLS_ENABLED_DEFAULT);
+ return configuration.getBoolean(ISIS_SERVICE_EMAIL_TLS_ENABLED, ISIS_SERVICE_EMAIL_TLS_ENABLED_DEFAULT);
}
//endregion
@@ -188,10 +187,10 @@ public class EmailServiceDefault implements EmailService {
}
//endregion
- //region > dependencies
- protected IsisConfiguration getConfiguration() {
- return IsisContext.getSessionFactory().getConfiguration();
- }
+
//endregion
+ @javax.inject.Inject
+ IsisConfiguration configuration;
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
index 51787c2..9123fc1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
@@ -108,7 +108,7 @@ public class HomePageProviderServiceDefault implements HomePageProviderService {
protected static final Where WHERE_FOR_ACTION_INVOCATION = Where.ANYWHERE;
- @Inject
+ @javax.inject.Inject
IsisSessionFactory isisSessionFactory;
protected PersistenceSession getPersistenceSession() {
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
index 54eb28b..7d2cda3 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
@@ -172,10 +172,10 @@ public class TranslationServicePo implements TranslationService {
return deploymentCategoryProvider.getDeploymentCategory();
}
- @Inject
+ @javax.inject.Inject
DeploymentCategoryProvider deploymentCategoryProvider;
- @Inject
+ @javax.inject.Inject
private TranslationsResolver translationsResolver;
@Programmatic
@@ -183,7 +183,7 @@ public class TranslationServicePo implements TranslationService {
return translationsResolver;
}
- @Inject
+ @javax.inject.Inject
private LocaleProvider localeProvider;
@Programmatic
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePoMenu.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePoMenu.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePoMenu.java
index 971bb26..499cc7d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePoMenu.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePoMenu.java
@@ -134,7 +134,7 @@ public class TranslationServicePoMenu {
// //////////////////////////////////////
- @Inject
+ @javax.inject.Inject
private TranslationServicePo translationService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
index 80f58ec..329b79e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
@@ -130,16 +130,16 @@ public class InteractionDtoServiceInternalDefault implements InteractionDtoServi
);
}
- @Inject
+ @javax.inject.Inject
CommandDtoServiceInternal commandDtoServiceInternal;
- @Inject
+ @javax.inject.Inject
private BookmarkService bookmarkService;
- @Inject
+ @javax.inject.Inject
private InteractionContext interactionContext;
- @Inject
+ @javax.inject.Inject
private UserService userService;
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/memento/MementoServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/memento/MementoServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/memento/MementoServiceDefault.java
index bfe7372..bf8e46c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/memento/MementoServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/memento/MementoServiceDefault.java
@@ -164,7 +164,7 @@ public class MementoServiceDefault implements MementoService {
// //////////////////////////////////////
- @Inject
+ @javax.inject.Inject
UrlEncodingService urlEncodingService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/metrics/MetricsServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/metrics/MetricsServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/metrics/MetricsServiceDefault.java
index 3f490c0..82777c7 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/metrics/MetricsServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/metrics/MetricsServiceDefault.java
@@ -65,7 +65,7 @@ public class MetricsServiceDefault implements MetricsService, InstanceLifecycleL
numberLoaded.set(0);
}
- @Inject
+ @javax.inject.Inject
ChangedObjectsServiceInternal changedObjectsServiceInternal;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
index ac8fb72..1d0ec3e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
@@ -34,8 +34,8 @@ import org.apache.isis.core.metamodel.services.persistsession.PersistenceSession
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-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;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
@DomainService(
@@ -174,7 +174,11 @@ public class PersistenceSessionServiceInternalDefault implements PersistenceSess
}
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+ return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
+ }
+
+ private IsisSessionFactory getIsisSessionFactory() {
+ return isisSessionFactory;
}
@Programmatic
@@ -183,7 +187,12 @@ public class PersistenceSessionServiceInternalDefault implements PersistenceSess
}
protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSessionFactory().getSpecificationLoader();
+ return getIsisSessionFactory().getSpecificationLoader();
}
+
+ @javax.inject.Inject
+ IsisSessionFactory isisSessionFactory;
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/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 ecb6449..b74f223 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
@@ -70,8 +70,8 @@ import org.apache.isis.core.metamodel.services.ixn.InteractionDtoServiceInternal
import org.apache.isis.core.metamodel.services.publishing.PublishingServiceInternal;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.runtime.services.changes.ChangedObjectsServiceInternal;
-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;
/**
* Wrapper around {@link PublishingService}. Is a no-op if there is no injected service.
@@ -311,7 +311,7 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
if(object == null) {
return null;
}
- final ObjectAdapter adapter = IsisContext.getSessionFactory().getCurrentSession()
+ final ObjectAdapter adapter = isisSessionFactory.getCurrentSession()
.getPersistenceSession().adapterFor(object);
Oid oid = adapter.getOid();
return oid != null? oid.enString(oidMarshaller): encodedValueOf(adapter);
@@ -418,38 +418,41 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
//endregion
//region > injected services
- @Inject
+ @javax.inject.Inject
private List<PublisherService> publisherServices;
- @Inject
+ @javax.inject.Inject
private PublishingService publishingServiceIfAny;
- @Inject
+ @javax.inject.Inject
private ChangedObjectsServiceInternal changedObjectsServiceInternal;
- @Inject
+ @javax.inject.Inject
private InteractionDtoServiceInternal interactionDtoServiceInternal;
- @Inject
+ @javax.inject.Inject
private CommandContext commandContext;
- @Inject
+ @javax.inject.Inject
private InteractionContext interactionContext;
- @Inject
+ @javax.inject.Inject
private ClockService clockService;
- @Inject
+ @javax.inject.Inject
private UserService userService;
- @Inject
+ @javax.inject.Inject
private MetricsService metricsService;
- @Inject
+ @javax.inject.Inject
private OidMarshaller oidMarshaller;
+ @javax.inject.Inject
+ private IsisSessionFactory isisSessionFactory;
+
private PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+ return isisSessionFactory.getCurrentSession().getPersistenceSession();
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java
index a4fb023..65329f2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java
@@ -48,7 +48,7 @@ public class SessionManagementServiceDefault implements SessionManagementService
}
- @Inject
+ @javax.inject.Inject
IsisSessionFactory isisSessionFactory;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java
index bc05331..54e87f1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sudo/SudoServiceDefault.java
@@ -106,7 +106,7 @@ public class SudoServiceDefault implements SudoService {
}
- @Inject
+ @javax.inject.Inject
private UserService userService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java
index 20e2d1a..92ed143 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java
@@ -54,7 +54,7 @@ public class TransactionStateProviderInternalDefault implements TransactionState
return isisSessionFactory.getCurrentSession().getPersistenceSession();
}
- @Inject
+ @javax.inject.Inject
IsisSessionFactory isisSessionFactory;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java
index 2a51c29..12fc4b8 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java
@@ -171,7 +171,7 @@ public class EmailNotificationServiceDefault implements EmailNotificationService
//region > dependencies
- @Inject
+ @javax.inject.Inject
private EmailServiceDefault emailService;
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/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 b02646b..3fb3f8b 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
@@ -93,14 +93,14 @@ public class XmlSnapshotServiceDefault extends XmlSnapshotServiceAbstract {
// //////////////////////////////////////
- @Inject
+ @javax.inject.Inject
IsisSessionFactory isisSessionFactory;
protected PersistenceSession getPersistenceSession() {
return isisSessionFactory.getCurrentSession().getPersistenceSession();
}
- @Inject
+ @javax.inject.Inject
OidMarshaller oidMarshaller;
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/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 36fee5c..ea08bdf 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
@@ -26,6 +26,7 @@ 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;
/**
* Builds an {@link XmlSnapshot} using a fluent use through a builder:
@@ -62,11 +63,6 @@ public class XmlSnapshotBuilder {
return this;
}
- public XmlSnapshotBuilder usingOidMarshaller(final OidMarshaller oidMarshaller) {
- this.oidMarshaller = oidMarshaller;
- return this;
- }
-
public XmlSnapshotBuilder includePath(final String path) {
return includePathAndAnnotation(path, null);
}
@@ -94,6 +90,10 @@ public class XmlSnapshotBuilder {
// ///////////////////////////////////////////////////////
private static PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+ return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
+ }
+
+ static IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/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 ff06b90..5424e77 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
@@ -136,7 +136,7 @@ public class IsisSystem implements ApplicationScopedComponent {
try {
//
- // everything added to ServicesInjector will be able to @Inject'ed
+ // everything added to ServicesInjector will be able to @javax.inject.Inject'ed
//
//
@@ -183,7 +183,7 @@ public class IsisSystem implements ApplicationScopedComponent {
//
// now, add the IsisSessionFactory and its subcomponents into ServicesInjector, so that they can be
- // @Inject'd into any internal domain services
+ // @javax.inject.Inject'd into any internal domain services
//
// isisSessionFactory itself
@@ -197,10 +197,8 @@ public class IsisSystem implements ApplicationScopedComponent {
//
// finally, wire up components and components into services...
//
- for (Object service : servicesInjector.getRegisteredServices()) {
- // inject itself into each service (if implements ServiceInjectorAware).
- servicesInjector.injectInto(service);
- }
+ servicesInjector.autowire();
+
// ... and make IsisSessionFactory available via the IsisContext static for those places where we canont
// yet inject.
@@ -208,6 +206,7 @@ public class IsisSystem implements ApplicationScopedComponent {
+
//
// time to initialize...
//
@@ -223,7 +222,7 @@ public class IsisSystem implements ApplicationScopedComponent {
authenticationManager.init();
authorizationManager.init();
- persistenceSessionFactory.init();
+ persistenceSessionFactory.init(specificationLoader);
isisSessionFactory.constructServices();
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQueryFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQueryFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQueryFactory.java
index ea9d675..f8aa3b3 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQueryFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceQueryFactory.java
@@ -59,27 +59,28 @@ public class PersistenceQueryFactory {
final ObjectSpecification noSpec = specFor(query);
if (query instanceof QueryFindAllInstances) {
final QueryFindAllInstances<?> queryFindAllInstances = (QueryFindAllInstances<?>) query;
- return new PersistenceQueryFindAllInstances(noSpec, queryFindAllInstances.getStart(), queryFindAllInstances.getCount());
+ return new PersistenceQueryFindAllInstances(noSpec, specificationLoader, queryFindAllInstances.getStart(), queryFindAllInstances.getCount());
}
if (query instanceof QueryFindByTitle) {
final QueryFindByTitle<?> queryByTitle = (QueryFindByTitle<?>) query;
final String title = queryByTitle.getTitle();
- return new PersistenceQueryFindByTitle(noSpec, title, queryByTitle.getStart(), queryByTitle.getCount());
+ return new PersistenceQueryFindByTitle(noSpec, title, specificationLoader, queryByTitle.getStart(), queryByTitle.getCount());
}
if (query instanceof QueryFindByPattern) {
final QueryFindByPattern<?> queryByPattern = (QueryFindByPattern<?>) query;
final Object pattern = queryByPattern.getPattern();
final ObjectAdapter patternAdapter = adapterManager.adapterFor(pattern);
- return new PersistenceQueryFindByPattern(noSpec, patternAdapter, queryByPattern.getStart(), queryByPattern.getCount());
+ return new PersistenceQueryFindByPattern(noSpec, patternAdapter, specificationLoader, queryByPattern.getStart(), queryByPattern.getCount());
}
if (query instanceof QueryDefault) {
final QueryDefault<?> queryDefault = (QueryDefault<?>) query;
final String queryName = queryDefault.getQueryName();
final Map<String, ObjectAdapter> argumentsAdaptersByParameterName = wrap(queryDefault.getArgumentsByParameterName());
- return new PersistenceQueryFindUsingApplibQueryDefault(noSpec, queryName, argumentsAdaptersByParameterName, cardinality, queryDefault.getStart(), queryDefault.getCount());
+ return new PersistenceQueryFindUsingApplibQueryDefault(noSpec, queryName, argumentsAdaptersByParameterName, cardinality,
+ specificationLoader, queryDefault.getStart(), queryDefault.getCount());
}
// fallback; generic serializable applib query.
- return new PersistenceQueryFindUsingApplibQuerySerializable(noSpec, query, cardinality);
+ return new PersistenceQueryFindUsingApplibQuerySerializable(noSpec, query, cardinality, specificationLoader);
}
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
index 50d957e..f9ebd07 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
@@ -35,6 +35,7 @@ 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.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.FixturesInstalledFlag;
import org.apache.isis.objectstore.jdo.datanucleus.JDOStateManagerForIsis;
import org.apache.isis.objectstore.jdo.service.RegisterEntities;
@@ -71,12 +72,12 @@ public class PersistenceSessionFactory implements ApplicationScopedComponent, Fi
private DataNucleusApplicationComponents applicationComponents;
@Programmatic
- public void init() {
- this.applicationComponents = createDataNucleusApplicationComponents(configuration);
+ public void init(final SpecificationLoader specificationLoader) {
+ this.applicationComponents = createDataNucleusApplicationComponents(configuration, specificationLoader);
}
private DataNucleusApplicationComponents createDataNucleusApplicationComponents(
- final IsisConfiguration configuration) {
+ final IsisConfiguration configuration, final SpecificationLoader specificationLoader) {
if (applicationComponents == null || applicationComponents.isStale()) {
@@ -87,7 +88,7 @@ public class PersistenceSessionFactory implements ApplicationScopedComponent, Fi
final Map<String, String> datanucleusProps = dataNucleusConfig.asMap();
addDataNucleusPropertiesIfRequired(datanucleusProps);
- final RegisterEntities registerEntities = new RegisterEntities(configuration.asMap());
+ final RegisterEntities registerEntities = new RegisterEntities(configuration.asMap(), specificationLoader);
final Set<String> classesToBePersisted = registerEntities.getEntityTypes();
applicationComponents = new DataNucleusApplicationComponents(jdoObjectstoreConfig, datanucleusProps, classesToBePersisted);
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/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 fcdd953..b7572ab 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
@@ -293,6 +293,14 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
return false;
}
+ /**
+ * As per {@link #doInSession(Runnable, AuthenticationSession)}, using a default {@link InitialisationSession}.
+ * @param runnable
+ */
+ @Programmatic
+ public void doInSession(final Runnable runnable) {
+ doInSession(runnable, new InitialisationSession());
+ }
/**
* A template method that executes a piece of code in a session.
@@ -300,16 +308,25 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
* is created.
*
* @param runnable The piece of code to run.
+ * @param authenticationSession
*/
@Programmatic
- public void doInSession(final Runnable runnable) {
+ public void doInSession(final Runnable runnable, final AuthenticationSession authenticationSession) {
doInSession(new Callable<Void>() {
@Override
public Void call() throws Exception {
runnable.run();
return null;
}
- });
+ }, authenticationSession);
+ }
+
+ /**
+ * As per {@link #doInSession(Callable), AuthenticationSession}, using a default {@link InitialisationSession}.
+ */
+ @Programmatic
+ public <R> R doInSession(final Callable<R> callable) {
+ return doInSession(callable, new InitialisationSession());
}
/**
@@ -318,15 +335,15 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
* is created.
*
* @param callable The piece of code to run.
- * @return The result of the code execution.
+ * @param authenticationSession - the user to run under
*/
@Programmatic
- public <R> R doInSession(final Callable<R> callable) {
+ public <R> R doInSession(final Callable<R> callable, final AuthenticationSession authenticationSession) {
final IsisSessionFactory sessionFactory = this;
boolean noSession = !sessionFactory.inSession();
try {
if (noSession) {
- sessionFactory.openSession(new InitialisationSession());
+ sessionFactory.openSession(authenticationSession);
}
return callable.call();
@@ -341,7 +358,6 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
}
}
-
//endregion
//region > component accessors
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java
index 516ce99..14e1d69 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java
@@ -311,7 +311,7 @@ public class IsisSessionFilter implements Filter {
final HttpServletRequest httpServletRequest = (HttpServletRequest) request;
final HttpServletResponse httpServletResponse = (HttpServletResponse) response;
- final IsisSessionFactory sessionFactory = getSessionFactory();
+ final IsisSessionFactory sessionFactory = getIsisSessionFactory();
try {
final String queryString = httpServletRequest.getQueryString();
if (queryString != null && queryString.contains(QUERY_STRING_FORCE_LOGOUT)) {
@@ -389,7 +389,7 @@ public class IsisSessionFilter implements Filter {
}
// REVIEW: it ought to be possible to remove this static lookup by binding the IsisSystem or IsisSessionFactory to the thread in an earlier filter
- private IsisSessionFactory getSessionFactory() {
+ private IsisSessionFactory getIsisSessionFactory() {
return IsisContext.getSessionFactory();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyAbstract.java
index 6f01b75..c49d079 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyAbstract.java
@@ -25,6 +25,8 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
public abstract class AuthenticationSessionStrategyAbstract implements AuthenticationSessionStrategy {
@@ -51,4 +53,9 @@ public abstract class AuthenticationSessionStrategyAbstract implements Authentic
httpServletResponse.setStatus(STATUS_UNAUTHORIZED);
}
+ // TODO
+ protected IsisSessionFactory isisSessionFactoryFrom(final HttpServletRequest httpServletRequest) {
+ return IsisContext.getSessionFactory();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
index 1a5949a..5159372 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
@@ -29,6 +29,7 @@ import org.datanucleus.store.fieldmanager.FieldManager;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
public class JDOStateManagerForIsis extends ReferentialStateManagerImpl {
@@ -215,6 +216,10 @@ public class JDOStateManagerForIsis extends ReferentialStateManagerImpl {
}
protected ServicesInjector getServicesInjector() {
- return IsisContext.getSessionFactory().getServicesInjector();
+ return getSessionFactory().getServicesInjector();
+ }
+
+ IsisSessionFactory getSessionFactory() {
+ return IsisContext.getSessionFactory();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
index b3ddcb1..b8820fa 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
@@ -193,7 +193,7 @@ public class IsisJdoSupportImpl implements IsisJdoSupport {
// //////////////////////////////////////
- @Inject
+ @javax.inject.Inject
IsisSessionFactory isisSessionFactory;
protected PersistenceSession getPersistenceSession() {
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/TimestampService.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/TimestampService.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/TimestampService.java
index b270f39..88d4f81 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/TimestampService.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/TimestampService.java
@@ -69,12 +69,12 @@ public class TimestampService implements
// no-op
}
- @Inject
+ @javax.inject.Inject
UserService userService;
- @Inject
+ @javax.inject.Inject
ClockService clockService;
- @Inject
+ @javax.inject.Inject
IsisJdoSupport isisJdoSupport;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
index d5b1ee1..538b5b1 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
@@ -40,7 +40,6 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.runtime.system.context.IsisContext;
public class RegisterEntities {
@@ -54,13 +53,15 @@ public class RegisterEntities {
//region > entityTypes
private final Set<String> entityTypes = Sets.newLinkedHashSet();
+ private final SpecificationLoader specificationLoader;
public Set<String> getEntityTypes() {
return entityTypes;
}
//endregion
- public RegisterEntities(Map<String,String> configuration) {
+ public RegisterEntities(final Map<String, String> configuration, final SpecificationLoader specificationLoader) {
+ this.specificationLoader = specificationLoader;
Set<Class<?>> persistenceCapableTypes = AppManifest.Registry.instance().getPersistenceCapableTypes();
@@ -165,8 +166,8 @@ public class RegisterEntities {
// //////////////////////////////////////
SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSessionFactory().getSpecificationLoader();
+ return specificationLoader;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
index 830205e..9962214 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/DomainObjectReprRenderer.java
@@ -401,14 +401,6 @@ public class DomainObjectReprRenderer extends ReprRendererAbstract<DomainObjectR
return DomainObjectReprRenderer.newLinkToBuilder(resourceContext, Rel.VALUE, objectAdapter).withTitle(title).build();
}
-
-
- // ///////////////////////////////////////////////////////////////////
- // dependencies (from context)
- // ///////////////////////////////////////////////////////////////////
- protected static OidMarshaller getOidMarshaller() {
- return IsisContext.getSessionFactory().getOidMarshaller();
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
index fc521cd..72033bf 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
@@ -208,6 +208,6 @@ public class RepresentationServiceContentNegotiator implements RepresentationSer
}
- @Inject
+ @javax.inject.Inject
List<ContentNegotiationService> contentNegotiationServices;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
index d33fbad..a8d8765 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceAbstract.java
@@ -157,6 +157,6 @@ public abstract class ContentNegotiationServiceAbstract implements ContentNegoti
//endregion
- @Inject
+ @javax.inject.Inject
protected DomainObjectContainer container;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
index 477f325..1d09946 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
@@ -399,6 +399,6 @@ public class ContentNegotiationServiceOrgApacheIsisV1 extends ContentNegotiation
}
- @Inject
+ @javax.inject.Inject
protected DomainObjectContainer container;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
index 06914fd..e4ddd5f 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
@@ -166,9 +166,9 @@ public class ContentNegotiationServiceXRoDomainType extends ContentNegotiationSe
return domainObject;
}
- @Inject
+ @javax.inject.Inject
List<org.apache.isis.applib.conmap.ContentMappingService> contentMappingServices;
- @Inject
+ @javax.inject.Inject
List<ContentMappingService> legacyContentMappingServices;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
index dfc8c75..d26c2e3 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
@@ -27,6 +27,7 @@ import org.jboss.resteasy.spi.interception.DecoratorProcessor;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@DecorateTypes({"text/*+xml", "application/*+xml"})
public class IsisPrettyPrintingProcessor implements DecoratorProcessor<Marshaller, PrettyPrinting> {
@@ -58,11 +59,17 @@ public class IsisPrettyPrintingProcessor implements DecoratorProcessor<Marshalle
}
}
+
+
protected DeploymentCategory getDeploymentCategory() {
- return IsisContext.getSessionFactory().getDeploymentCategory();
+ return getIsisSessionFactory().getDeploymentCategory();
}
protected IsisConfiguration getConfiguration() {
- return IsisContext.getSessionFactory().getConfiguration();
+ return getIsisSessionFactory().getConfiguration();
+ }
+
+ IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RuntimeExceptionMapper.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RuntimeExceptionMapper.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RuntimeExceptionMapper.java
index bc191c5..8553166 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RuntimeExceptionMapper.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/RuntimeExceptionMapper.java
@@ -27,6 +27,7 @@ import com.google.common.base.Throwables;
import org.jboss.resteasy.spi.Failure;
import org.apache.isis.core.commons.exceptions.ExceptionUtils;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
import org.apache.isis.viewer.restfulobjects.applib.RestfulMediaType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
@@ -38,7 +39,7 @@ public class RuntimeExceptionMapper implements ExceptionMapper<RuntimeException>
@Override
public Response toResponse(final RuntimeException ex) {
// since have rendered...
- final IsisTransaction currentTransaction = IsisContext.getSessionFactory().getCurrentSession()
+ final IsisTransaction currentTransaction = getIsisSessionFactory().getCurrentSession()
.getPersistenceSession().getTransactionManager().getCurrentTransaction();
final Throwable rootCause = Throwables.getRootCause(ex);
@@ -65,4 +66,9 @@ public class RuntimeExceptionMapper implements ExceptionMapper<RuntimeException>
return "{ \"exception\": \"" + ExceptionUtils.getFullStackTrace(ex) + "\" }";
}
}
+
+ IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyTrusted.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyTrusted.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyTrusted.java
index d369f39..75fe97a 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyTrusted.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyTrusted.java
@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.runtime.authentication.exploration.AuthenticationRequestExploration;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.webapp.auth.AuthenticationSessionStrategyDefault;
public class AuthenticationSessionStrategyTrusted extends AuthenticationSessionStrategyDefault {
@@ -37,6 +38,7 @@ public class AuthenticationSessionStrategyTrusted extends AuthenticationSessionS
// will always succeed.
final AuthenticationRequestExploration request = new AuthenticationRequestExploration();
- return IsisContext.getSessionFactory().getAuthenticationManager().authenticate(request);
+ return isisSessionFactoryFrom(httpServletRequest).getAuthenticationManager().authenticate(request);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
index e5ab94f..e00c78b 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
@@ -31,7 +31,7 @@ import org.jboss.resteasy.plugins.providers.jaxb.JAXBXmlRootElementProvider;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.core.metamodel.services.ServicesInjector;
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;
import org.apache.isis.schema.utils.jaxbadapters.PersistentEntityAdapter;
@Provider
@@ -51,18 +51,24 @@ public class RestfulObjectsJaxbWriterForXml extends JAXBXmlRootElementProvider {
return Util.hasXRoDomainTypeParameter(mediaType);
}
- @Override protected Marshaller getMarshaller(
+ @Override
+ protected Marshaller getMarshaller(
final Class<?> type, final Annotation[] annotations, final MediaType mediaType) {
final Marshaller marshaller = super.getMarshaller(type, annotations, mediaType);
marshaller.setAdapter(PersistentEntityAdapter.class, new PersistentEntityAdapter() {
@Override
protected BookmarkService getBookmarkService() {
- final PersistenceSession persistenceSession = IsisContext.getSessionFactory().getCurrentSession()
- .getPersistenceSession();
- final ServicesInjector servicesInjector = persistenceSession.getServicesInjector();
- return servicesInjector.lookupService(BookmarkService.class);
+ return getServicesInjector().lookupServiceElseFail(BookmarkService.class);
}
});
return marshaller;
}
+
+ ServicesInjector getServicesInjector() {
+ return getIsisSessionFactory().getServicesInjector();
+ }
+
+ IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
index 1b4fa83..a17cded 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/ResourceAbstract.java
@@ -43,6 +43,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
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;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
@@ -110,7 +111,7 @@ public abstract class ResourceAbstract {
final Where where,
final RepresentationService.Intent intent,
final String urlUnencodedQueryString) {
- if (!IsisContext.getSessionFactory().inSession()) {
+ if (!getIsisSessionFactory().inSession()) {
throw RestfulObjectsApplicationException.create(HttpStatusCode.UNAUTHORIZED);
}
if (getAuthenticationSession() == null) {
@@ -166,31 +167,35 @@ public abstract class ResourceAbstract {
// //////////////////////////////////////////////////////////////
protected DeploymentCategory getDeploymentCategory() {
- return IsisContext.getSessionFactory().getDeploymentCategory();
+ return getIsisSessionFactory().getDeploymentCategory();
}
protected IsisConfiguration getConfiguration () {
- return IsisContext.getSessionFactory().getConfiguration();
+ return getIsisSessionFactory().getConfiguration();
}
protected ServicesInjector getServicesInjector () {
- return IsisContext.getSessionFactory().getServicesInjector();
+ return getIsisSessionFactory().getServicesInjector();
}
protected AuthenticationSession getAuthenticationSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
+ return getIsisSessionFactory().getCurrentSession().getAuthenticationSession();
}
protected AuthenticationManager getAuthenticationManager() {
- return IsisContext.getSessionFactory().getAuthenticationManager();
+ return getIsisSessionFactory().getAuthenticationManager();
}
protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSessionFactory().getSpecificationLoader();
+ return getIsisSessionFactory().getSpecificationLoader();
}
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+ return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
+ }
+
+ protected IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
}
// //////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
index 2642e86..c292d92 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
@@ -32,6 +32,7 @@ import org.apache.isis.applib.services.swagger.SwaggerService;
import org.apache.isis.core.metamodel.services.ServicesInjector;
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;
@Path("/swagger")
public class SwaggerSpecResource {
@@ -71,7 +72,7 @@ public class SwaggerSpecResource {
private String swagger(final SwaggerService.Visibility visibility) {
final SwaggerService.Format format = deriveFrom(httpHeaders);
- String spec = IsisContext.getSessionFactory().doInSession(new MyCallable(visibility, format));
+ String spec = getSessionFactory().doInSession(new MyCallable(visibility, format));
return spec;
}
@@ -93,7 +94,12 @@ public class SwaggerSpecResource {
return SwaggerService.Format.JSON;
}
- static class MyCallable implements Callable<String> {
+ IsisSessionFactory getSessionFactory() {
+ return IsisContext.getSessionFactory();
+ }
+
+
+ class MyCallable implements Callable<String> {
private final SwaggerService.Visibility visibility;
private final SwaggerService.Format format;
@@ -111,7 +117,7 @@ public class SwaggerSpecResource {
return swaggerService.generateSwaggerSpec(visibility, format);
}
- @Inject
+ @javax.inject.Inject
SwaggerService swaggerService;
ServicesInjector getServicesInjector() {
@@ -119,7 +125,7 @@ public class SwaggerSpecResource {
}
PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+ return getSessionFactory().getCurrentSession().getPersistenceSession();
}
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 7fc2c0b..21bb367 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -258,11 +258,17 @@ public class IsisWicketApplication
requestCycleListeners.add(requestCycleListenerForIsis);
requestCycleListeners.add(new PageRequestHandlerTracker());
+ //
+ // create IsisSessionFactory
+ //
final DeploymentCategory deploymentCategory = deploymentType.getDeploymentCategory();
final IsisInjectModule isisModule = newIsisModule(deploymentCategory, configuration);
final Injector injector = Guice.createInjector(isisModule, newIsisWicketModule());
initWicketComponentInjection(injector);
- injector.injectMembers(this);
+
+ injector.injectMembers(this); // populates this.isisSessionFactory
+
+
if (requestCycleListenerForIsis instanceof WebRequestCycleForIsis) {
WebRequestCycleForIsis webRequestCycleForIsis = (WebRequestCycleForIsis) requestCycleListenerForIsis;
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
index cca4423..4999571 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
@@ -36,6 +36,7 @@ import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.models.BookmarkedPagesModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
@@ -134,7 +135,7 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
// /////////////////////////////////////////////////
protected AuthenticationManager getAuthenticationManager() {
- return IsisContext.getSessionFactory().getAuthenticationManager();
+ return getIsisSessionFactory().getAuthenticationManager();
}
// /////////////////////////////////////////////////
@@ -147,7 +148,7 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
final SessionLoggingService.CausedBy causedBy) {
final SessionLoggingService sessionLoggingService = getSessionLoggingService();
if (sessionLoggingService != null) {
- IsisContext.getSessionFactory().doInSession(new Runnable() {
+ getIsisSessionFactory().doInSession(new Runnable() {
@Override
public void run() {
// use hashcode as session identifier, to avoid re-binding http sessions if using Session#getId()
@@ -159,10 +160,12 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
}
protected SessionLoggingService getSessionLoggingService() {
- return IsisContext.getSessionFactory().doInSession(new Callable<SessionLoggingService>() {
+ return getIsisSessionFactory().doInSession(new Callable<SessionLoggingService>() {
@Override
public SessionLoggingService call() throws Exception {
- return IsisContext.getSessionFactory().getServicesInjector().lookupService(SessionLoggingService.class);
+
+ // REVIEW: I strongly suspect that this doesn't need to be done in a session anymore
+ return getIsisSessionFactory().getServicesInjector().lookupService(SessionLoggingService.class);
}
});
}
@@ -172,4 +175,11 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
// do nothing here because this will lead to problems with Shiro
// see https://issues.apache.org/jira/browse/ISIS-1018
}
+
+
+ IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
index abe60a5..1d1de06 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
@@ -38,13 +38,15 @@ public class ConverterForObjectAdapter implements IConverter<ObjectAdapter> {
private static final long serialVersionUID = 1L;
+ private static final OidMarshaller OID_MARSHALLER = new OidMarshaller();
+
/**
* Converts string representation of {@link Oid} to
* {@link ObjectAdapter}.
*/
@Override
public ObjectAdapter convertToObject(final String value, final Locale locale) {
- final Oid oid = RootOid.deStringEncoded(value, getOidMarshaller());
+ final Oid oid = RootOid.deStringEncoded(value, OID_MARSHALLER);
return getPersistenceSession().getAdapterFor(oid);
}
@@ -58,8 +60,8 @@ public class ConverterForObjectAdapter implements IConverter<ObjectAdapter> {
// values don't have an Oid
return null;
}
-
- return oid.enString(getOidMarshaller());
+
+ return oid.enString(OID_MARSHALLER);
}
@@ -72,8 +74,4 @@ public class ConverterForObjectAdapter implements IConverter<ObjectAdapter> {
return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
- protected OidMarshaller getOidMarshaller() {
- return IsisContext.getSessionFactory().getOidMarshaller();
- }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
index 5e0781d..0e8aad5 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
@@ -32,6 +32,7 @@ import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
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;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
/**
@@ -43,6 +44,8 @@ public class ConverterForObjectAdapterMemento implements IConverter<ObjectAdapte
private static final long serialVersionUID = 1L;
+ private static final OidMarshaller OID_MARSHALLER = new OidMarshaller();
+
/**
* Converts string representation of {@link Oid} to
* {@link ObjectAdapterMemento}.
@@ -52,7 +55,7 @@ public class ConverterForObjectAdapterMemento implements IConverter<ObjectAdapte
if (Strings.isNullOrEmpty(value)) {
return null;
}
- final Oid oid = RootOid.deStringEncoded(value, getOidMarshaller());
+ final Oid oid = RootOid.deStringEncoded(value, OID_MARSHALLER);
final ObjectAdapter adapter = getPersistenceSession().getAdapterFor(oid);
return ObjectAdapterMemento.createOrNull(adapter);
}
@@ -72,7 +75,7 @@ public class ConverterForObjectAdapterMemento implements IConverter<ObjectAdapte
// REVIEW: is this right?
return memento.toString();
}
- return oid.enString(getOidMarshaller());
+ return oid.enString(OID_MARSHALLER);
}
@@ -82,11 +85,11 @@ public class ConverterForObjectAdapterMemento implements IConverter<ObjectAdapte
// //////////////////////////////////////////////////////////
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+ return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
}
- protected OidMarshaller getOidMarshaller() {
- return IsisContext.getSessionFactory().getOidMarshaller();
+ IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
index 49ec79f..0e85a56 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/LocalizerForIsis.java
@@ -35,7 +35,7 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.metamodel.services.ServicesInjector;
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;
import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
/**
@@ -44,6 +44,7 @@ import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
*/
public class LocalizerForIsis extends Localizer {
+ public LocalizerForIsis(){}
/**
* Uses Isis' {@link TranslationService} to translate the key, but falls back to Wicket's own implementation
* if no translation is available.
@@ -68,10 +69,10 @@ public class LocalizerForIsis extends Localizer {
protected String translate(final String key, final Component component) {
final Class<?> contextClass = determineContextClassElse(component, IsisWicketApplication.class);
final String context = contextClass.getName();
- if(IsisContext.getSessionFactory().inSession()) {
+ if(getIsisSessionFactory().inSession()) {
return translate(key, context);
} else {
- return IsisContext.getSessionFactory().doInSession(new Callable<String>() {
+ return getIsisSessionFactory().doInSession(new Callable<String>() {
@Override
public String call() throws Exception {
return translate(key, context);
@@ -143,17 +144,18 @@ public class LocalizerForIsis extends Localizer {
return translationService.translate(context, key);
}
+
+
protected TranslationService getTranslationService() {
- return getServicesInjector()
- .lookupService(TranslationService.class);
+ return getServicesInjector().lookupServiceElseFail(TranslationService.class);
}
protected ServicesInjector getServicesInjector() {
- return getPersistenceSession().getServicesInjector();
+ return getIsisSessionFactory().getServicesInjector();
}
- protected PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+ IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
index 4e2500f..8bfff19 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
@@ -52,6 +52,7 @@ import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSession;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
@@ -84,11 +85,10 @@ public class WebRequestCycleForIsis extends AbstractRequestCycleListener {
return;
}
- IsisContext.getSessionFactory().openSession(authenticationSession);
+ getIsisSessionFactory().openSession(authenticationSession);
getTransactionManager().startTransaction();
}
-
/**
* Is called prior to {@link #onEndRequest(RequestCycle)}, and offers the opportunity to
* throw an exception.
@@ -99,7 +99,7 @@ public class WebRequestCycleForIsis extends AbstractRequestCycleListener {
LOG.debug("onRequestHandlerExecuted: handler: " + handler);
}
- if (IsisContext.getSessionFactory().inSession()) {
+ if (getIsisSessionFactory().inSession()) {
try {
// will commit (or abort) the transaction;
// an abort will cause the exception to be thrown.
@@ -130,12 +130,12 @@ public class WebRequestCycleForIsis extends AbstractRequestCycleListener {
*/
@Override
public synchronized void onEndRequest(RequestCycle cycle) {
- if (IsisContext.getSessionFactory().inSession()) {
+ if (getIsisSessionFactory().inSession()) {
try {
// belt and braces
getTransactionManager().endTransaction();
} finally {
- IsisContext.getSessionFactory().closeSession();
+ getIsisSessionFactory().closeSession();
}
}
}
@@ -247,20 +247,25 @@ public class WebRequestCycleForIsis extends AbstractRequestCycleListener {
//region > Dependencies (from isis' context)
protected ServicesInjector getServicesInjector() {
- return IsisContext.getSessionFactory().getServicesInjector();
+ return getIsisSessionFactory().getServicesInjector();
}
protected IsisTransactionManager getTransactionManager() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager();
+ return getIsisSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager();
}
protected boolean inIsisSession() {
- return IsisContext.getSessionFactory().inSession();
+ return getIsisSessionFactory().inSession();
}
protected AuthenticationSession getAuthenticationSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
+ return getIsisSessionFactory().getCurrentSession().getAuthenticationSession();
+ }
+
+ IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
}
+
//endregion
//region > Dependencies (from wicket)
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
index 3c914cf..818efdd 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
@@ -52,7 +52,7 @@ public class ComponentFactoryRegistryDefault implements ComponentFactoryRegistry
private final Multimap<ComponentType, ComponentFactory> componentFactoriesByType;
- @Inject
+ @javax.inject.Inject
public ComponentFactoryRegistryDefault(final ComponentFactoryRegistrar componentFactoryList) {
componentFactoriesByType = Multimaps.newListMultimap(new HashMap<ComponentType, Collection<ComponentFactory>>(), new Supplier<List<ComponentFactory>>() {
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
index 56550c7..0c031ce 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
@@ -50,7 +50,7 @@ public class PageClassRegistryDefault implements PageClassRegistry, PageClassReg
@SuppressWarnings("unused")
private final PageClassList pageClassList;
- @Inject
+ @com.google.inject.Inject
public PageClassRegistryDefault(final PageClassList pageClassList) {
this.pageClassList = pageClassList;
pageClassList.registerPages(this);
[32/50] [abbrv] isis git commit: ISIS-1423: adds null arg guards for
PoWriter (part of i18n support).
Posted by da...@apache.org.
ISIS-1423: adds null arg guards for PoWriter (part of i18n support).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9a1b0386
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9a1b0386
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9a1b0386
Branch: refs/heads/master
Commit: 9a1b03861547af02330376124de374a4a3f25c92
Parents: b128759
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Jun 13 20:47:50 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jun 13 20:47:50 2016 +0100
----------------------------------------------------------------------
.../apache/isis/core/runtime/services/i18n/po/PoWriter.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9a1b0386/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoWriter.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoWriter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoWriter.java
index 736cb49..3fdd34f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoWriter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/PoWriter.java
@@ -105,6 +105,9 @@ class PoWriter extends PoAbstract {
public String translate(final String context, final String msgId) {
+ if(msgId == null) {
+ return null;
+ }
final Block block = blockFor(msgId);
block.contexts.add(context);
@@ -114,6 +117,9 @@ class PoWriter extends PoAbstract {
@Override
String translate(final String context, final String msgId, final String msgIdPlural, final int num) {
+ if(msgId == null) {
+ return null;
+ }
final Block block = blockFor(msgId);
block.contexts.add(context);
block.msgIdPlural = msgIdPlural;
[33/50] [abbrv] isis git commit: ISIS-1356: always install the
BulkFacet, even if not annotated.
Posted by da...@apache.org.
ISIS-1356: always install the BulkFacet, even if not annotated.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bd447a27
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bd447a27
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bd447a27
Branch: refs/heads/master
Commit: bd447a270bf7be06d934936ba505e0c7814fdd40
Parents: 9a1b038
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Jun 13 22:44:47 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jun 13 22:44:47 2016 +0100
----------------------------------------------------------------------
.../org/apache/isis/applib/annotation/Bulk.java | 7 ++++-
.../apache/isis/applib/annotation/InvokeOn.java | 13 ++++----
.../action/ActionAnnotationFacetFactory.java | 4 +++
.../bulk/BulkFacetForActionAnnotation.java | 10 +-----
.../action/bulk/BulkFacetObjectOnly.java | 33 ++++++++++++++++++++
.../metamodel/spec/feature/ObjectAction.java | 4 ++-
.../java/domainapp/dom/simple/SimpleObject.java | 10 ++++++
7 files changed, 64 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/bd447a27/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
index 98759a2..aac9d6f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/Bulk.java
@@ -48,7 +48,12 @@ public @interface Bulk {
* @deprecated - see {@link InvokeOn#COLLECTION_ONLY}
*/
@Deprecated
- BULK_ONLY
+ BULK_ONLY,
+ /**
+ * @deprecated - see {@link InvokeOn#OBJECT_ONLY}
+ */
+ @Deprecated
+ REGULAR_ONLY
}
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/bd447a27/core/applib/src/main/java/org/apache/isis/applib/annotation/InvokeOn.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/annotation/InvokeOn.java b/core/applib/src/main/java/org/apache/isis/applib/annotation/InvokeOn.java
index d8e01f7..ca52a9b 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/annotation/InvokeOn.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/annotation/InvokeOn.java
@@ -44,13 +44,13 @@ public enum InvokeOn {
COLLECTION_ONLY;
@Deprecated
- public static Bulk.AppliesTo from(final InvokeOn appliesToPolicy) {
- if(appliesToPolicy == null) return null;
- if(appliesToPolicy == OBJECT_AND_COLLECTION) return Bulk.AppliesTo.BULK_AND_REGULAR;
- if(appliesToPolicy == COLLECTION_ONLY) return Bulk.AppliesTo.BULK_ONLY;
- if(appliesToPolicy == OBJECT_ONLY) throw new IllegalArgumentException("No corresponding Bulk.AppliesTo enum for " + appliesToPolicy);
+ public static Bulk.AppliesTo from(final InvokeOn invokeOn) {
+ if(invokeOn == null) return null;
+ if(invokeOn == OBJECT_AND_COLLECTION) return Bulk.AppliesTo.BULK_AND_REGULAR;
+ if(invokeOn == COLLECTION_ONLY) return Bulk.AppliesTo.BULK_ONLY;
+ if(invokeOn == OBJECT_ONLY) return Bulk.AppliesTo.REGULAR_ONLY;
// shouldn't happen
- throw new IllegalArgumentException("Unrecognized appliesTo: " + appliesToPolicy);
+ throw new IllegalArgumentException("Unrecognized appliesTo: " + invokeOn);
}
@Deprecated
@@ -58,6 +58,7 @@ public enum InvokeOn {
if(appliesTo == null) return null;
if(appliesTo == Bulk.AppliesTo.BULK_AND_REGULAR) return OBJECT_AND_COLLECTION;
if(appliesTo == Bulk.AppliesTo.BULK_ONLY) return COLLECTION_ONLY;
+ if(appliesTo == Bulk.AppliesTo.REGULAR_ONLY) return OBJECT_ONLY;
// shouldn't happen
throw new IllegalArgumentException("Unrecognized appliesTo: " + appliesTo);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/bd447a27/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 01b6a6e..1bb357e 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
@@ -52,6 +52,7 @@ import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromArray;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetInferredFromGenerics;
+import org.apache.isis.core.metamodel.facets.actions.action.bulk.BulkFacetObjectOnly;
import org.apache.isis.core.metamodel.facets.actions.action.bulk.BulkFacetForActionAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.bulk.BulkFacetForBulkAnnotation;
import org.apache.isis.core.metamodel.facets.actions.action.command.CommandFacetForActionAnnotation;
@@ -342,6 +343,9 @@ public class ActionAnnotationFacetFactory extends FacetFactoryAbstract
if(facet == null) {
facet = BulkFacetForActionAnnotation.create(action, holder);
}
+ if(facet == null) {
+ facet = new BulkFacetObjectOnly(holder);
+ }
FacetUtil.addFacet(facet);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/bd447a27/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/bulk/BulkFacetForActionAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/bulk/BulkFacetForActionAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/bulk/BulkFacetForActionAnnotation.java
index c610a9a..bdf1319 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/bulk/BulkFacetForActionAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/bulk/BulkFacetForActionAnnotation.java
@@ -39,15 +39,7 @@ public class BulkFacetForActionAnnotation extends BulkFacetAbstract {
return null;
}
- switch (invokeOn) {
- case OBJECT_ONLY:
- return null;
- case OBJECT_AND_COLLECTION:
- return new BulkFacetForActionAnnotation(InvokeOn.from(invokeOn), holder);
- case COLLECTION_ONLY:
- return new BulkFacetForActionAnnotation(InvokeOn.from(invokeOn), holder);
- }
- return null;
+ return new BulkFacetForActionAnnotation(InvokeOn.from(invokeOn), holder);
}
private BulkFacetForActionAnnotation(
http://git-wip-us.apache.org/repos/asf/isis/blob/bd447a27/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/bulk/BulkFacetObjectOnly.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/bulk/BulkFacetObjectOnly.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/bulk/BulkFacetObjectOnly.java
new file mode 100644
index 0000000..0cc41b6
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/action/bulk/BulkFacetObjectOnly.java
@@ -0,0 +1,33 @@
+/*
+ * 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.metamodel.facets.actions.action.bulk;
+
+import org.apache.isis.applib.annotation.Bulk;
+import org.apache.isis.core.metamodel.facetapi.FacetHolder;
+import org.apache.isis.core.metamodel.facets.actions.bulk.BulkFacetAbstract;
+
+public class BulkFacetObjectOnly extends BulkFacetAbstract {
+
+ public BulkFacetObjectOnly(
+ final FacetHolder holder) {
+ super(Bulk.AppliesTo.REGULAR_ONLY, holder);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/bd447a27/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
index 80c295b..a8552b2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectAction.java
@@ -392,7 +392,9 @@ public interface ObjectAction extends ObjectMember {
@Override
public boolean accept(ObjectAction oa) {
- if (!oa.containsDoOpFacet(BulkFacet.class)) {
+
+ final BulkFacet bulkFacet = oa.getFacet(BulkFacet.class);
+ if(bulkFacet == null || bulkFacet.isNoop() || bulkFacet.value() == Bulk.AppliesTo.REGULAR_ONLY) {
return false;
}
if (oa.getParameterCount() != 0) {
http://git-wip-us.apache.org/repos/asf/isis/blob/bd447a27/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.java b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
index ff780e9..99ad528 100644
--- a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
+++ b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
@@ -33,7 +33,9 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
import org.apache.isis.applib.services.eventbus.PropertyDomainEvent;
import org.apache.isis.applib.services.i18n.TranslatableString;
+import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.repository.RepositoryService;
+import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.util.ObjectContracts;
@javax.jdo.annotations.PersistenceCapable(
@@ -127,6 +129,8 @@ public class SimpleObject implements Comparable<SimpleObject> {
semantics = SemanticsOf.NON_IDEMPOTENT_ARE_YOU_SURE
)
public void delete() {
+ final String title = titleService.titleOf(this);
+ messageService.informUser(String.format("'%s' deleted", title));
repositoryService.remove(this);
}
@@ -141,4 +145,10 @@ public class SimpleObject implements Comparable<SimpleObject> {
@javax.inject.Inject
RepositoryService repositoryService;
+ @javax.inject.Inject
+ TitleService titleService;
+
+ @javax.inject.Inject
+ MessageService messageService;
+
}
[06/50] [abbrv] isis git commit: ISIS-1428: removing
SpecificationLoaderInstaller, just use the JavaReflectorInstaller directly;
JavaReflectorInstaller no longer inherit from InstallerAbstract
Posted by da...@apache.org.
ISIS-1428: removing SpecificationLoaderInstaller, just use the JavaReflectorInstaller directly; JavaReflectorInstaller no longer inherit from InstallerAbstract
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8d4acc55
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8d4acc55
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8d4acc55
Branch: refs/heads/master
Commit: 8d4acc559b78587cd907caa62f8bfc187c6e637a
Parents: f6bf4ea
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 8 07:07:22 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 8 07:07:22 2016 +0100
----------------------------------------------------------------------
.../SpecificationLoaderInstaller.java | 41 -------------------
.../progmodels/dflt/JavaReflectorInstaller.java | 42 ++++----------------
.../isis/core/runtime/runner/Constants.java | 10 -----
.../IsisComponentProvider.java | 5 +--
4 files changed, 9 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8d4acc55/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderInstaller.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderInstaller.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderInstaller.java
deleted file mode 100644
index 60a4f08..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderInstaller.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.metamodel.specloader;
-
-import java.util.Collection;
-
-import org.apache.isis.core.commons.components.Installer;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-
-/**
- * Installs a {@link SpecificationLoader} during system start up.
- */
-public interface SpecificationLoaderInstaller extends Installer {
-
- String TYPE = "reflector";
-
- SpecificationLoader createReflector(
- final DeploymentCategory deploymentCategory,
- final Collection<MetaModelRefiner> metaModelRefiners,
- final ServicesInjector servicesInjector);
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/8d4acc55/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
index a8467f4..3a87262 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
@@ -27,8 +27,6 @@ import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.isis.core.commons.components.InstallerAbstract;
-import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.factory.InstanceUtil;
@@ -40,44 +38,26 @@ import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.ReflectorConstants;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoaderInstaller;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
-public class JavaReflectorInstaller extends InstallerAbstract implements SpecificationLoaderInstaller {
-
- //region > constants
+public class JavaReflectorInstaller {
private static final Logger LOG = LoggerFactory.getLogger(JavaReflectorInstaller.class);
- public static final String PROPERTY_BASE = ConfigurationConstants.ROOT;
-
- //endregion
-
- //region > constructor
-
- public JavaReflectorInstaller(final IsisConfigurationDefault isisConfiguration) {
- this("java", isisConfiguration);
- }
-
- public JavaReflectorInstaller(final String name, final IsisConfigurationDefault isisConfiguration) {
- super(name, isisConfiguration);
-
- }
- //endregion
-
//region > createReflector, doCreateReflector
- @Override
public SpecificationLoader createReflector(
final DeploymentCategory deploymentCategory,
+ final IsisConfigurationDefault configuration,
final Collection<MetaModelRefiner> metaModelRefiners,
final ServicesInjector servicesInjector) {
- final ProgrammingModel programmingModel = createProgrammingModel(getConfiguration());
- final MetaModelValidator mmv = createMetaModelValidator(getConfiguration());
- final List<LayoutMetadataReader> layoutMetadataReaders = createLayoutMetadataReaders(getConfiguration());
+ final ProgrammingModel programmingModel = createProgrammingModel(configuration);
+ final MetaModelValidator mmv = createMetaModelValidator(configuration);
+ final List<LayoutMetadataReader> layoutMetadataReaders = createLayoutMetadataReaders(configuration);
- return JavaReflectorHelper.createObjectReflector(deploymentCategory, getConfiguration(), programmingModel, metaModelRefiners,
+ return JavaReflectorHelper.createObjectReflector(
+ deploymentCategory, configuration, programmingModel, metaModelRefiners,
layoutMetadataReaders, mmv,
servicesInjector);
}
@@ -174,13 +154,5 @@ public class JavaReflectorInstaller extends InstallerAbstract implements Specifi
//endregion
- //region > getTypes
-
- @Override
- public List<Class<?>> getTypes() {
- return listOf(SpecificationLoader.class);
- }
-
- //endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/8d4acc55/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/Constants.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/Constants.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/Constants.java
index 21f37e4..51d7d0d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/Constants.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/Constants.java
@@ -19,7 +19,6 @@
package org.apache.isis.core.runtime.runner;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoaderInstaller;
import org.apache.isis.core.runtime.logging.LoggingConstants;
import org.apache.isis.core.runtime.system.DeploymentType;
@@ -34,9 +33,6 @@ public final class Constants {
public static final String TYPE_SERVER_PROTOTYPE = DeploymentType.SERVER_PROTOTYPE.friendlyName();
public static final String TYPE_SERVER = DeploymentType.SERVER.friendlyName();
- public static final String REFLECTOR_OPT = "l";
- public static final String REFLECTOR_LONG_OPT = SpecificationLoaderInstaller.TYPE;
-
public static final String CONFIGURATION_OPT = "c";
public static final String CONFIGURATION_LONG_OPT = "config";
@@ -49,18 +45,12 @@ public final class Constants {
public static final String HELP_OPT = "h";
public static final String HELP_LONG_OPT = "help";
- public static final String NO_SPLASH_OPT = "s";
- public static final String NO_SPLASH_LONG_OPT = "nosplash";
-
public static final String USER_OPT = "u";
public static final String USER_LONG_OPT = "user";
public static final String PASSWORD_OPT = "p";
public static final String PASSWORD_LONG_OPT = "password";
- public static final String DIAGNOSTICS_OPT = "diagnostics";
- public static final String VERSION_OPT = "version";
-
public static final String DEBUG_OPT = LoggingConstants.DEBUG_OPT;
public static final String VERBOSE_OPT = LoggingConstants.VERBOSE_OPT;
public static final String QUIET_OPT = LoggingConstants.QUIET_OPT;
http://git-wip-us.apache.org/repos/asf/isis/blob/8d4acc55/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
index 7c35995..673dbe1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
@@ -51,7 +51,6 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoaderInstaller;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.fixtures.FixturesInstaller;
@@ -268,9 +267,9 @@ public abstract class IsisComponentProvider {
final ServicesInjector servicesInjector,
final Collection<MetaModelRefiner> metaModelRefiners) throws IsisSystemException {
- final SpecificationLoaderInstaller reflectorInstaller = new JavaReflectorInstaller(getConfiguration());
+ final JavaReflectorInstaller reflectorInstaller = new JavaReflectorInstaller();
- return reflectorInstaller.createReflector(deploymentCategory, metaModelRefiners, servicesInjector);
+ return reflectorInstaller.createReflector(deploymentCategory, getConfiguration(), metaModelRefiners, servicesInjector);
}
//endregion
[20/50] [abbrv] isis git commit: ISIS-1427: removes use of
IsisContext within domain services.
Posted by da...@apache.org.
ISIS-1427: removes use of IsisContext within domain services.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1032ada1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1032ada1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1032ada1
Branch: refs/heads/master
Commit: 1032ada1f2a7ffd04e0252b240a3c6bca04d4877
Parents: 346a153
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jun 10 11:46:13 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jun 10 11:46:13 2016 +0100
----------------------------------------------------------------------
.../homepage/HomePageProviderServiceDefault.java | 11 +++++++++--
.../runtime/services/i18n/po/TranslationServicePo.java | 12 ++++++------
.../TransactionStateProviderInternalDefault.java | 13 +++++++++----
.../runtime/system/persistence/PersistenceSession.java | 9 ---------
.../service/support/IsisJdoSupportImpl.java | 5 ++---
5 files changed, 26 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1032ada1/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
index c99c304..51787c2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
@@ -20,6 +20,8 @@ package org.apache.isis.core.runtime.services.homepage;
import java.util.List;
+import javax.inject.Inject;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,8 +37,8 @@ import org.apache.isis.core.metamodel.facets.actions.homepage.HomePageFacet;
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.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@DomainService(
nature = NatureOfService.DOMAIN
@@ -105,8 +107,13 @@ public class HomePageProviderServiceDefault implements HomePageProviderService {
// for any other value for Where
protected static final Where WHERE_FOR_ACTION_INVOCATION = Where.ANYWHERE;
+
+ @Inject
+ IsisSessionFactory isisSessionFactory;
+
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+ return isisSessionFactory.getCurrentSession().getPersistenceSession();
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1032ada1/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
index fb73e1b..54eb28b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.services.i18n.LocaleProvider;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.i18n.TranslationsResolver;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
@DomainService(
nature = NatureOfService.DOMAIN
@@ -169,13 +169,14 @@ public class TranslationServicePo implements TranslationService {
// //////////////////////////////////////
DeploymentCategory getDeploymentCategory() {
- return IsisContext.getSessionFactory().getDeploymentCategory();
+ return deploymentCategoryProvider.getDeploymentCategory();
}
+ @Inject
+ DeploymentCategoryProvider deploymentCategoryProvider;
@Inject
- private
- TranslationsResolver translationsResolver;
+ private TranslationsResolver translationsResolver;
@Programmatic
TranslationsResolver getTranslationsResolver() {
@@ -183,8 +184,7 @@ public class TranslationServicePo implements TranslationService {
}
@Inject
- private
- LocaleProvider localeProvider;
+ private LocaleProvider localeProvider;
@Programmatic
LocaleProvider getLocaleProvider() {
http://git-wip-us.apache.org/repos/asf/isis/blob/1032ada1/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java
index d60031a..20e2d1a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java
@@ -18,12 +18,14 @@
*/
package org.apache.isis.core.runtime.services.transtate;
+import javax.inject.Inject;
+
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.core.metamodel.services.transtate.TransactionStateProviderInternal;
import org.apache.isis.core.metamodel.transactions.TransactionState;
-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;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
@@ -44,12 +46,15 @@ public class TransactionStateProviderInternalDefault implements TransactionState
return state.getRuntimeContextState();
}
- private static IsisTransactionManager getTransactionManager() {
+ private IsisTransactionManager getTransactionManager() {
return getPersistenceSession().getTransactionManager();
}
- private static PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+ private PersistenceSession getPersistenceSession() {
+ return isisSessionFactory.getCurrentSession().getPersistenceSession();
}
+ @Inject
+ IsisSessionFactory isisSessionFactory;
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1032ada1/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 72c4515..0c5b58e 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
@@ -1220,7 +1220,6 @@ public class PersistenceSession implements
*/
private CreateObjectCommand newCreateObjectCommand(final ObjectAdapter adapter) {
ensureOpened();
- ensureInSession();
if (LOG.isDebugEnabled()) {
LOG.debug("create object - creating command for: " + adapter);
@@ -1231,13 +1230,8 @@ public class PersistenceSession implements
return new DataNucleusCreateObjectCommand(adapter, persistenceManager);
}
- private void ensureInSession() {
- ensureThatContext(IsisContext.getSessionFactory().inSession(), is(true));
- }
-
private DestroyObjectCommand newDestroyObjectCommand(final ObjectAdapter adapter) {
ensureOpened();
- ensureInSession();
if (LOG.isDebugEnabled()) {
LOG.debug("destroy object - creating command for: " + adapter);
@@ -1252,9 +1246,6 @@ public class PersistenceSession implements
//region > execute
public void execute(final List<PersistenceCommand> commands) {
- ensureOpened();
- ensureInTransaction();
-
// previously we used to check that there were some commands, and skip processing otherwise.
// we no longer do that; it could be (is quite likely) that DataNucleus has some dirty objects anyway that
// don't have commands wrapped around them...
http://git-wip-us.apache.org/repos/asf/isis/blob/1032ada1/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
index e1e9d57..b3ddcb1 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
@@ -48,7 +48,6 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
-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;
import org.apache.isis.objectstore.jdo.applib.service.support.IsisJdoSupport;
@@ -198,11 +197,11 @@ public class IsisJdoSupportImpl implements IsisJdoSupport {
IsisSessionFactory isisSessionFactory;
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+ return isisSessionFactory.getCurrentSession().getPersistenceSession();
}
protected ServicesInjector getServicesInjector() {
- return getPersistenceSession().getServicesInjector();
+ return isisSessionFactory.getServicesInjector();
}
@Programmatic
[21/50] [abbrv] isis git commit: ISIS-1427: consolidating to only
necessary calls to IsisContext#getIsisSessionFactory;
also fully qualify @Inject (as either javax or com.google) throughout.
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
index 4aa083f..a432553 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
@@ -18,12 +18,8 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars.datepicker;
-import de.agilecoders.wicket.core.util.Attributes;
-
import java.util.Locale;
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -34,8 +30,13 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.util.convert.IConverter;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.DateConverter;
+import de.agilecoders.wicket.core.util.Attributes;
import static de.agilecoders.wicket.jquery.JQuery.$;
/**
@@ -157,7 +158,9 @@ public class TextFieldWithDateTimePicker<T> extends TextField<T> implements ICon
}
IsisConfiguration getConfiguration() {
- return IsisContext.getSessionFactory().getConfiguration();
+ return getIsisSessionFactory().getConfiguration();
+ }IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index 65c80e6..4a353a0 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -21,8 +21,6 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.reference;
import java.util.List;
-import javax.inject.Inject;
-
import com.google.common.collect.Lists;
import org.apache.wicket.AttributeModifier;
@@ -525,7 +523,7 @@ public class ReferencePanel extends ScalarPanelAbstract {
return autoCompleteFacet != null;
}
- @Inject
+ @com.google.inject.Inject
private WicketViewerSettings wicketViewerSettings;
// REVIEW: can't inject because IsisConfiguration not serializable.
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
index d0a6ce6..dd9eb31 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/standalonecollection/StandaloneCollectionPanel.java
@@ -141,7 +141,7 @@ public class StandaloneCollectionPanel extends PanelAbstract<EntityCollectionMod
@Override
public ObjectAdapterToggleboxColumn createToggleboxColumn() {
- final List<ObjectAction> bulkActions = bulkActionsHelper.getBulkActions();
+ final List<ObjectAction> bulkActions = bulkActionsHelper.getBulkActions(getIsisSessionFactory());
final EntityCollectionModel entityCollectionModel = getModel();
if(bulkActions.isEmpty() || entityCollectionModel.isParented()) {
@@ -176,7 +176,7 @@ public class StandaloneCollectionPanel extends PanelAbstract<EntityCollectionMod
final BulkActionsLinkFactory linkFactory =
new BulkActionsLinkFactory(getModel(), toggleboxColumn);
- final List<ObjectAction> bulkActions = bulkActionsHelper.getBulkActions();
+ final List<ObjectAction> bulkActions = bulkActionsHelper.getBulkActions(getIsisSessionFactory());
List<LinkAndLabel> links = Lists.transform(bulkActions, new Function<ObjectAction, LinkAndLabel>(){
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
index 9b741cd..2ca9e8f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
@@ -19,9 +19,10 @@
package org.apache.isis.viewer.wicket.ui.components.welcome;
-import com.google.inject.Inject;
import com.google.inject.name.Named;
+
import org.apache.wicket.markup.html.basic.Label;
+
import org.apache.isis.viewer.wicket.model.models.WelcomeModel;
import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
@@ -36,7 +37,7 @@ public class WelcomePanel extends PanelAbstract<WelcomeModel> {
private static final String ID_MESSAGE = "message";
- @Inject
+ @com.google.inject.Inject
@Named("welcomeMessage")
private String welcomeMessage;
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
index bb72f1e..20b3aa8 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/ObjectAdapterMementoProviderAbstract.java
@@ -122,7 +122,7 @@ public abstract class ObjectAdapterMementoProviderAbstract extends TextChoicePro
if(NULL_PLACEHOLDER.equals(input)) {
return null;
}
- final RootOid oid = RootOid.deString(input, ObjectAdapterMemento.getOidMarshaller());
+ final RootOid oid = RootOid.deString(input, ObjectAdapterMemento.OID_MARSHALLER);
return ObjectAdapterMemento.createPersistent(oid);
}
};
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
index 4416c82..55fd1ae 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
@@ -29,7 +29,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
@@ -38,6 +37,7 @@ public class BreadcrumbModel implements Serializable {
private static final long serialVersionUID = 1L;
private static final int MAX_SIZE = 5;
+ public static final OidMarshaller OID_MARSHALLER = new OidMarshaller();
private final Map<String, EntityModel> entityModelByOidStr = Maps.newHashMap();
private final Map<EntityModel, String> oidStrByEntityModel = Maps.newHashMap();
@@ -73,8 +73,8 @@ public class BreadcrumbModel implements Serializable {
return null;
}
try {
- final RootOid unmarshal = getOidMarshaller().unmarshal(oidStr, RootOid.class);
- return unmarshal.enStringNoVersion(getOidMarshaller());
+ final RootOid unmarshal = OID_MARSHALLER.unmarshal(oidStr, RootOid.class);
+ return unmarshal.enStringNoVersion(OID_MARSHALLER);
} catch(Exception ex) {
return null;
}
@@ -118,7 +118,7 @@ public class BreadcrumbModel implements Serializable {
try {
final PageParameters pageParameters = choice.getPageParameters();
final String oidStr = PageParameterNames.OBJECT_OID.getStringFrom(pageParameters);
- return RootOid.deString(oidStr, getOidMarshaller());
+ return RootOid.deString(oidStr, OID_MARSHALLER);
} catch (Exception ex) {
remove(choice);
return null;
@@ -147,11 +147,4 @@ public class BreadcrumbModel implements Serializable {
list.remove(model);
}
-
-
- protected OidMarshaller getOidMarshaller() {
- return IsisContext.getSessionFactory().getOidMarshaller();
- }
-
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
index f566271..51a8fac 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/favicon/Favicon.java
@@ -16,8 +16,8 @@
*/
package org.apache.isis.viewer.wicket.ui.components.widgets.favicon;
-import com.google.inject.Inject;
import com.google.inject.name.Named;
+
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.util.string.Strings;
@@ -27,11 +27,11 @@ import org.apache.wicket.util.string.Strings;
*/
public class Favicon extends WebComponent {
- @Inject(optional = true)
+ @com.google.inject.Inject(optional = true)
@Named("faviconUrl")
private String url;
- @Inject(optional = true)
+ @com.google.inject.Inject(optional = true)
@Named("faviconContentType")
private String contentType;
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
index 2f46e37..f0b2a4a 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandName.java
@@ -18,8 +18,8 @@
*/
package org.apache.isis.viewer.wicket.ui.components.widgets.navbar;
-import com.google.inject.Inject;
import com.google.inject.name.Named;
+
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.Model;
@@ -30,7 +30,7 @@ public class BrandName extends Label {
private final Placement placement;
- @Inject
+ @com.google.inject.Inject
@Named("applicationName")
private String applicationName;
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
index e22639f..3956c45 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
@@ -43,6 +43,7 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import de.agilecoders.wicket.core.Bootstrap;
import de.agilecoders.wicket.core.settings.ActiveThemeProvider;
@@ -234,6 +235,10 @@ public class ThemeChooser extends Panel {
}
private IsisConfiguration getConfiguration() {
- return IsisContext.getSessionFactory().getConfiguration();
+ return getIsisSessionFactory().getConfiguration();
+ }
+
+ IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
index 84b170e..dcf12bd 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
@@ -20,15 +20,11 @@ package org.apache.isis.viewer.wicket.ui.components.widgets.valuechoices;
import java.util.Collection;
import java.util.List;
-import javax.inject.Inject;
-
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.base.Strings;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
-import org.wicketstuff.select2.ChoiceProvider;
-import org.wicketstuff.select2.Select2Choice;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
@@ -37,6 +33,8 @@ import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.wicketstuff.select2.ChoiceProvider;
+import org.wicketstuff.select2.Select2Choice;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
@@ -294,6 +292,6 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
return scalarModel;
}
- @Inject
+ @com.google.inject.Inject
private WicketViewerSettings wicketViewerSettings;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
index 0620b0d..0d20a24 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
@@ -31,7 +31,7 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.core.commons.authentication.MessageBroker;
import org.apache.isis.core.runtime.system.context.IsisContext;
-
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
/**
* Attach to any Ajax button that might trigger a notification (ie calls
@@ -75,7 +75,11 @@ public class JGrowlBehaviour extends AbstractDefaultAjaxBehavior {
protected MessageBroker getMessageBroker() {
- return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession().getMessageBroker();
+ return getIsisSessionFactory().getCurrentSession().getAuthenticationSession().getMessageBroker();
+ }
+
+ IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 8e19bb8..d7dad78 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -429,16 +429,16 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
//region > injected (application-scope)
// REVIEW: can't inject because not serializable.
- private IsisSessionFactory getSessionFactory() {
+ protected IsisSessionFactory getIsisSessionFactory() {
return IsisContext.getSessionFactory();
}
protected IsisConfiguration getConfiguration() {
- return getSessionFactory().getConfiguration();
+ return getIsisSessionFactory().getConfiguration();
}
protected ServicesInjector getServicesInjector() {
- return getSessionFactory().getServicesInjector();
+ return getIsisSessionFactory().getServicesInjector();
}
//endregion
@@ -446,11 +446,11 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
//region > derived from injected components (session-scope)
protected PersistenceSession getPersistenceSession() {
- return getSessionFactory().getCurrentSession().getPersistenceSession();
+ return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
}
protected AuthenticationSession getAuthenticationSession() {
- return getSessionFactory().getCurrentSession().getAuthenticationSession();
+ return getIsisSessionFactory().getCurrentSession().getAuthenticationSession();
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
index ccad2b9..7116a4d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
@@ -38,6 +38,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.components.widgets.navbar.BrandLogo;
import org.apache.isis.viewer.wicket.ui.components.widgets.navbar.BrandName;
@@ -152,7 +153,11 @@ public class AccountManagementPageAbstract extends WebPage {
// ///////////////////////////////////////////////////
protected IsisConfiguration getConfiguration() {
- return IsisContext.getSessionFactory().getConfiguration();
+ return getIsisSessionFactory().getConfiguration();
+ }
+
+ protected IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
}
@javax.inject.Inject
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
index 566471b..697df6d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
@@ -22,7 +22,9 @@ import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
/**
* Validates that an email is or is not already in use by another user
@@ -42,11 +44,10 @@ public class EmailAvailableValidator implements IValidator<String> {
@Override
public void validate(final IValidatable<String> validatable) {
- IsisContext.getSessionFactory().doInSession(new Runnable() {
+ getSessionFactory().doInSession(new Runnable() {
@Override
public void run() {
- UserRegistrationService userRegistrationService = IsisContext.getSessionFactory().getCurrentSession()
- .getPersistenceSession().getServicesInjector().lookupService(UserRegistrationService.class);
+ UserRegistrationService userRegistrationService = getServicesInjector().lookupService(UserRegistrationService.class);
String email = validatable.getValue();
boolean emailExists1 = userRegistrationService.emailExists(email);
if (emailExists1 != emailExists) {
@@ -55,5 +56,11 @@ public class EmailAvailableValidator implements IValidator<String> {
}
});
+ }ServicesInjector getServicesInjector() {
+ return getSessionFactory().getServicesInjector();
+ }
+
+ IsisSessionFactory getSessionFactory() {
+ return IsisContext.getSessionFactory();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java
index 2b1f474..7dd8269 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailVerificationUrlServiceDefault.java
@@ -19,13 +19,14 @@
package org.apache.isis.viewer.wicket.ui.pages.accmngt;
import java.util.UUID;
-import javax.inject.Inject;
+
import org.apache.wicket.Application;
import org.apache.wicket.Page;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.UrlRenderer;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.EmailVerificationUrlService;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
@@ -41,7 +42,7 @@ public class EmailVerificationUrlServiceDefault implements EmailVerificationUrlS
private final PageClassRegistry pageClassRegistry;
- @Inject
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
public EmailVerificationUrlServiceDefault(PageClassRegistry pageClassRegistry) {
this.pageClassRegistry = pageClassRegistry;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
index 17e9313..45dbf62 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
@@ -22,7 +22,9 @@ import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
/**
* Validates that an username is or is not already in use by someone else
@@ -36,12 +38,12 @@ public class UsernameAvailableValidator implements IValidator<String> {
@Override
public void validate(final IValidatable<String> validatable) {
- IsisContext.getSessionFactory().doInSession(new Runnable() {
+ getIsisSessionFactory().doInSession(new Runnable() {
@Override
public void run() {
- UserRegistrationService userRegistrationService = IsisContext.getSessionFactory().getCurrentSession()
- .getPersistenceSession().getServicesInjector().lookupServiceElseFail(UserRegistrationService.class);
- String username = validatable.getValue();
+ UserRegistrationService userRegistrationService = getServicesInjector().lookupServiceElseFail(UserRegistrationService.class);
+
+ final String username = validatable.getValue();
boolean usernameExists = userRegistrationService.usernameExists(username);
if (usernameExists) {
validatable.error(new ValidationError().addKey("usernameIsNotAvailable"));
@@ -50,4 +52,12 @@ public class UsernameAvailableValidator implements IValidator<String> {
});
}
+
+ ServicesInjector getServicesInjector() {
+ return getIsisSessionFactory().getServicesInjector();
+ }
+
+ IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.java
index 39f0d70..c0f2058 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetEmailPanel.java
@@ -22,17 +22,6 @@ package org.apache.isis.viewer.wicket.ui.pages.accmngt.password_reset;
import java.util.HashMap;
import java.util.Map;
-import javax.inject.Inject;
-
-import org.apache.isis.applib.services.email.EmailService;
-import org.apache.isis.applib.services.userreg.EmailNotificationService;
-import org.apache.isis.applib.services.userreg.events.PasswordResetEvent;
-import org.apache.isis.viewer.wicket.model.models.PageType;
-import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
-import org.apache.isis.viewer.wicket.ui.pages.EmailVerificationUrlService;
-import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
-import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountManagementPageAbstract;
-import org.apache.isis.viewer.wicket.ui.pages.accmngt.EmailAvailableValidator;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.StatelessForm;
@@ -43,7 +32,15 @@ import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.util.cookies.CookieUtils;
import org.apache.wicket.validation.validator.EmailAddressValidator;
-import com.google.inject.name.Named;
+import org.apache.isis.applib.services.email.EmailService;
+import org.apache.isis.applib.services.userreg.EmailNotificationService;
+import org.apache.isis.applib.services.userreg.events.PasswordResetEvent;
+import org.apache.isis.viewer.wicket.model.models.PageType;
+import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
+import org.apache.isis.viewer.wicket.ui.pages.EmailVerificationUrlService;
+import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
+import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountManagementPageAbstract;
+import org.apache.isis.viewer.wicket.ui.pages.accmngt.EmailAvailableValidator;
/**
* A panel with a form for creation of new users
@@ -108,19 +105,20 @@ public class PasswordResetEmailPanel extends Panel {
form.add(signUpButton);
}
- @Inject
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
private EmailNotificationService emailNotificationService;
- @Inject
+
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
private EmailService emailService;
- @Inject
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
private EmailVerificationUrlService emailVerificationUrlService;
- @Inject
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
private PageNavigationService pageNavigationService;
- @Inject
- @Named("applicationName")
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
+ @com.google.inject.name.Named("applicationName")
private String applicationName;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
index 2b04a3b..351e364 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
@@ -19,20 +19,21 @@
package org.apache.isis.viewer.wicket.ui.pages.accmngt.password_reset;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-
import java.util.concurrent.Callable;
+
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
+
import org.apache.isis.applib.services.userreg.UserRegistrationService;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountConfirmationMap;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountManagementPageAbstract;
import org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage;
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+
/**
* A page used for resetting the password of an user.
*/
@@ -73,10 +74,10 @@ public class PasswordResetPage extends AccountManagementPageAbstract {
error(getString("passwordResetExpiredOrInvalidToken"));
addOrReplace(addPasswordResetEmailPanel(ID_CONTENT_PANEL));
} else {
- Boolean emailExists = IsisContext.getSessionFactory().doInSession(new Callable<Boolean>() {
+ Boolean emailExists = getIsisSessionFactory().doInSession(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
- UserRegistrationService userRegistrationService = IsisContext.getSessionFactory()
+ UserRegistrationService userRegistrationService = getIsisSessionFactory()
.getCurrentSession().getPersistenceSession().getServicesInjector()
.lookupService(UserRegistrationService.class);
return userRegistrationService.emailExists(email);
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
index 2d1ff28..a7cedae 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
@@ -23,8 +23,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Callable;
-import javax.inject.Inject;
-
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.PasswordTextField;
@@ -80,12 +78,12 @@ public class PasswordResetPanel extends Panel {
final AccountConfirmationMap accountConfirmationMap = getApplication().getMetaData(AccountConfirmationMap.KEY);
- Boolean passwordUpdated = getSessionFactory().doInSession(new Callable<Boolean>() {
+ Boolean passwordUpdated = getIsisSessionFactory().doInSession(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
String email = accountConfirmationMap.get(uuid);
- UserRegistrationService userRegistrationService = getSessionFactory().getServicesInjector()
+ UserRegistrationService userRegistrationService = getIsisSessionFactory().getServicesInjector()
.lookupServiceElseFail(UserRegistrationService.class);
return userRegistrationService.updatePasswordByEmail(email, password);
}
@@ -114,10 +112,10 @@ public class PasswordResetPanel extends Panel {
return message;
}
- @Inject
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
private PageClassRegistry pageClassRegistry;
- protected IsisSessionFactory getSessionFactory() {
+ protected IsisSessionFactory getIsisSessionFactory() {
return IsisContext.getSessionFactory();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java
index 781360a..edba363 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java
@@ -19,7 +19,11 @@
package org.apache.isis.viewer.wicket.ui.pages.accmngt.register;
-import javax.inject.Inject;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.util.string.StringValue;
+import org.apache.wicket.util.string.Strings;
import org.apache.isis.applib.services.userreg.UserDetails;
import org.apache.isis.viewer.wicket.model.models.PageType;
@@ -27,11 +31,6 @@ import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountConfirmationMap;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountManagementPageAbstract;
-import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.string.StringValue;
-import org.apache.wicket.util.string.Strings;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
@@ -86,6 +85,6 @@ public class RegisterPage extends AccountManagementPageAbstract {
return new WebMarkupContainer(id);
}
- @Inject
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
private PageNavigationService pageNavigationService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
index 09e3425..a7da922 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
@@ -36,6 +36,7 @@ import org.apache.wicket.model.ResourceModel;
import org.apache.isis.applib.services.userreg.UserDetails;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.system.transaction.TransactionalClosure;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountConfirmationMap;
@@ -123,13 +124,13 @@ public abstract class RegisterPanel extends GenericPanel<UserDetails> {
{
final UserDetails userDetails = getModelObject();
- IsisContext.getSessionFactory().doInSession(new Runnable() {
+ getSessionFactory().doInSession(new Runnable() {
@Override
public void run() {
- final UserRegistrationService userRegistrationService = IsisContext.getSessionFactory()
- .getCurrentSession().getPersistenceSession().getServicesInjector().lookupService(UserRegistrationService.class);
+ final UserRegistrationService userRegistrationService = getSessionFactory()
+ .getServicesInjector().lookupService(UserRegistrationService.class);
- IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager()
+ getSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager()
.executeWithinTransaction(new TransactionalClosure() {
@Override
public void execute() {
@@ -160,6 +161,10 @@ public abstract class RegisterPanel extends GenericPanel<UserDetails> {
}
}
+ static IsisSessionFactory getSessionFactory() {
+ return IsisContext.getSessionFactory();
+ }
+
protected TextField<String> newEmailField(final UserDetails userDetails) {
// use readonly-ish model to prevent changing the email with manual form submits
TextField<String> emailField = new TextField<>(ID_EMAIL, new Model<String>() {
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
index bc65037..289adce 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
@@ -19,8 +19,8 @@
package org.apache.isis.viewer.wicket.ui.pages.accmngt.signup;
-import com.google.inject.Inject;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
@@ -34,7 +34,7 @@ public class RegistrationFormPage extends AccountManagementPageAbstract {
private static final long serialVersionUID = 1L;
- @Inject
+ @com.google.inject.Inject
private PageNavigationService pageNavigationService;
public RegistrationFormPage(final PageParameters parameters) {
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
index c765777..38ab9a3 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPanel.java
@@ -22,7 +22,14 @@ package org.apache.isis.viewer.wicket.ui.pages.accmngt.signup;
import java.util.HashMap;
import java.util.Map;
-import javax.inject.Inject;
+import org.apache.wicket.markup.html.form.Button;
+import org.apache.wicket.markup.html.form.RequiredTextField;
+import org.apache.wicket.markup.html.form.StatelessForm;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.ResourceModel;
+import org.apache.wicket.util.cookies.CookieUtils;
+import org.apache.wicket.validation.validator.EmailAddressValidator;
import org.apache.isis.applib.services.email.EmailService;
import org.apache.isis.applib.services.userreg.EmailNotificationService;
@@ -33,16 +40,6 @@ import org.apache.isis.viewer.wicket.ui.pages.EmailVerificationUrlService;
import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountManagementPageAbstract;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.EmailAvailableValidator;
-import org.apache.wicket.markup.html.form.Button;
-import org.apache.wicket.markup.html.form.RequiredTextField;
-import org.apache.wicket.markup.html.form.StatelessForm;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.ResourceModel;
-import org.apache.wicket.util.cookies.CookieUtils;
-import org.apache.wicket.validation.validator.EmailAddressValidator;
-
-import com.google.inject.name.Named;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
@@ -109,19 +106,19 @@ public class RegistrationFormPanel extends Panel {
form.add(signUpButton);
}
- @Inject
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
private EmailNotificationService emailNotificationService;
- @Inject
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
private EmailService emailService;
- @Inject
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
private EmailVerificationUrlService emailVerificationUrlService;
- @Inject
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
private PageNavigationService pageNavigationService;
- @Inject
- @Named("applicationName")
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
+ @com.google.inject.name.Named("applicationName")
private String applicationName;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
index 97edf5c..9574b18 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
@@ -36,7 +36,6 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facets.object.grid.GridFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
@@ -196,8 +195,7 @@ public class EntityPage extends PageAbstract {
}
protected DeploymentCategory getDeploymentCategory() {
- return IsisContext.getSessionFactory().getDeploymentCategory();
+ return getIsisSessionFactory().getDeploymentCategory();
}
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
index 01f7f9e..8ed13c2 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
@@ -19,8 +19,6 @@
package org.apache.isis.viewer.wicket.ui.pages.login;
-import javax.inject.Inject;
-
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
@@ -157,19 +155,19 @@ public class IsisSignInPanel extends SignInPanel {
// //////////////////////////////////////
- @Inject
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
IsisSessionFactory isisSessionFactory;
- @Inject
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
ServicesInjector servicesInjector;
- @Inject
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
private PageClassRegistry pageClassRegistry;
- @Inject
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
private EmailNotificationService emailNotificationService;
- @Inject
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
private EmailService emailService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
index 5834131..e7f53d5 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
@@ -19,18 +19,17 @@
package org.apache.isis.viewer.wicket.ui.pages.login;
-import javax.inject.Inject;
-
-import org.apache.isis.viewer.wicket.model.models.PageType;
-import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
-import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
-import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountManagementPageAbstract;
import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.authroles.authentication.panel.SignInPanel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.cookies.CookieUtils;
import org.apache.wicket.util.string.Strings;
+import org.apache.isis.viewer.wicket.model.models.PageType;
+import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
+import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
+import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountManagementPageAbstract;
+
/**
* Boilerplate, pick up our HTML and CSS.
*/
@@ -102,6 +101,6 @@ public class WicketSignInPage extends AccountManagementPageAbstract {
return signInPanel;
}
- @Inject
+ @javax.inject.Inject // strangely, this isn't a @com.google.inject.Inject
private PageNavigationService pageNavigationService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
index 3b31581..4cda181 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
@@ -38,6 +38,7 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import de.agilecoders.wicket.core.markup.html.references.BootstrapJavaScriptReference;
@@ -130,7 +131,9 @@ public class MmvErrorPage extends WebPage {
// ///////////////////////////////////////////////////
protected IsisConfiguration getConfiguration() {
- return IsisContext.getSessionFactory().getConfiguration();
+ return getSessionFactory().getConfiguration();
+ }IsisSessionFactory getSessionFactory() {
+ return IsisContext.getSessionFactory();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index 18aef4b..3335a45 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -29,6 +29,7 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChec
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
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;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
@@ -99,17 +100,20 @@ public abstract class FormAbstract<T> extends Form<T>
// Dependencies (from IsisContext)
// ///////////////////////////////////////////////////////////////////
- public PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+ protected PersistenceSession getPersistenceSession() {
+ return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
}
- public AuthenticationSession getAuthenticationSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
+ protected AuthenticationSession getAuthenticationSession() {
+ return getIsisSessionFactory().getCurrentSession().getAuthenticationSession();
}
- public DeploymentCategory getDeploymentCategory() {
- return IsisContext.getSessionFactory().getDeploymentCategory();
+ protected DeploymentCategory getDeploymentCategory() {
+ return getIsisSessionFactory().getDeploymentCategory();
}
+ protected IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index 2b660d8..eb936c0 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -32,6 +32,7 @@ import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.IsisSystem;
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;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
@@ -135,22 +136,6 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel
return getServicesInjector().getAuthenticationSession();
}
- public DeploymentCategory getDeploymentCategory() {
- return getServicesInjector().getDeploymentCategory();
- }
-
-
- // ///////////////////////////////////////////////////////////////////
- // Dependencies (from IsisContext)
- // ///////////////////////////////////////////////////////////////////
-
- public PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
- }
-
- protected ServicesInjector getServicesInjector() {
- return IsisContext.getSessionFactory().getServicesInjector();
- }
// /////////////////////////////////////////////////
// Dependency Injection
@@ -204,5 +189,26 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel
}
+ public DeploymentCategory getDeploymentCategory() {
+ return getServicesInjector().getDeploymentCategory();
+ }
+
+
+ // ///////////////////////////////////////////////////////////////////
+ // Dependencies (from IsisContext)
+ // ///////////////////////////////////////////////////////////////////
+
+ public PersistenceSession getPersistenceSession() {
+ return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
+ }
+
+ protected ServicesInjector getServicesInjector() {
+ return getIsisSessionFactory().getServicesInjector();
+ }
+
+ protected IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
index 449dfdf..a1febfb 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/WrapperFactoryDefault.java
@@ -25,8 +25,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-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;
@@ -52,7 +50,7 @@ import org.apache.isis.applib.services.wrapper.WrappingObject;
import org.apache.isis.applib.services.wrapper.listeners.InteractionListener;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.wrapper.dispatchers.InteractionEventDispatcher;
import org.apache.isis.core.wrapper.dispatchers.InteractionEventDispatcherTypeSafe;
import org.apache.isis.core.wrapper.handlers.ProxyContextHandler;
@@ -241,16 +239,18 @@ public class WrapperFactoryDefault implements WrapperFactory {
final ExecutionMode wrapperMode = wrapperObject.__isis_executionMode();
if(wrapperMode != mode) {
final Object underlyingDomainObject = wrapperObject.__isis_wrapped();
- return (T)createProxy(underlyingDomainObject, mode);
+ return (T)createProxy(underlyingDomainObject, mode, isisSessionFactory);
}
return domainObject;
}
- return createProxy(domainObject, mode);
+ return createProxy(domainObject, mode, isisSessionFactory);
}
- protected <T> T createProxy(final T domainObject, final ExecutionMode mode) {
- return proxyContextHandler.proxy(domainObject, this, mode, authenticationSessionProvider, specificationLoader,
- persistenceSessionServiceInternal);
+ protected <T> T createProxy(
+ final T domainObject,
+ final ExecutionMode mode,
+ final IsisSessionFactory isisSessionFactory) {
+ return proxyContextHandler.proxy(domainObject, mode, isisSessionFactory);
}
@Override
@@ -298,13 +298,16 @@ public class WrapperFactoryDefault implements WrapperFactory {
}
- @Inject
+ @javax.inject.Inject
AuthenticationSessionProvider authenticationSessionProvider;
- @Inject
- SpecificationLoader specificationLoader;
+// @javax.inject.Inject
+// SpecificationLoader specificationLoader;
@javax.inject.Inject
PersistenceSessionServiceInternal persistenceSessionServiceInternal;
+ @javax.inject.Inject
+ IsisSessionFactory isisSessionFactory;
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/AbstractCollectionInvocationHandler.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/AbstractCollectionInvocationHandler.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/AbstractCollectionInvocationHandler.java
index 9cac79e..d9d65aa 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/AbstractCollectionInvocationHandler.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/AbstractCollectionInvocationHandler.java
@@ -37,8 +37,12 @@ abstract class AbstractCollectionInvocationHandler<T, C> extends DelegatingInvoc
private final OneToManyAssociation oneToManyAssociation;
private final T domainObject;
- public AbstractCollectionInvocationHandler(final C collectionOrMapToProxy, final String collectionName, final DomainObjectInvocationHandler<T> handler, final OneToManyAssociation otma) {
- super(collectionOrMapToProxy, handler.getWrapperFactory(), handler.getExecutionMode());
+ public AbstractCollectionInvocationHandler(
+ final C collectionOrMapToProxy,
+ final String collectionName,
+ final DomainObjectInvocationHandler<T> handler,
+ final OneToManyAssociation otma) {
+ super(collectionOrMapToProxy, handler.getExecutionMode(), handler.getIsisSessionFactory());
this.collectionName = collectionName;
this.oneToManyAssociation = otma;
this.domainObject = handler.getDelegate();
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/CollectionInvocationHandler.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/CollectionInvocationHandler.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/CollectionInvocationHandler.java
index bcf2973..43c6593 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/CollectionInvocationHandler.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/CollectionInvocationHandler.java
@@ -27,7 +27,11 @@ import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
class CollectionInvocationHandler<T, R> extends AbstractCollectionInvocationHandler<T, R> {
- public CollectionInvocationHandler(final R collectionToProxy, final String collectionName, final DomainObjectInvocationHandler<T> handler, final OneToManyAssociation otma) {
+ public CollectionInvocationHandler(
+ final R collectionToProxy,
+ final String collectionName,
+ final DomainObjectInvocationHandler<T> handler,
+ final OneToManyAssociation otma) {
super(collectionToProxy, collectionName, handler, otma);
try {
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
index 4279253..1e7e181 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
@@ -26,7 +26,8 @@ import org.apache.isis.applib.events.InteractionEvent;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-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;
public class DelegatingInvocationHandlerDefault<T> implements DelegatingInvocationHandler<T> {
@@ -37,15 +38,20 @@ public class DelegatingInvocationHandlerDefault<T> implements DelegatingInvocati
protected final Method equalsMethod;
protected final Method hashCodeMethod;
protected final Method toStringMethod;
+ private final IsisSessionFactory isisSessionFactory;
private boolean resolveObjectChangedEnabled;
- public DelegatingInvocationHandlerDefault(final T delegate, final WrapperFactory wrapperFactory, final ExecutionMode executionMode) {
+ public DelegatingInvocationHandlerDefault(
+ final T delegate,
+ final ExecutionMode executionMode,
+ final IsisSessionFactory isisSessionFactory) {
+ this.isisSessionFactory = isisSessionFactory;
if (delegate == null) {
throw new IllegalArgumentException("delegate must not be null");
}
this.delegate = delegate;
- this.wrapperFactory = wrapperFactory;
+ this.wrapperFactory = isisSessionFactory.getServicesInjector().lookupService(WrapperFactory.class);
this.executionMode = executionMode;
try {
@@ -75,11 +81,10 @@ public class DelegatingInvocationHandlerDefault<T> implements DelegatingInvocati
protected void resolveIfRequired(final Object domainObject) {
if (resolveObjectChangedEnabled) {
- IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().resolve(domainObject);
+ getPersistenceSession().resolve(domainObject);
}
}
-
public WrapperFactory getWrapperFactory() {
return wrapperFactory;
}
@@ -112,4 +117,9 @@ public class DelegatingInvocationHandlerDefault<T> implements DelegatingInvocati
return interactionEvent;
}
+
+ private PersistenceSession getPersistenceSession() {
+ return isisSessionFactory.getCurrentSession().getPersistenceSession();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
index 02e4b1c..766fe01 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -46,7 +46,6 @@ import org.apache.isis.applib.services.wrapper.DisabledException;
import org.apache.isis.applib.services.wrapper.HiddenException;
import org.apache.isis.applib.services.wrapper.InteractionException;
import org.apache.isis.applib.services.wrapper.InvalidException;
-import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
import org.apache.isis.applib.services.wrapper.WrapperObject;
import org.apache.isis.applib.services.wrapper.WrappingObject;
@@ -60,6 +59,7 @@ import org.apache.isis.core.metamodel.facets.ImperativeFacet;
import org.apache.isis.core.metamodel.facets.ImperativeFacet.Intent;
import org.apache.isis.core.metamodel.facets.object.mixin.MixinFacet;
import org.apache.isis.core.metamodel.interactions.ObjectTitleContext;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
@@ -73,6 +73,7 @@ import org.apache.isis.core.metamodel.specloader.specimpl.ContributeeMember;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionContributee;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionMixedIn;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandlerDefault<T> {
@@ -82,6 +83,7 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
private final ProxyContextHandler proxy;
private final ExecutionMode executionMode;
+ private final IsisSessionFactory isisSessionFactory;
/**
* The <tt>title()</tt> method; may be <tt>null</tt>.
@@ -119,19 +121,20 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
public DomainObjectInvocationHandler(
final T delegate,
- final WrapperFactory wrapperFactory,
final ExecutionMode mode,
- final AuthenticationSessionProvider authenticationSessionProvider,
- final SpecificationLoader specificationLoader,
- final PersistenceSessionServiceInternal persistenceSessionServiceInternal,
- final ProxyContextHandler proxy) {
- super(delegate, wrapperFactory, mode);
+ final ProxyContextHandler proxy,
+ final IsisSessionFactory isisSessionFactory) {
+ super(delegate, mode, isisSessionFactory);
this.proxy = proxy;
- this.authenticationSessionProvider = authenticationSessionProvider;
- this.specificationLoader = specificationLoader;
- this.persistenceSessionServiceInternal = persistenceSessionServiceInternal;
this.executionMode = mode;
+ this.isisSessionFactory = isisSessionFactory;
+
+ final ServicesInjector servicesInjector = isisSessionFactory.getServicesInjector();
+
+ this.authenticationSessionProvider = servicesInjector.getAuthenticationSessionProvider();
+ this.specificationLoader = servicesInjector.getSpecificationLoader();
+ this.persistenceSessionServiceInternal = servicesInjector.getPersistenceSessionServiceInternal();
try {
@@ -824,7 +827,7 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
// /////////////////////////////////////////////////////////////////
protected SpecificationLoader getSpecificationLoader() {
- return specificationLoader;
+ return isisSessionFactory.getSpecificationLoader();
}
public AuthenticationSessionProvider getAuthenticationSessionProvider() {
@@ -839,5 +842,7 @@ public class DomainObjectInvocationHandler<T> extends DelegatingInvocationHandle
return persistenceSessionServiceInternal;
}
-
+ public IsisSessionFactory getIsisSessionFactory() {
+ return isisSessionFactory;
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java
index 2309d8f..88767b8 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/ProxyContextHandler.java
@@ -22,19 +22,11 @@ package org.apache.isis.core.wrapper.handlers;
import java.util.Collection;
import java.util.Map;
-import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.ensure.Ensure;
-import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.wrapper.proxy.ProxyCreator;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-
public class ProxyContextHandler {
private final ProxyCreator proxyCreator;
@@ -45,14 +37,12 @@ public class ProxyContextHandler {
public <T> T proxy(
final T domainObject,
- final WrapperFactory wrapperFactory,
final ExecutionMode mode,
- final AuthenticationSessionProvider authenticationSessionProvider,
- final SpecificationLoader specificationLookup,
- final PersistenceSessionServiceInternal persistenceSessionServiceInternal) {
+ final IsisSessionFactory isisSessionFactory) {
- final DomainObjectInvocationHandler<T> invocationHandler = new DomainObjectInvocationHandler<T>(domainObject, wrapperFactory, mode, authenticationSessionProvider, specificationLookup,
- persistenceSessionServiceInternal, this);
+ final DomainObjectInvocationHandler<T> invocationHandler = new DomainObjectInvocationHandler<T>(domainObject,
+ mode,
+ this, isisSessionFactory);
return proxyCreator.instantiateProxy(invocationHandler);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest.java b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest.java
index e97e0e3..69e7302 100644
--- a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest.java
+++ b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest.java
@@ -25,6 +25,7 @@ import org.junit.Test;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrappingObject;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.wrapper.proxy.ProxyCreator;
@@ -78,7 +79,7 @@ public class WrapperFactoryDefaultTest {
wrapperFactory = new WrapperFactoryDefault(mockProxyCreator) {
@Override
- protected <T> T createProxy(T domainObject, ExecutionMode mode) {
+ protected <T> T createProxy(T domainObject, ExecutionMode mode, final IsisSessionFactory isisSessionFactory) {
WrapperFactoryDefaultTest.this.createProxyCalledWithMode = mode;
WrapperFactoryDefaultTest.this.createProxyCalledWithDomainObject = (DomainObject) domainObject;
return domainObject;
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index 276631e..acb93f8 100644
--- a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -62,6 +62,7 @@ import org.apache.isis.core.metamodel.specloader.specimpl.OneToOneAssociationDef
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
import org.apache.isis.core.runtime.services.command.CommandDtoServiceInternalDefault;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.progmodel.wrapper.dom.employees.Employee;
@@ -104,6 +105,9 @@ public class WrapperFactoryDefaultTest_wrappedObject {
private IsisConfiguration mockConfiguration;
@Mock
+ private IsisSessionFactory mockIsisSessionFactory;
+
+ @Mock
private ObjectSpecificationDefault mockEmployeeSpec;
private ObjectMember employeeNameMember;
@@ -198,7 +202,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
wrapperFactory = createWrapperFactory();
wrapperFactory.persistenceSessionServiceInternal = mockPersistenceSessionServiceInternal;
- wrapperFactory.specificationLoader = mockSpecificationLoader;
+ wrapperFactory.isisSessionFactory = mockIsisSessionFactory;
wrapperFactory.authenticationSessionProvider = mockAuthenticationSessionProvider;
final Method employeeGetNameMethod = methodOf(Employee.class, "getName");
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index 66f5eaf..022c1da 100644
--- a/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/wrapper/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -60,6 +60,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.progmodel.wrapper.dom.employees.Employee;
@@ -87,6 +88,8 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
private PersistenceSessionServiceInternal mockPersistenceSessionServiceInternal;
@Mock
private SpecificationLoader mockSpecificationLoader;
+ @Mock
+ private IsisSessionFactory mockIsisSessionFactory;
private Employee employeeDO;
@Mock
@@ -127,7 +130,7 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
wrapperFactory = createWrapperFactory();
wrapperFactory.authenticationSessionProvider = mockAuthenticationSessionProvider;
wrapperFactory.persistenceSessionServiceInternal = mockPersistenceSessionServiceInternal;
- wrapperFactory.specificationLoader = mockSpecificationLoader;
+ wrapperFactory.isisSessionFactory = mockIsisSessionFactory;
context.checking(new Expectations() {
{
[15/50] [abbrv] isis git commit: ISIS-1427: simplifying IsisContext
and minimizing calls to it; also removed Localization (unused)
Posted by da...@apache.org.
ISIS-1427: simplifying IsisContext and minimizing calls to it; also removed Localization (unused)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/83de0dc0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/83de0dc0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/83de0dc0
Branch: refs/heads/master
Commit: 83de0dc05be52525a01ce50f211bffe2aa513488
Parents: ccfcfe7
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jun 9 08:06:35 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jun 9 08:06:35 2016 +0100
----------------------------------------------------------------------
.../org/apache/isis/applib/adapters/Parser.java | 5 +-
.../isis/applib/profiles/Localization.java | 30 ---
.../ExceptionRecognizerTranslate.java | 2 +-
.../integtestsupport/IsisSystemForTest.java | 54 ++---
.../isis/tool/mavenplugin/IsisMojoAbstract.java | 24 +-
.../core/metamodel/adapter/ObjectAdapter.java | 2 +-
.../metamodel/adapter/oid/OidMarshaller.java | 12 +-
.../facets/fallback/TitleFacetNone.java | 3 +-
.../enums/EnumValueSemanticsProvider.java | 9 +-
...ObjectLayoutAnnotationUsingTitleUiEvent.java | 3 +-
.../object/mask/TitleFacetBasedOnMask.java | 5 +-
.../facets/object/parseable/ParseableFacet.java | 9 +-
.../parseable/ParseableFacetAbstract.java | 5 +-
.../parser/ParseableFacetUsingParser.java | 5 +-
.../facets/object/title/TitleFacet.java | 9 +-
.../facets/object/title/TitleFacetAbstract.java | 7 +-
.../TitleFacetViaTitleAnnotation.java | 7 +-
.../title/methods/TitleFacetViaTitleMethod.java | 3 +-
.../methods/TitleFacetViaToStringMethod.java | 4 +-
.../title/parser/TitleFacetUsingParser.java | 17 +-
.../ValueSemanticsProviderAndFacetAbstract.java | 18 +-
.../regex/TitleFacetFormattedByRegex.java | 3 +-
...teAndTimeValueSemanticsProviderAbstract.java | 19 +-
.../metamodel/facets/value/JodaFunctions.java | 10 +-
.../ValueSemanticsProviderAbstractTemporal.java | 22 +-
.../BigDecimalValueSemanticsProvider.java | 3 +-
.../BigIntegerValueSemanticsProvider.java | 3 +-
.../value/blobs/BlobValueSemanticsProvider.java | 5 +-
.../BooleanValueSemanticsProviderAbstract.java | 6 +-
.../ByteValueSemanticsProviderAbstract.java | 4 +-
.../CharValueSemanticsProviderAbstract.java | 4 +-
.../value/clobs/ClobValueSemanticsProvider.java | 5 +-
.../color/ColorValueSemanticsProvider.java | 3 +-
.../DateValueSemanticsProviderAbstract.java | 11 +-
.../value/datejodalocal/JodaLocalDateUtil.java | 10 +-
.../JodaLocalDateValueSemanticsProvider.java | 21 +-
...aDateTimeValueSemanticsProviderAbstract.java | 15 +-
.../JodaLocalDateTimeUtil.java | 10 +-
...JodaLocalDateTimeValueSemanticsProvider.java | 21 +-
.../DoubleValueSemanticsProviderAbstract.java | 4 +-
.../FloatValueSemanticsProviderAbstract.java | 4 +-
.../ImageValueSemanticsProviderAbstract.java | 4 +-
.../IntValueSemanticsProviderAbstract.java | 4 +-
.../LongValueSemanticsProviderAbstract.java | 4 +-
.../money/MoneyValueSemanticsProvider.java | 3 +-
.../PasswordValueSemanticsProvider.java | 5 +-
.../PercentageValueSemanticsProvider.java | 3 +-
.../ShortValueSemanticsProviderAbstract.java | 4 +-
.../string/StringValueSemanticsProvider.java | 5 +-
.../TimeValueSemanticsProviderAbstract.java | 20 +-
...TimeStampValueSemanticsProviderAbstract.java | 31 ++-
.../value/url/URLValueSemanticsProvider.java | 5 +-
.../value/uuid/UUIDValueSemanticsProvider.java | 5 +-
.../metamodel/services/ServicesInjector.java | 25 +-
.../services/l10n/LocalizationDefault.java | 38 ---
.../l10n/LocalizationProviderInternal.java | 30 ---
.../l10n/LocalizationProviderInternalNoop.java | 16 --
.../services/title/TitleServiceDefault.java | 6 +-
.../metamodel/spec/ObjectSpecification.java | 9 +-
.../spec/feature/ObjectActionParameter.java | 4 +-
.../specimpl/ObjectActionParameterAbstract.java | 4 +-
.../specimpl/ObjectSpecificationAbstract.java | 11 +-
.../ObjectSpecificationOnStandaloneList.java | 3 +-
.../ident/title/TitleFacetViaMethodTest.java | 2 +-
.../TitleAnnotationFacetFactoryTest.java | 13 +-
.../TitleFacetViaTitleAnnotationTest.java | 10 +-
...tAnnotationElseConfigurationFactoryTest.java | 7 +-
.../ParseableFacetUsingParserTest.java | 12 +-
...cetAnnotationOrConfigurationFactoryTest.java | 19 +-
.../BigDecimalValueSemanticsProviderTest.java | 7 +-
.../value/BigIntValueSemanticsProviderTest.java | 7 +-
.../value/BlobValueSemanticsProviderTest.java | 3 +-
.../BooleanValueSemanticsProviderTest.java | 15 +-
.../value/ByteValueSemanticsProviderTest.java | 7 +-
.../CharacterValueSemanticsProviderTest.java | 7 +-
.../value/ClobValueSemanticsProviderTest.java | 3 +-
.../value/ColorValueSemanticsProviderTest.java | 11 +-
.../DateTimeValueSemanticsProviderTest.java | 4 +-
.../value/DateValueSemanticsProviderTest.java | 28 +--
.../value/DoubleValueSemanticsProviderTest.java | 11 +-
.../value/FloatValueSemanticsProviderTest.java | 9 +-
.../value/IntValueSemanticsProviderTest.java | 9 +-
.../JavaSqlDateValueSemanticsProviderTest.java | 7 +-
...aSqlTimeStampValueSemanticsProviderTest.java | 4 +-
.../JavaUtilDateValueSemanticsProviderTest.java | 7 +-
.../value/LongValueSemanticsProviderTest.java | 9 +-
.../value/MoneyValueSemanticsProviderTest.java | 31 ++-
.../PercentageValueSemanticsProviderTest.java | 9 +-
.../PolishMoneyValueSemanticsProviderTest.java | 33 ++-
.../value/ShortValueSemanticsProviderTest.java | 11 +-
.../value/StringValueSemanticsProviderTest.java | 5 +-
.../TimeStampValueSemanticsProviderTest.java | 4 +-
.../value/TimeValueSemanticsProviderTest.java | 14 +-
.../ValueSemanticsProviderAbstractTestCase.java | 9 +-
.../SpecificationLoaderTestAbstract.java | 5 -
...ParameterAbstractTest_getId_and_getName.java | 3 +-
.../testspec/ObjectSpecificationStub.java | 9 +-
...enticationManagerStandardForDfltRuntime.java | 2 +-
.../ObjectFixtureFilePersistor.java | 45 ++--
.../ObjectFixtureService.java | 80 ++++---
.../fixtures/FixturesInstallerDelegate.java | 5 +-
.../runtime/fixtures/SwitchUserServiceImpl.java | 32 ++-
.../isis/core/runtime/memento/Memento.java | 4 +-
.../core/runtime/memento/StandaloneData.java | 4 +-
.../persistence/adapter/PojoAdapter.java | 10 +-
.../transaction/PersistenceCommandAbstract.java | 2 +-
.../query/PersistenceQueryAbstract.java | 2 +-
.../core/runtime/runner/IsisInjectModule.java | 31 +++
.../auditing/AuditingServiceInternal.java | 6 +-
.../AuthenticationSessionProviderDefault.java | 2 +-
.../background/BackgroundServiceDefault.java | 18 +-
.../CommandDtoServiceInternalDefault.java | 4 +-
.../DeploymentCategoryProviderDefault.java | 2 +-
.../services/email/EmailServiceDefault.java | 2 +-
.../EventBusImplementationAbstract.java | 4 +-
.../HomePageProviderServiceDefault.java | 2 +-
.../services/i18n/po/TranslationServicePo.java | 2 +-
.../LocalizationProviderInternalDefault.java | 37 ---
.../MessageBrokerServiceInternalDefault.java | 2 +-
...ersistenceSessionServiceInternalDefault.java | 6 +-
.../PublishingServiceInternalDefault.java | 58 +++--
.../SessionManagementServiceDefault.java | 21 +-
...TransactionStateProviderInternalDefault.java | 4 +-
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 4 +-
.../AbstractIsisSessionTemplate.java | 8 +-
.../runtime/snapshot/XmlSnapshotBuilder.java | 2 +-
.../isis/core/runtime/system/IsisSystem.java | 190 ++++++++-------
.../runtime/system/context/IsisContext.java | 235 +------------------
.../DataNucleusApplicationComponents.java | 2 +-
.../system/persistence/PersistenceSession.java | 18 +-
.../runtime/system/session/IsisSession.java | 2 +-
.../system/session/IsisSessionFactory.java | 84 ++++++-
.../transaction/IsisTransactionManager.java | 155 ++++--------
.../isis/core/webapp/IsisSessionFilter.java | 22 +-
.../core/webapp/IsisWebAppBootstrapper.java | 4 +-
.../AuthenticationSessionStrategyDefault.java | 2 +-
.../jdo/datanucleus/JDOStateManagerForIsis.java | 2 +-
.../persistence/spi/JdoObjectIdSerializer.java | 2 +-
.../service/support/IsisJdoSupportImpl.java | 7 +-
.../jdo/service/RegisterEntities.java | 2 +-
.../adapterfactory/pojo/PojoAdapterTest.java | 7 +-
.../transaction/PojoAdapterBuilder.java | 12 +-
.../rendering/RendererContext.java | 3 -
.../rendering/ReprRendererAbstract.java | 2 +-
.../domainobjects/DomainObjectLinkTo.java | 8 -
.../domainobjects/DomainObjectReprRenderer.java | 6 +-
.../domainobjects/JsonValueEncoder.java | 2 +-
.../ObjectPropertyReprRenderer.java | 2 +-
.../conneg/IsisPrettyPrintingProcessor.java | 4 +-
.../rendering/util/JsonWriterUtil.java | 3 +-
.../restfulobjects/server/ResourceContext.java | 26 +-
.../server/RuntimeExceptionMapper.java | 3 +-
.../AuthenticationSessionStrategyBasicAuth.java | 2 +-
.../AuthenticationSessionStrategyTrusted.java | 2 +-
.../conneg/RestfulObjectsJaxbWriterForXml.java | 3 +-
.../server/resources/DomainResourceHelper.java | 8 +-
.../server/resources/ObjectActionArgHelper.java | 3 +-
.../server/resources/ResourceAbstract.java | 28 +--
.../server/resources/SwaggerSpecResource.java | 4 +-
.../IsisTransactionFilterForRestfulObjects.java | 6 +-
...ontextTest_ensureCompatibleAcceptHeader.java | 3 +-
.../server/ResourceContextTest_getArg.java | 6 +-
.../wicket/viewer/IsisWicketApplication.java | 67 +++---
.../wicket/AuthenticatedWebSessionForIsis.java | 22 +-
.../wicket/ConverterForObjectAdapter.java | 4 +-
.../ConverterForObjectAdapterMemento.java | 4 +-
.../integration/wicket/LocalizerForIsis.java | 16 +-
.../wicket/WebRequestCycleForIsis.java | 18 +-
.../viewer/services/DeepLinkServiceWicket.java | 2 +-
.../settings/WicketViewerSettingsDefault.java | 2 +-
.../model/isis/PersistenceSessionProvider.java | 28 ---
.../model/mementos/CollectionMemento.java | 2 +-
.../model/mementos/ObjectAdapterMemento.java | 6 +-
.../wicket/model/mementos/PropertyMemento.java | 2 +-
.../viewer/wicket/model/mementos/SpecUtils.java | 2 +-
.../viewer/wicket/model/models/ActionModel.java | 3 +-
.../wicket/model/models/BookmarkTreeNode.java | 2 +-
.../models/BookmarkTreeNodeComparator.java | 4 +-
.../model/models/BookmarkedPagesModel.java | 2 +-
.../model/models/EntityCollectionModel.java | 4 +-
.../viewer/wicket/model/models/EntityModel.java | 8 +-
.../wicket/model/models/ModelAbstract.java | 4 +-
.../viewer/wicket/model/models/ScalarModel.java | 17 +-
.../wicket/model/util/ComponentHintKey.java | 2 +-
.../ActionResultResponseHandlingStrategy.java | 2 +-
.../ActionResultResponseType.java | 2 +-
.../entityactions/EntityActionLinkFactory.java | 4 +-
.../actionmenu/serviceactions/CssMenuItem.java | 2 +-
.../ui/components/actions/ActionPanel.java | 4 +-
.../bookmarkedpages/BookmarkedPagesPanel.java | 2 +-
.../collection/bulk/BulkActionsHelper.java | 4 +-
.../collection/bulk/BulkActionsLinkFactory.java | 2 +-
.../CollectionContentsSortableDataProvider.java | 4 +-
.../components/property/PropertyEditPanel.java | 4 +-
.../ScalarPanelTextFieldDatePickerAbstract.java | 6 +-
.../datepicker/TextFieldWithDateTimePicker.java | 2 +-
.../scalars/reference/ReferencePanel.java | 12 +-
.../widgets/breadcrumbs/BreadcrumbModel.java | 2 +-
.../FormComponentPanelAbstract.java | 11 +-
.../widgets/themepicker/ThemeChooser.java | 2 +-
.../wicket/ui/errors/JGrowlBehaviour.java | 2 +-
.../viewer/wicket/ui/pages/PageAbstract.java | 56 +++--
.../accmngt/AccountManagementPageAbstract.java | 10 +-
.../pages/accmngt/EmailAvailableValidator.java | 5 +-
.../accmngt/UsernameAvailableValidator.java | 5 +-
.../password_reset/PasswordResetPage.java | 6 +-
.../password_reset/PasswordResetPanel.java | 6 +-
.../pages/accmngt/register/RegisterPanel.java | 30 +--
.../wicket/ui/pages/entity/EntityPage.java | 2 +-
.../wicket/ui/pages/login/IsisSignInPanel.java | 27 ++-
.../wicket/ui/pages/mmverror/MmvErrorPage.java | 15 +-
.../viewer/wicket/ui/panels/FormAbstract.java | 11 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 8 +-
.../DelegatingInvocationHandlerDefault.java | 2 +-
.../java/domainapp/dom/simple/SimpleObject.java | 4 +-
215 files changed, 1169 insertions(+), 1576 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java b/core/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java
index 6b8cc0c..e8bc1f8 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java
@@ -20,7 +20,6 @@
package org.apache.isis.applib.adapters;
import org.apache.isis.applib.annotation.TypicalLength;
-import org.apache.isis.applib.profiles.Localization;
/**
* Provides a mechanism for parsing and rendering string representations of
@@ -88,7 +87,7 @@ public interface Parser<T> {
* - the context domain object for which the text is being
* parsed. For example +3 might mean add 3 to the current number.
*/
- T parseTextEntry(Object contextPojo, String entry, Localization localization);
+ T parseTextEntry(Object contextPojo, String entry);
/**
* The typical length of objects that can be parsed.
@@ -98,7 +97,7 @@ public interface Parser<T> {
/**
* The title of the object.
*/
- String displayTitleOf(T object, Localization localization);
+ String displayTitleOf(T object);
/**
* The title of the object using a mask.
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/applib/src/main/java/org/apache/isis/applib/profiles/Localization.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/profiles/Localization.java b/core/applib/src/main/java/org/apache/isis/applib/profiles/Localization.java
deleted file mode 100644
index be3137d..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/profiles/Localization.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.applib.profiles;
-
-import java.util.Locale;
-import java.util.TimeZone;
-
-public interface Localization {
-
- Locale getLocale();
-
- TimeZone getTimeZone();
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/ExceptionRecognizerTranslate.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/ExceptionRecognizerTranslate.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/ExceptionRecognizerTranslate.java
index d9731cc..f66fe44 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/ExceptionRecognizerTranslate.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/ExceptionRecognizerTranslate.java
@@ -57,7 +57,7 @@ public class ExceptionRecognizerTranslate implements MethodRule {
* Simply invokes {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer#recognize(Throwable)} for all registered {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer}s for the provided exception, so that the message will be translated.
*/
private void recognize(final Throwable ex) {
- final List<ExceptionRecognizer> exceptionRecognizers = IsisContext.getPersistenceSession().getServicesInjector().lookupServices(ExceptionRecognizer.class);
+ final List<ExceptionRecognizer> exceptionRecognizers = IsisContext.getSessionFactory().getServicesInjector().lookupServices(ExceptionRecognizer.class);
for (final ExceptionRecognizer exceptionRecognizer : exceptionRecognizers) {
final String unused = exceptionRecognizer.recognize(ex);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/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 9d47ee9..b6d893c 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
@@ -210,7 +210,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
e.printStackTrace();
}
try {
- IsisContext.shutdown();
+ isisSystemForTest.isisSystem.getSessionFactory().shutdown();
} catch (Exception e) {
e.printStackTrace();
}
@@ -320,7 +320,9 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
FixtureClock.initialize();
isisSystem.init();
- IsisContext.closeSession();
+
+ // REVIEW: is this required?
+ isisSystem.getSessionFactory().closeSession();
// if the IsisSystem does not initialize properly, then - as a side effect - the resulting
// MetaModelInvalidException will be pushed onto the IsisContext (as a static field).
@@ -340,7 +342,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
}
}
- final AuthenticationManager authenticationManager = IsisContext.getAuthenticationManager();
+ final AuthenticationManager authenticationManager = isisSystem.getSessionFactory().getAuthenticationManager();
authenticationSession = authenticationManager.authenticate(authenticationRequestIfAny);
openSession();
@@ -357,12 +359,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
}
public DomainObjectContainer getContainer() {
- for (Object service : IsisContext.getSessionFactory().getServices()) {
- if(service instanceof DomainObjectContainer) {
- return (DomainObjectContainer) service;
- }
- }
- throw new IllegalStateException("Could not locate DomainObjectContainer");
+ return getService(DomainObjectContainer.class);
}
//endregion
@@ -399,8 +396,8 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
if(fireListeners.shouldFire()) {
firePreTeardownSystem();
}
- if(IsisContext.inSession()) {
- IsisContext.closeSession();
+ if(isisSystem.getSessionFactory().inSession()) {
+ isisSystem.getSessionFactory().closeSession();
}
if(fireListeners.shouldFire()) {
firePostTeardownSystem();
@@ -429,11 +426,11 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
}
public void openSession(AuthenticationSession authenticationSession) throws Exception {
- IsisContext.openSession(authenticationSession);
+ isisSystem.getSessionFactory().openSession(authenticationSession);
}
public void closeSession() throws Exception {
- IsisContext.closeSession();
+ isisSystem.getSessionFactory().closeSession();
}
//endregion
@@ -496,7 +493,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
//region > Convenience for tests
public ObjectSpecification loadSpecification(Class<?> cls) {
- return getIsisSystem().getSessionFactory().getSpecificationLoader().loadSpecification(cls);
+ return isisSystem.getSessionFactory().getSpecificationLoader().loadSpecification(cls);
}
public ObjectAdapter persist(Object domainObject) {
@@ -549,8 +546,8 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
return adapter;
}
- private static void ensureSessionInProgress() {
- if(!IsisContext.inSession()) {
+ private void ensureSessionInProgress() {
+ if(!isisSystem.getSessionFactory().inSession()) {
throw new IllegalStateException("Session must be in progress");
}
}
@@ -598,7 +595,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
public void beginTran() {
final IsisTransactionManager transactionManager = getTransactionManager();
- final IsisTransaction transaction = transactionManager.getTransaction();
+ final IsisTransaction transaction = transactionManager.getCurrentTransaction();
if(transaction == null) {
startTransactionForUser(transactionManager);
@@ -637,7 +634,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
*/
public void endTran() {
final IsisTransactionManager transactionManager = getTransactionManager();
- final IsisTransaction transaction = transactionManager.getTransaction();
+ final IsisTransaction transaction = transactionManager.getCurrentTransaction();
if(transaction == null) {
fail("No transaction exists");
return;
@@ -670,7 +667,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
@Deprecated
public void commitTran() {
final IsisTransactionManager transactionManager = getTransactionManager();
- final IsisTransaction transaction = transactionManager.getTransaction();
+ final IsisTransaction transaction = transactionManager.getCurrentTransaction();
if(transaction == null) {
fail("No transaction exists");
return;
@@ -698,7 +695,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
@Deprecated
public void abortTran() {
final IsisTransactionManager transactionManager = getTransactionManager();
- final IsisTransaction transaction = transactionManager.getTransaction();
+ final IsisTransaction transaction = transactionManager.getCurrentTransaction();
if(transaction == null) {
fail("No transaction exists");
return;
@@ -729,20 +726,13 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
@Override
@SuppressWarnings("unchecked")
public <T> T getService(Class<T> serviceClass) {
- if(serviceClass == DomainObjectContainer.class) {
- return (T) getContainer();
- }
- final ServicesInjector servicesInjector = getPersistenceSession().getServicesInjector();
- final T service = servicesInjector.lookupService(serviceClass);
- if(service == null) {
- throw new RuntimeException("Could not find a service of type: " + serviceClass.getName());
- }
- return service;
+ final ServicesInjector servicesInjector = isisSystem.getSessionFactory().getServicesInjector();
+ return servicesInjector.lookupServiceElseFail(serviceClass);
}
@Override
public <T> void replaceService(final T originalService, final T replacementService) {
- final ServicesInjector servicesInjector = getPersistenceSession().getServicesInjector();
+ final ServicesInjector servicesInjector = isisSystem.getSessionFactory().getServicesInjector();
servicesInjector.replaceService(originalService, replacementService);
}
@@ -763,7 +753,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
// ensure that tests are performed in separate xactn to any fixture setup.
final IsisTransactionManager transactionManager = getTransactionManager();
- final IsisTransaction transaction = transactionManager.getTransaction();
+ final IsisTransaction transaction = transactionManager.getCurrentTransaction();
final State transactionState = transaction.getState();
if(transactionState.canCommit()) {
commitTran();
@@ -793,7 +783,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
}
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return isisSystem.getSessionFactory().getCurrentSession().getPersistenceSession();
}
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/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 2978b27..621c24d 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
@@ -68,19 +68,19 @@ public abstract class IsisMojoAbstract extends AbstractMojo {
context.throwFailureException(validationErrors.size() + " meta-model problems found.", validationErrors);
return;
}
- IsisContext.doInSession(new Runnable() {
- @Override
- public void run() {
- try {
- doExecute(context, isisSystem);
- } catch (IOException e) {
- ;
- // ignore
- } catch (MojoFailureException e) {
- throw new RuntimeException(e);
+ IsisContext.getSessionFactory().doInSession(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ doExecute(context, isisSystem);
+ } catch (IOException e) {
+ ;
+ // ignore
+ } catch (MojoFailureException e) {
+ throw new RuntimeException(e);
+ }
}
- }
- });
+ });
} catch(RuntimeException e) {
if(e.getCause() instanceof MojoFailureException) {
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
index d3c6cbf..72e366a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ObjectAdapter.java
@@ -81,7 +81,7 @@ public interface ObjectAdapter extends Instance, org.apache.isis.applib.annotati
* of some other adapter.
*
* <p>
- * @see TitleFacet#title(ObjectAdapter, ObjectAdapter, org.apache.isis.applib.profiles.Localization)
+ * @see TitleFacet#title(ObjectAdapter, ObjectAdapter)
*/
String titleString(ObjectAdapter contextAdapter);
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/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 a2535ec..a70f43e 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
@@ -27,6 +27,7 @@ import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.core.metamodel.adapter.oid.Oid.State;
import org.apache.isis.core.metamodel.adapter.version.Version;
@@ -124,10 +125,12 @@ public class OidMarshaller {
//endregion
//region > join, split
+ @Programmatic
public String joinAsOid(String domainType, String instanceId) {
return domainType + SEPARATOR + instanceId;
}
-
+
+ @Programmatic
public String splitInstanceId(String oidStr) {
final int indexOfSeperator = oidStr.indexOf(SEPARATOR);
return indexOfSeperator > 0? oidStr.substring(indexOfSeperator+1): null;
@@ -137,6 +140,7 @@ public class OidMarshaller {
//region > unmarshal
+ @Programmatic
@SuppressWarnings("unchecked")
public <T extends Oid> T unmarshal(String oidStr, Class<T> requestedType) {
@@ -235,24 +239,29 @@ public class OidMarshaller {
//endregion
//region > marshal
+ @Programmatic
public final String marshal(RootOid rootOid) {
return marshalNoVersion(rootOid) + marshal(rootOid.getVersion());
}
+ @Programmatic
public final String marshalNoVersion(RootOid rootOid) {
final String transientIndicator = rootOid.isTransient()? TRANSIENT_INDICATOR : "";
final String viewModelIndicator = rootOid.isViewModel()? VIEWMODEL_INDICATOR : "";
return transientIndicator + viewModelIndicator + rootOid.getObjectSpecId() + SEPARATOR + rootOid.getIdentifier();
}
+ @Programmatic
public final String marshal(ParentedCollectionOid collectionOid) {
return marshalNoVersion(collectionOid) + marshal(collectionOid.getVersion());
}
+ @Programmatic
public String marshalNoVersion(ParentedCollectionOid collectionOid) {
return collectionOid.getRootOid().enStringNoVersion(this) + SEPARATOR_COLLECTION + collectionOid.getName();
}
+ @Programmatic
public final String marshal(Version version) {
if(version == null) {
return "";
@@ -261,7 +270,6 @@ public class OidMarshaller {
return SEPARATOR_VERSION + version.getSequence() + SEPARATOR + Strings.nullToEmpty(versionUser) + SEPARATOR + nullToEmpty(version.getUtcTimestamp());
}
-
private static String nullToEmpty(Object obj) {
return obj == null? "": "" + obj;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/TitleFacetNone.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/TitleFacetNone.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/TitleFacetNone.java
index 2b7d0d4..6ce4dbe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/TitleFacetNone.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/fallback/TitleFacetNone.java
@@ -19,7 +19,6 @@
package org.apache.isis.core.metamodel.facets.fallback;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacetAbstract;
@@ -31,7 +30,7 @@ public class TitleFacetNone extends TitleFacetAbstract {
}
@Override
- public String title(final ObjectAdapter object, final Localization localization) {
+ public String title(final ObjectAdapter object) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/enums/EnumValueSemanticsProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/enums/EnumValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/enums/EnumValueSemanticsProvider.java
index 5b76fd4..56c9709 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/enums/EnumValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/choices/enums/EnumValueSemanticsProvider.java
@@ -22,7 +22,6 @@ package org.apache.isis.core.metamodel.facets.object.choices.enums;
import java.lang.reflect.Method;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.util.Enums;
@@ -105,17 +104,17 @@ public class EnumValueSemanticsProvider<T extends Enum<T>> extends ValueSemantic
@Override
protected String doEncode(final Object object) {
- return titleString(object, null);
+ return titleString(object);
}
@Override
protected T doRestore(final String data) {
- return doParse(null, data);
+ return doParse((Object)null, data);
}
@Override
- protected String titleString(final Object object, final Localization localization) {
+ protected String titleString(final Object object) {
final TranslationService translationService = getServicesInjector().lookupService(TranslationService.class);
if (titleMethod != null) {
@@ -146,7 +145,7 @@ public class EnumValueSemanticsProvider<T extends Enum<T>> extends ValueSemantic
@Override
public String titleStringWithMask(final Object value, final String usingMask) {
- return titleString(value, null);
+ return titleString(value);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
index 4daa17f..edecfd5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent.java
@@ -24,7 +24,6 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.applib.services.eventbus.TitleUiEvent;
import org.apache.isis.applib.services.i18n.TranslatableString;
@@ -88,7 +87,7 @@ public class TitleFacetViaDomainObjectLayoutAnnotationUsingTitleUiEvent extends
}
@Override
- public String title(final ObjectAdapter owningAdapter, final Localization localization) {
+ public String title(final ObjectAdapter owningAdapter) {
final TitleUiEvent<Object> titleUiEvent = newTitleUiEvent(owningAdapter);
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mask/TitleFacetBasedOnMask.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mask/TitleFacetBasedOnMask.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mask/TitleFacetBasedOnMask.java
index 7cba3b8..62e0388 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mask/TitleFacetBasedOnMask.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/mask/TitleFacetBasedOnMask.java
@@ -19,7 +19,6 @@
package org.apache.isis.core.metamodel.facets.object.mask;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacetAbstract;
@@ -36,14 +35,14 @@ public class TitleFacetBasedOnMask extends TitleFacetAbstract {
}
@Override
- public String title(final ObjectAdapter object, final Localization localization) {
+ public String title(final ObjectAdapter object) {
final String mask = maskFacet.value();
final TitleFacetUsingParser titleFacetUsingParser = (TitleFacetUsingParser) underlyingTitleFacet.getUnderlyingFacet();
if (titleFacetUsingParser != null) {
final String titleString = titleFacetUsingParser.title(object, mask);
return titleString;
} else {
- return underlyingTitleFacet.title(object, localization);
+ return underlyingTitleFacet.title(object);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java
index 8650427..80b05e1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacet.java
@@ -19,7 +19,6 @@
package org.apache.isis.core.metamodel.facets.object.parseable;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.MultipleValueFacet;
@@ -36,17 +35,11 @@ public interface ParseableFacet extends MultipleValueFacet {
* <p>
* Equivalent to <tt>Parser#parseTextEntry(Object, String)</tt>, though may
* be implemented through some other mechanism.
- * @param interactionInitiatedBy
- * @param localization TODO
- *
- * @throws InvalidEntryException
- * @throws TextEntryParseException
*/
ObjectAdapter parseTextEntry(
final ObjectAdapter original,
final String text,
- final InteractionInitiatedBy interactionInitiatedBy,
- final Localization localization);
+ final InteractionInitiatedBy interactionInitiatedBy);
/**
* A title for the object that is valid but which may be easier to edit than
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAbstract.java
index db3bf59..a2bf04c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAbstract.java
@@ -20,7 +20,6 @@
package org.apache.isis.core.metamodel.facets.object.parseable;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.lang.ClassExtensions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
@@ -79,8 +78,8 @@ public abstract class ParseableFacetAbstract extends FacetAbstract implements Pa
public ObjectAdapter parseTextEntry(
final ObjectAdapter original,
final String entryText,
- final InteractionInitiatedBy interactionInitiatedBy, final Localization localization) {
- return parseableFacetUsingParser.parseTextEntry(original, entryText, interactionInitiatedBy, localization);
+ final InteractionInitiatedBy interactionInitiatedBy) {
+ return parseableFacetUsingParser.parseTextEntry(original, entryText, interactionInitiatedBy);
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/parser/ParseableFacetUsingParser.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/parser/ParseableFacetUsingParser.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/parser/ParseableFacetUsingParser.java
index 5296f26..b15a75d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/parser/ParseableFacetUsingParser.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/parseable/parser/ParseableFacetUsingParser.java
@@ -24,7 +24,6 @@ import java.util.IllegalFormatException;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.adapters.ParsingException;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
@@ -70,7 +69,7 @@ public class ParseableFacetUsingParser extends FacetAbstract implements Parseabl
public ObjectAdapter parseTextEntry(
final ObjectAdapter contextAdapter,
final String entry,
- final InteractionInitiatedBy interactionInitiatedBy, Localization localization) {
+ final InteractionInitiatedBy interactionInitiatedBy) {
if (entry == null) {
throw new IllegalArgumentException("An entry must be provided");
}
@@ -92,7 +91,7 @@ public class ParseableFacetUsingParser extends FacetAbstract implements Parseabl
getDependencyInjector().injectServicesInto(parser);
try {
- final Object parsed = parser.parseTextEntry(context, entry, localization);
+ final Object parsed = parser.parseTextEntry(context, entry);
if (parsed == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacet.java
index bb76b08..bf42b27 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacet.java
@@ -19,7 +19,6 @@
package org.apache.isis.core.metamodel.facets.object.title;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.object.icon.IconFacet;
@@ -39,18 +38,18 @@ import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
public interface TitleFacet extends Facet {
/**
- * Provide a title for the target object, with respect to the specified {@link Localization}.
+ * Provide a title for the target object.
*/
- String title(final ObjectAdapter targetAdapter, Localization localization);
+ String title(final ObjectAdapter targetAdapter);
/**
- * Provide a title for the target object, in the context of the context object, with respect to the specified {@link Localization}.
+ * Provide a title for the target object, in the context of the context object.
*
* <p>
* For example, if the title is of an object within a parented collection, then the
* context object would be the parent. Thus, the title might be shortened so that it does not
* needlessly incorporate the title of the parent (context) object.
*/
- String title(final ObjectAdapter contextAdapter, final ObjectAdapter targetAdapter, Localization localization);
+ String title(final ObjectAdapter contextAdapter, final ObjectAdapter targetAdapter);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacetAbstract.java
index 0b1dc30..6c9721c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/TitleFacetAbstract.java
@@ -19,7 +19,6 @@
package org.apache.isis.core.metamodel.facets.object.title;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
@@ -36,11 +35,11 @@ public abstract class TitleFacetAbstract extends FacetAbstract implements TitleF
}
/**
- * Default implementation that simply delegates to {@link #title(ObjectAdapter, Localization)}.
+ * Default implementation that simply delegates to {@link TitleFacet#title(ObjectAdapter)}.
*/
@Override
- public String title(ObjectAdapter contextAdapter, ObjectAdapter targetAdapter, Localization localization) {
- return title(targetAdapter, localization);
+ public String title(ObjectAdapter contextAdapter, ObjectAdapter targetAdapter) {
+ return title(targetAdapter);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
index a0006aa..6e2fb86 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
@@ -29,7 +29,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -93,8 +92,8 @@ public class TitleFacetViaTitleAnnotation extends TitleFacetAbstract {
}
@Override
- public String title(final ObjectAdapter targetAdapter, final Localization localization) {
- return title(null, targetAdapter, localization);
+ public String title(final ObjectAdapter targetAdapter) {
+ return title(null, targetAdapter);
}
private String titleOf(final ObjectAdapter adapter) {
@@ -113,7 +112,7 @@ public class TitleFacetViaTitleAnnotation extends TitleFacetAbstract {
}
@Override
- public String title(ObjectAdapter contextAdapter, ObjectAdapter targetAdapter, Localization localization) {
+ public String title(ObjectAdapter contextAdapter, ObjectAdapter targetAdapter) {
final StringBuilder stringBuilder = new StringBuilder();
try {
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java
index 986338f..d3731a0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaTitleMethod.java
@@ -26,7 +26,6 @@ import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -64,7 +63,7 @@ public class TitleFacetViaTitleMethod extends TitleFacetAbstract implements Impe
}
@Override
- public String title(final ObjectAdapter owningAdapter, final Localization localization) {
+ public String title(final ObjectAdapter owningAdapter) {
try {
final Object returnValue = ObjectAdapter.InvokeUtils.invoke(method, owningAdapter);
if(returnValue instanceof String) {
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaToStringMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaToStringMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaToStringMethod.java
index 4c9f38e..bfbee8e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaToStringMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/methods/TitleFacetViaToStringMethod.java
@@ -23,11 +23,9 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.ImperativeFacet;
-import org.apache.isis.core.metamodel.facets.ImperativeFacet.Intent;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacetAbstract;
public class TitleFacetViaToStringMethod extends TitleFacetAbstract implements ImperativeFacet {
@@ -54,7 +52,7 @@ public class TitleFacetViaToStringMethod extends TitleFacetAbstract implements I
}
@Override
- public String title(final ObjectAdapter object, final Localization localization) {
+ public String title(final ObjectAdapter object) {
return object.getObject().toString();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetUsingParser.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetUsingParser.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetUsingParser.java
index ded2641..710643c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetUsingParser.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/parser/TitleFacetUsingParser.java
@@ -20,7 +20,6 @@
package org.apache.isis.core.metamodel.facets.object.title.parser;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -40,12 +39,12 @@ public class TitleFacetUsingParser extends FacetAbstract implements TitleFacet {
@Override
protected String toStringValues() {
- getDependencyInjector().injectServicesInto(parser);
+ getServicesInjector().injectServicesInto(parser);
return parser.toString();
}
@Override
- public String title(final ObjectAdapter adapter, final Localization localization) {
+ public String title(final ObjectAdapter adapter) {
if (adapter == null) {
return null;
}
@@ -53,13 +52,13 @@ public class TitleFacetUsingParser extends FacetAbstract implements TitleFacet {
if (object == null) {
return null;
}
- getDependencyInjector().injectServicesInto(parser);
- return parser.displayTitleOf(object, localization);
+ getServicesInjector().injectServicesInto(parser);
+ return parser.displayTitleOf(object);
}
@Override
- public String title(ObjectAdapter contextAdapter, ObjectAdapter targetAdapter, Localization localization) {
- return title(targetAdapter, localization);
+ public String title(ObjectAdapter contextAdapter, ObjectAdapter targetAdapter) {
+ return title(targetAdapter);
}
/**
@@ -73,7 +72,7 @@ public class TitleFacetUsingParser extends FacetAbstract implements TitleFacet {
if (object == null) {
return null;
}
- getDependencyInjector().injectServicesInto(parser);
+ getServicesInjector().injectServicesInto(parser);
return parser.displayTitleOf(object, usingMask);
}
@@ -85,7 +84,7 @@ public class TitleFacetUsingParser extends FacetAbstract implements TitleFacet {
/**
* @return the dependencyInjector
*/
- public ServicesInjector getDependencyInjector() {
+ public ServicesInjector getServicesInjector() {
return dependencyInjector;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
index 605d308..307e3ce 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/value/vsp/ValueSemanticsProviderAndFacetAbstract.java
@@ -30,7 +30,6 @@ import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.adapters.Parser2;
import org.apache.isis.applib.adapters.ValueSemanticsProvider;
import org.apache.isis.applib.clock.Clock;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
@@ -169,7 +168,7 @@ public abstract class ValueSemanticsProviderAndFacetAbstract<T> extends FacetAbs
// ///////////////////////////////////////////////////////////////////////////
@Override
- public T parseTextEntry(final Object context, final String entry, final Localization localization) {
+ public T parseTextEntry(final Object context, final String entry) {
if (entry == null) {
throw new IllegalArgumentException();
}
@@ -180,7 +179,7 @@ public abstract class ValueSemanticsProviderAndFacetAbstract<T> extends FacetAbs
return null;
}
}
- return doParse(context, entry, localization);
+ return doParse(context, entry);
}
/**
@@ -194,7 +193,8 @@ public abstract class ValueSemanticsProviderAndFacetAbstract<T> extends FacetAbs
throw new UnexpectedCallException();
}
- protected T doParse(Object context, String entry, Localization localization) {
+ // REVIEW: unused? (this method used to take Localization as a third param)
+ protected T doParse(String entry, Object context) {
return doParse(context, entry);
}
@@ -209,11 +209,11 @@ public abstract class ValueSemanticsProviderAndFacetAbstract<T> extends FacetAbs
}
@Override
- public String displayTitleOf(final Object object, final Localization localization) {
+ public String displayTitleOf(final Object object) {
if (object == null) {
return "";
}
- return titleString(object, localization);
+ return titleString(object);
}
@Override
@@ -225,11 +225,11 @@ public abstract class ValueSemanticsProviderAndFacetAbstract<T> extends FacetAbs
}
/**
- * Defaults to {@link #displayTitleOf(Object, Localization)}.
+ * Defaults to {@link Parser#displayTitleOf(Object)}.
*/
@Override
public String parseableTitleOf(final Object existing) {
- return displayTitleOf(existing, (Localization) null);
+ return displayTitleOf(existing);
}
protected String titleString(final Format formatter, final Object object) {
@@ -239,7 +239,7 @@ public abstract class ValueSemanticsProviderAndFacetAbstract<T> extends FacetAbs
/**
* Return a string representation of aforesaid object.
*/
- protected abstract String titleString(Object object, Localization localization);
+ protected abstract String titleString(Object object);
public abstract String titleStringWithMask(final Object value, final String usingMask);
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/regex/TitleFacetFormattedByRegex.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/regex/TitleFacetFormattedByRegex.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/regex/TitleFacetFormattedByRegex.java
index 6726611..bf88a2c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/regex/TitleFacetFormattedByRegex.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/objectvalue/regex/TitleFacetFormattedByRegex.java
@@ -19,7 +19,6 @@
package org.apache.isis.core.metamodel.facets.objectvalue.regex;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.object.title.TitleFacetAbstract;
@@ -33,7 +32,7 @@ public class TitleFacetFormattedByRegex extends TitleFacetAbstract {
}
@Override
- public String title(final ObjectAdapter object, final Localization localization) {
+ public String title(final ObjectAdapter object) {
return regexFacet.format(object.titleString());
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
index f366dcd..3dc105a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/DateAndTimeValueSemanticsProviderAbstract.java
@@ -28,9 +28,7 @@ import java.util.TimeZone;
import com.google.common.collect.Maps;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.services.ServicesInjector;
@@ -76,9 +74,12 @@ public abstract class DateAndTimeValueSemanticsProviderAbstract<T> extends Value
}
@Override
- protected DateFormat format(final Localization localization) {
- final DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT, localization.getLocale());
- dateFormat.setTimeZone(localization.getTimeZone());
+ protected DateFormat format() {
+ final Locale locale = Locale.getDefault();
+ final TimeZone timeZone = TimeZone.getDefault();
+
+ final DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.SHORT, locale);
+ dateFormat.setTimeZone(timeZone);
return dateFormat;
}
@@ -87,10 +88,12 @@ public abstract class DateAndTimeValueSemanticsProviderAbstract<T> extends Value
return "JavaDateTimeValueSemanticsProvider: " + format;
}
- protected List<DateFormat> formatsToTry(Localization localization) {
+ protected List<DateFormat> formatsToTry() {
List<DateFormat> formats = new ArrayList<DateFormat>();
- Locale locale = localization == null ? Locale.getDefault() : localization.getLocale();
+ final Locale locale = Locale.getDefault();
+ final TimeZone timeZone = TimeZone.getDefault();
+
formats.add(DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG, locale));
formats.add(createDateFormat("yyyy-MM-dd HH:mm:ss.SSS"));
formats.add(createDateFormat("yyyyMMdd'T'HHmmssSSS"));
@@ -103,7 +106,7 @@ public abstract class DateAndTimeValueSemanticsProviderAbstract<T> extends Value
formats.add(createDateFormat("dd-MMM-yyyy HH:mm"));
for (DateFormat format : formats) {
- format.setTimeZone(localization == null ? TimeZone.getDefault() : localization.getTimeZone());
+ format.setTimeZone(timeZone);
}
return formats;
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/JodaFunctions.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/JodaFunctions.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/JodaFunctions.java
index e0d0cff..c6e0869 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/JodaFunctions.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/JodaFunctions.java
@@ -25,20 +25,14 @@ import com.google.common.base.Function;
import org.joda.time.format.DateTimeFormatter;
-import org.apache.isis.applib.profiles.Localization;
-
public final class JodaFunctions {
private JodaFunctions(){}
-
- public static Function<DateTimeFormatter, DateTimeFormatter> withLocale(final Localization localization) {
+
+ public static Function<DateTimeFormatter, DateTimeFormatter> withLocale(final Locale locale) {
return new Function<DateTimeFormatter, DateTimeFormatter>() {
@Override
public DateTimeFormatter apply(DateTimeFormatter input) {
- if (localization == null) {
- return input;
- }
- final Locale locale = localization.getLocale();
if (locale == null) {
return input;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
index 8c289f8..1d4fa11 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTemporal.java
@@ -33,7 +33,6 @@ import java.util.TimeZone;
import com.google.common.collect.Maps;
import org.apache.isis.applib.adapters.EncodingException;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -158,7 +157,9 @@ public abstract class ValueSemanticsProviderAbstractTemporal<T> extends ValueSem
// //////////////////////////////////////////////////////////////////
@Override
- protected T doParse(final Object context, final String entry, final Localization localization) {
+ protected T doParse(
+ final String entry,
+ final Object context) {
buildDefaultFormatIfRequired();
final String dateString = entry.trim();
final String str = dateString.toLowerCase();
@@ -169,16 +170,16 @@ public abstract class ValueSemanticsProviderAbstractTemporal<T> extends ValueSem
} else if (dateString.startsWith("-")) {
return relativeDate(context == null ? now() : context, dateString, false);
} else {
- return parseDate(dateString, context == null ? now() : context, localization);
+ return parseDate(dateString);
}
}
- private T parseDate(final String dateString, final Object original, final Localization localization) {
- List<DateFormat> elements = formatsToTry(localization);
+ private T parseDate(final String dateString) {
+ List<DateFormat> elements = formatsToTry();
return setDate(parseDate(dateString, elements.iterator()));
}
- protected abstract List<DateFormat> formatsToTry(Localization localization);
+ protected abstract List<DateFormat> formatsToTry();
private Date parseDate(final String dateString, final Iterator<DateFormat> elements) {
final DateFormat format = elements.next();
@@ -252,19 +253,16 @@ public abstract class ValueSemanticsProviderAbstractTemporal<T> extends ValueSem
// ///////////////////////////////////////////////////////////////////////////
@Override
- public String titleString(final Object value, final Localization localization) {
+ public String titleString(final Object value) {
if (value == null) {
return null;
}
final Date date = dateValue(value);
- DateFormat f = format;
- if (localization != null) {
- f = format(localization);
- }
+ final DateFormat f = format();
return titleString(f, date);
}
- protected DateFormat format(final Localization localization) {
+ protected DateFormat format() {
return format;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
index 0a3583b..23d433b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bigdecimal/BigDecimalValueSemanticsProvider.java
@@ -26,7 +26,6 @@ import java.util.Locale;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -100,7 +99,7 @@ public class BigDecimalValueSemanticsProvider extends ValueSemanticsProviderAndF
}
@Override
- public String titleString(final Object object, final Localization localization) {
+ public String titleString(final Object object) {
return titleString(format, object);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java
index b7cbfda..e624490 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/biginteger/BigIntegerValueSemanticsProvider.java
@@ -25,7 +25,6 @@ import java.text.NumberFormat;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
@@ -73,7 +72,7 @@ public class BigIntegerValueSemanticsProvider extends ValueSemanticsProviderAndF
}
@Override
- public String titleString(final Object object, final Localization localization) {
+ public String titleString(final Object object) {
return titleString(format, object);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java
index a096d4f..38953d8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/blobs/BlobValueSemanticsProvider.java
@@ -27,7 +27,6 @@ import org.apache.commons.codec.binary.Base64;
import org.apache.isis.applib.adapters.DefaultsProvider;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -58,13 +57,13 @@ public class BlobValueSemanticsProvider extends ValueSemanticsProviderAndFacetAb
}
@Override
- public String titleString(final Object object, final Localization localization) {
+ public String titleString(final Object object) {
return object != null? ((Blob)object).getName(): "[null]";
}
@Override
public String titleStringWithMask(final Object value, final String usingMask) {
- return titleString(value, null);
+ return titleString(value);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
index f78306a..c0b7bde 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/booleans/BooleanValueSemanticsProviderAbstract.java
@@ -19,8 +19,6 @@
package org.apache.isis.core.metamodel.facets.value.booleans;
-import org.apache.isis.applib.profiles.Localization;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -60,13 +58,13 @@ public abstract class BooleanValueSemanticsProviderAbstract extends ValueSemanti
}
@Override
- public String titleString(final Object value, final Localization localization) {
+ public String titleString(final Object value) {
return value == null ? "" : isSet(value) ? "True" : "False";
}
@Override
public String titleStringWithMask(final Object value, final String usingMask) {
- return titleString(value, null);
+ return titleString(value);
}
// //////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java
index 9950919..beeb3ba 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/bytes/ByteValueSemanticsProviderAbstract.java
@@ -23,8 +23,6 @@ import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.text.ParseException;
-import org.apache.isis.applib.profiles.Localization;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -63,7 +61,7 @@ public abstract class ByteValueSemanticsProviderAbstract extends ValueSemanticsP
}
@Override
- public String titleString(final Object value, final Localization localization) {
+ public String titleString(final Object value) {
return titleString(format, value);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharValueSemanticsProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharValueSemanticsProviderAbstract.java
index 4001101..defbc1f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/chars/CharValueSemanticsProviderAbstract.java
@@ -21,8 +21,6 @@ package org.apache.isis.core.metamodel.facets.value.chars;
import java.text.DecimalFormat;
-import org.apache.isis.applib.profiles.Localization;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -59,7 +57,7 @@ public abstract class CharValueSemanticsProviderAbstract extends ValueSemanticsP
}
@Override
- public String titleString(final Object value, final Localization localization) {
+ public String titleString(final Object value) {
return value == null ? "" : value.toString();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/clobs/ClobValueSemanticsProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/clobs/ClobValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/clobs/ClobValueSemanticsProvider.java
index 2215750..9e3a64b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/clobs/ClobValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/clobs/ClobValueSemanticsProvider.java
@@ -25,7 +25,6 @@ import javax.activation.MimeTypeParseException;
import org.apache.isis.applib.adapters.DefaultsProvider;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -56,13 +55,13 @@ public class ClobValueSemanticsProvider extends ValueSemanticsProviderAndFacetAb
}
@Override
- public String titleString(final Object object, final Localization localization) {
+ public String titleString(final Object object) {
return object != null? ((Clob)object).getName(): "[null]";
}
@Override
public String titleStringWithMask(final Object value, final String usingMask) {
- return titleString(value, null);
+ return titleString(value);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueSemanticsProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueSemanticsProvider.java
index 4b76ee2..fc27b10 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/color/ColorValueSemanticsProvider.java
@@ -23,7 +23,6 @@ import java.text.DecimalFormat;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.value.Color;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -74,7 +73,7 @@ public class ColorValueSemanticsProvider extends ValueSemanticsProviderAndFacetA
}
@Override
- public String titleString(final Object object, final Localization localization) {
+ public String titleString(final Object object) {
final Color color = (Color) object;
return color.title();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
index c4896b8..59ad26a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/date/DateValueSemanticsProviderAbstract.java
@@ -28,9 +28,7 @@ import java.util.Map;
import com.google.common.collect.Maps;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
@@ -95,16 +93,17 @@ public abstract class DateValueSemanticsProviderAbstract<T> extends ValueSemanti
}
@Override
- protected DateFormat format(final Localization localization) {
- final DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM, localization.getLocale());
+ protected DateFormat format() {
+ final Locale locale = Locale.getDefault();
+ final DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM, locale);
dateFormat.setTimeZone(UTC_TIME_ZONE);
return dateFormat;
}
- protected List<DateFormat> formatsToTry(Localization localization) {
+ protected List<DateFormat> formatsToTry() {
List<DateFormat> formats = new ArrayList<DateFormat>();
- Locale locale = localization == null ? Locale.getDefault() : localization.getLocale();
+ Locale locale = Locale.getDefault();
formats.add(DateFormat.getDateInstance(DateFormat.LONG, locale));
formats.add(DateFormat.getDateInstance(DateFormat.MEDIUM, locale));
formats.add(DateFormat.getDateInstance(DateFormat.SHORT, locale));
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateUtil.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateUtil.java
index ae37da1..5a0d2f0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateUtil.java
@@ -20,6 +20,7 @@
package org.apache.isis.core.metamodel.facets.value.datejodalocal;
import java.util.List;
+import java.util.Locale;
import java.util.StringTokenizer;
import com.google.common.collect.Iterables;
@@ -27,7 +28,6 @@ import com.google.common.collect.Iterables;
import org.joda.time.LocalDate;
import org.joda.time.format.DateTimeFormatter;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.JodaFunctions;
@@ -35,8 +35,12 @@ public final class JodaLocalDateUtil {
private JodaLocalDateUtil(){}
- static LocalDate parseDate(final String dateStr, final Localization localization, List<DateTimeFormatter> parseFormatters) {
- Iterable<DateTimeFormatter> elements = Iterables.transform(parseFormatters, JodaFunctions.withLocale(localization));
+ static LocalDate parseDate(
+ final String dateStr,
+ List<DateTimeFormatter> parseFormatters) {
+ final Locale locale = Locale.getDefault();
+
+ Iterable<DateTimeFormatter> elements = Iterables.transform(parseFormatters, JodaFunctions.withLocale(locale));
LocalDate parsedDate = parseDate(dateStr, elements);
return parsedDate;
}
[31/50] [abbrv] 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 convenienc
Posted by da...@apache.org.
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/master
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
+
+
+}
[12/50] [abbrv] isis git commit: ISIS-1427: simplifying IsisContext
and minimizing calls to it; also removed Localization (unused)
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
index 74929e5..56e5a53 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/background/BackgroundServiceDefault.java
@@ -25,6 +25,7 @@ import java.util.Map;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
+import javax.inject.Inject;
import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
@@ -43,14 +44,14 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.facets.actions.action.invocation.CommandUtil;
import org.apache.isis.core.metamodel.services.command.CommandDtoServiceInternal;
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.spec.feature.ObjectMember;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.JavassistEnhanced;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionMixedIn;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
-import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.schema.cmd.v1.CommandDto;
import javassist.util.proxy.MethodFilter;
@@ -97,7 +98,7 @@ public class BackgroundServiceDefault implements BackgroundService2 {
}
private ObjectSpecification getSpecification(final Class<?> type) {
- return getSpecificationLoader().loadSpecification(type);
+ return specificationLoader.loadSpecification(type);
}
@@ -290,15 +291,14 @@ public class BackgroundServiceDefault implements BackgroundService2 {
@javax.inject.Inject
private FactoryService factoryService;
+ @Inject
+ private SpecificationLoader specificationLoader;
- // //////////////////////////////////////
-
- protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSpecificationLoader();
- }
+ @Inject
+ private IsisSessionFactory isisSessionFactory;
protected AdapterManager getAdapterManager() {
- return IsisContext.getPersistenceSession();
+ return isisSessionFactory.getCurrentSession().getPersistenceSession();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
index 4e7b16b..f1814fe 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/command/CommandDtoServiceInternalDefault.java
@@ -242,11 +242,11 @@ public class CommandDtoServiceInternalDefault implements CommandDtoServiceIntern
// //////////////////////////////////////
protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSpecificationLoader();
+ return IsisContext.getSessionFactory().getSpecificationLoader();
}
protected AdapterManager getAdapterManager() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java
index f585319..8ef5e00 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/deplcat/DeploymentCategoryProviderDefault.java
@@ -29,6 +29,6 @@ public class DeploymentCategoryProviderDefault implements DeploymentCategoryProv
@Programmatic
@Override
public DeploymentCategory getDeploymentCategory() {
- return IsisContext.getDeploymentCategory();
+ return IsisContext.getSessionFactory().getDeploymentCategory();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
index a207537..d2db71b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/email/EmailServiceDefault.java
@@ -190,7 +190,7 @@ public class EmailServiceDefault implements EmailService {
//region > dependencies
protected IsisConfiguration getConfiguration() {
- return IsisContext.getConfiguration();
+ return IsisContext.getSessionFactory().getConfiguration();
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusImplementationAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusImplementationAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusImplementationAbstract.java
index 938c51a..f8b7555 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusImplementationAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusImplementationAbstract.java
@@ -68,12 +68,12 @@ public abstract class EventBusImplementationAbstract implements EventBusImplemen
// region > exception handling
private static void abortTransaction(final Throwable exception) {
- getTransactionManager().getTransaction().setAbortCause(new IsisApplicationException(exception));
+ getTransactionManager().getCurrentTransaction().setAbortCause(new IsisApplicationException(exception));
return;
}
private static IsisTransactionManager getTransactionManager() {
- return IsisContext.getTransactionManager();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager();
}
// endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
index f712a5b..c99c304 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
@@ -106,7 +106,7 @@ public class HomePageProviderServiceDefault implements HomePageProviderService {
protected static final Where WHERE_FOR_ACTION_INVOCATION = Where.ANYWHERE;
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
index 15bcf15..fb73e1b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/i18n/po/TranslationServicePo.java
@@ -169,7 +169,7 @@ public class TranslationServicePo implements TranslationService {
// //////////////////////////////////////
DeploymentCategory getDeploymentCategory() {
- return IsisContext.getDeploymentCategory();
+ return IsisContext.getSessionFactory().getDeploymentCategory();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/services/l10n/LocalizationProviderInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/l10n/LocalizationProviderInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/l10n/LocalizationProviderInternalDefault.java
deleted file mode 100644
index 0900db2..0000000
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/l10n/LocalizationProviderInternalDefault.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.services.l10n;
-
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.profiles.Localization;
-import org.apache.isis.core.metamodel.services.l10n.LocalizationProviderInternal;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-
-@DomainService(
- nature = NatureOfService.DOMAIN,
- menuOrder = "" + (Integer.MAX_VALUE - 1) // ie before the Noop impl in metamodel
-)
-public class LocalizationProviderInternalDefault implements LocalizationProviderInternal {
-
- @Override
- public Localization getLocalization() {
- return IsisContext.getLocalization();
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/services/msgbroker/MessageBrokerServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/msgbroker/MessageBrokerServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/msgbroker/MessageBrokerServiceInternalDefault.java
index 9fab4c0..a6158ea 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/msgbroker/MessageBrokerServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/msgbroker/MessageBrokerServiceInternalDefault.java
@@ -47,7 +47,7 @@ public class MessageBrokerServiceInternalDefault implements MessageBrokerService
}
private static MessageBroker getMessageBroker() {
- return IsisContext.getMessageBroker();
+ return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession().getMessageBroker();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
index 09e62cf..ac8fb72 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/persistsession/PersistenceSessionServiceInternalDefault.java
@@ -160,7 +160,7 @@ public class PersistenceSessionServiceInternalDefault implements PersistenceSess
@Override
public Transaction currentTransaction() {
- return getTransactionManager().getTransaction();
+ return getTransactionManager().getCurrentTransaction();
}
@Override
@@ -174,7 +174,7 @@ public class PersistenceSessionServiceInternalDefault implements PersistenceSess
}
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
@Programmatic
@@ -183,7 +183,7 @@ public class PersistenceSessionServiceInternalDefault implements PersistenceSess
}
protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSpecificationLoader();
+ return IsisContext.getSessionFactory().getSpecificationLoader();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/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 6e76686..ecb6449 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
@@ -81,27 +81,25 @@ import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
public class PublishingServiceInternalDefault implements PublishingServiceInternal {
//region > static helper functions
- private final static Function<ObjectAdapter, ObjectAdapter> NOT_DESTROYED_ELSE_EMPTY =
- new Function<ObjectAdapter, ObjectAdapter>() {
- public ObjectAdapter apply(ObjectAdapter adapter) {
- if(adapter == null) {
- return null;
- }
- if (!adapter.isDestroyed()) {
+ private Function<ObjectAdapter, ObjectAdapter> notDestroyedElseEmpty() {
+ return new Function<ObjectAdapter, ObjectAdapter>() {
+ public ObjectAdapter apply(ObjectAdapter adapter) {
+ if (adapter == null) {
+ return null;
+ }
+ if (!adapter.isDestroyed()) {
+ return adapter;
+ }
+ // objectstores such as JDO prevent the underlying pojo from being touched once it has been deleted.
+ // we therefore replace that pojo with an 'empty' one.
+
+ Object replacementObject = getPersistenceSession()
+ .instantiateAndInjectServices(adapter.getSpecification());
+ getPersistenceSession().remapRecreatedPojo(adapter, replacementObject);
return adapter;
}
- // objectstores such as JDO prevent the underlying pojo from being touched once it has been deleted.
- // we therefore replace that pojo with an 'empty' one.
-
- Object replacementObject = getPersistenceSession().instantiateAndInjectServices(adapter.getSpecification());
- getPersistenceSession().remapRecreatedPojo(adapter, replacementObject);
- return adapter;
- }
- protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
- }
-
- };
+ };
+ }
//endregion
//region > publishObjects
@@ -252,7 +250,7 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
}
final RootOid adapterOid = (RootOid) targetAdapter.getOid();
- final String oidStr = getOidMarshaller().marshal(adapterOid);
+ final String oidStr = oidMarshaller.marshal(adapterOid);
final Identifier actionIdentifier = objectAction.getIdentifier();
final String title = oidStr + ": " + actionIdentifier.toNameParmsIdentityString();
@@ -313,9 +311,10 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
if(object == null) {
return null;
}
- final ObjectAdapter adapter = IsisContext.getPersistenceSession().adapterFor(object);
+ final ObjectAdapter adapter = IsisContext.getSessionFactory().getCurrentSession()
+ .getPersistenceSession().adapterFor(object);
Oid oid = adapter.getOid();
- return oid != null? oid.enString(getOidMarshaller()): encodedValueOf(adapter);
+ return oid != null? oid.enString(oidMarshaller): encodedValueOf(adapter);
}
private String encodedValueOf(ObjectAdapter adapter) {
EncodableFacet facet = adapter.getSpecification().getFacet(EncodableFacet.class);
@@ -330,12 +329,12 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
};
}
- private static List<ObjectAdapter> undeletedElseEmpty(List<ObjectAdapter> parameters) {
- return Lists.newArrayList(Iterables.transform(parameters, NOT_DESTROYED_ELSE_EMPTY));
+ private List<ObjectAdapter> undeletedElseEmpty(List<ObjectAdapter> parameters) {
+ return Lists.newArrayList(Iterables.transform(parameters, notDestroyedElseEmpty()));
}
- private static ObjectAdapter undeletedElseEmpty(ObjectAdapter adapter) {
- return NOT_DESTROYED_ELSE_EMPTY.apply(adapter);
+ private ObjectAdapter undeletedElseEmpty(ObjectAdapter adapter) {
+ return notDestroyedElseEmpty().apply(adapter);
}
private EventMetadata newEventMetadata(
@@ -446,12 +445,11 @@ public class PublishingServiceInternalDefault implements PublishingServiceIntern
@Inject
private MetricsService metricsService;
- protected OidMarshaller getOidMarshaller() {
- return IsisContext.getOidMarshaller();
- }
+ @Inject
+ private OidMarshaller oidMarshaller;
private PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java
index a389dee..a4fb023 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/sessmgmt/SessionManagementServiceDefault.java
@@ -19,29 +19,36 @@
package org.apache.isis.core.runtime.services.sessmgmt;
+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.sessmgmt.SessionManagementService;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@DomainService(
nature = NatureOfService.DOMAIN
)
public class SessionManagementServiceDefault implements SessionManagementService {
-
@Programmatic
@Override
public void nextSession() {
- final AuthenticationSession authenticationSession = IsisContext.getAuthenticationSession();
- IsisContext.getPersistenceSession().getTransactionManager().endTransaction();
- IsisContext.closeSession();
- IsisContext.openSession(authenticationSession);
- IsisContext.getPersistenceSession().getTransactionManager().startTransaction();
+ final AuthenticationSession authenticationSession =
+ isisSessionFactory.getCurrentSession().getAuthenticationSession();
+
+ isisSessionFactory.getCurrentSession().getPersistenceSession().getTransactionManager().endTransaction();
+ isisSessionFactory.closeSession();
+
+ isisSessionFactory.openSession(authenticationSession);
+ isisSessionFactory.getCurrentSession().getPersistenceSession().startTransaction();
}
+ @Inject
+ IsisSessionFactory isisSessionFactory;
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java
index 7d68cc3..d60031a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/transtate/TransactionStateProviderInternalDefault.java
@@ -36,7 +36,7 @@ public class TransactionStateProviderInternalDefault implements TransactionState
@Override
public TransactionState getTransactionState() {
- final IsisTransaction transaction = getTransactionManager().getTransaction();
+ final IsisTransaction transaction = getTransactionManager().getCurrentTransaction();
if (transaction == null) {
return TransactionState.NONE;
}
@@ -49,7 +49,7 @@ public class TransactionStateProviderInternalDefault implements TransactionState
}
private static PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/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 e31d155..759b2ff 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
@@ -91,11 +91,11 @@ public class XmlSnapshotServiceDefault extends XmlSnapshotServiceAbstract {
// //////////////////////////////////////
protected PersistenceSession gerPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
protected OidMarshaller getOidMarshaller() {
- return IsisContext.getOidMarshaller();
+ return IsisContext.getSessionFactory().getOidMarshaller();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
index 324dd6c..eb8dd52 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
@@ -34,12 +34,12 @@ public abstract class AbstractIsisSessionTemplate {
*/
public void execute(final AuthenticationSession authSession, final Object context) {
try {
- IsisContext.openSession(authSession);
+ IsisContext.getSessionFactory().openSession(authSession);
PersistenceSession persistenceSession = getPersistenceSession();
persistenceSession.getServicesInjector().injectServicesInto(this);
doExecute(context);
} finally {
- IsisContext.closeSession();
+ IsisContext.getSessionFactory().closeSession();
}
}
@@ -91,7 +91,7 @@ public abstract class AbstractIsisSessionTemplate {
// //////////////////////////////////////
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
protected IsisTransactionManager getTransactionManager(PersistenceSession persistenceSession) {
@@ -103,7 +103,7 @@ public abstract class AbstractIsisSessionTemplate {
}
protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSpecificationLoader();
+ return IsisContext.getSessionFactory().getSpecificationLoader();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/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 6c50c59..36fee5c 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
@@ -94,6 +94,6 @@ public class XmlSnapshotBuilder {
// ///////////////////////////////////////////////////////
private static PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/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 88b73f0..75dbfae 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
@@ -38,6 +38,7 @@ import org.apache.isis.applib.services.title.TitleService;
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.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.services.ServicesInjector;
@@ -75,7 +76,7 @@ public class IsisSystem implements ApplicationScopedComponent {
private boolean initialized = false;
private ServiceInitializer serviceInitializer;
- private IsisSessionFactory sessionFactory;
+ private IsisSessionFactory isisSessionFactory;
//region > constructors, fields
@@ -110,7 +111,7 @@ public class IsisSystem implements ApplicationScopedComponent {
* Populated after {@link #init()}.
*/
public IsisSessionFactory getSessionFactory() {
- return sessionFactory;
+ return isisSessionFactory;
}
//endregion
@@ -145,8 +146,16 @@ public class IsisSystem implements ApplicationScopedComponent {
try {
+ //
+ // everything added to ServicesInjector will be able to @Inject'ed
+ //
+
+ //
+ // the IsisSessionFactory will look up each of these components from the ServicesInjector
+ //
+
// services
- ServicesInjector servicesInjector = componentProvider.provideServiceInjector(configuration);
+ final ServicesInjector servicesInjector = componentProvider.provideServiceInjector(configuration);
servicesInjector.addFallbackIfRequired(FixtureScripts.class, new FixtureScriptsDefault());
servicesInjector.addFallbackIfRequired(ConfigurationServiceInternal.class, configuration);
servicesInjector.validateServices();
@@ -171,16 +180,41 @@ public class IsisSystem implements ApplicationScopedComponent {
final PersistenceSessionFactory persistenceSessionFactory = new PersistenceSessionFactory(configuration);
servicesInjector.addFallbackIfRequired(PersistenceSessionFactory.class, persistenceSessionFactory);
- // wire up components and components into services...
+
+ // instantiate the IsisSessionFactory
+ isisSessionFactory = new IsisSessionFactory(deploymentCategory, servicesInjector);
+
+
+ //
+ // now, add the IsisSessionFactory and its subcomponents into ServicesInjector, so that they can be
+ // @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...
+ //
for (Object service : servicesInjector.getRegisteredServices()) {
// inject itself into each service (if implements ServiceInjectorAware).
servicesInjector.injectInto(service);
}
- // instantiate
- sessionFactory = new IsisSessionFactory(deploymentCategory, servicesInjector);
- IsisContext.set(sessionFactory);
+ // ... 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();
@@ -199,11 +233,66 @@ public class IsisSystem implements ApplicationScopedComponent {
serviceInitializer = new ServiceInitializer(configuration, servicesInjector.getRegisteredServices());
serviceInitializer.validate();
- postConstructInSession(serviceInitializer);
+ isisSessionFactory.openSession(new InitialisationSession());
+
+ try {
+ //
+ // postConstructInSession
+ //
+
+ IsisTransactionManager transactionManager = getCurrentSessionTransactionManager();
+ transactionManager.startTransaction();
+ try {
+ serviceInitializer.postConstruct();
+ } catch(RuntimeException ex) {
+ transactionManager.getCurrentTransaction().setAbortCause(new IsisTransactionManagerException(ex));
+ } finally {
+ // will commit or abort
+ transactionManager.endTransaction();
+ }
+
- installFixturesIfRequired();
+ //
+ // installFixturesIfRequired
+ //
+ final FixturesInstaller fixtureInstaller = componentProvider.provideFixturesInstaller();
+ fixtureInstaller.installFixtures();
+
+ // only allow logon fixtures if not in production mode.
+ if (!deploymentCategory.isProduction()) {
+ logonFixture = fixtureInstaller.getLogonFixture();
+ }
+
+ //
+ // translateServicesAndEnumConstants
+ //
+ final List<Object> services = servicesInjector.getRegisteredServices();
+ final TitleService titleService = servicesInjector.lookupServiceElseFail(TitleService.class);
+ for (Object service : services) {
+ final String unused = titleService.titleOf(service);
+ }
+ for (final ObjectSpecification objSpec : servicesInjector.getSpecificationLoader().allSpecifications()) {
+ final Class<?> correspondingClass = objSpec.getCorrespondingClass();
+ if(correspondingClass.isEnum()) {
+ final Object[] enumConstants = correspondingClass.getEnumConstants();
+ for (Object enumConstant : enumConstants) {
+ final String unused = titleService.titleOf(enumConstant);
+ }
+ }
+ }
+
+ // as used by the Wicket UI
+ final TranslationService translationService = servicesInjector.lookupServiceElseFail(TranslationService.class);
+
+ final String context = IsisSystem.class.getName();
+ translationService.translate(context, MSG_ARE_YOU_SURE);
+ translationService.translate(context, MSG_CONFIRM);
+ translationService.translate(context, MSG_CANCEL);
+
+ } finally {
+ isisSessionFactory.closeSession();
+ }
- translateServicesAndEnumConstants();
} catch (final MetaModelInvalidException ex) {
// no need to use a higher level, such as error(...); the calling code will expose any metamodel
@@ -225,79 +314,8 @@ public class IsisSystem implements ApplicationScopedComponent {
return ListExtensions.filtered(Arrays.asList(possibleRefiners), MetaModelRefiner.class);
}
- private void postConstructInSession(final ServiceInitializer serviceInitializer) {
- IsisContext.openSession(new InitialisationSession());
- try {
- IsisTransactionManager transactionManager = getCurrentSessionTransactionManager();
- transactionManager.startTransaction();
- try {
- serviceInitializer.postConstruct();
- } catch(RuntimeException ex) {
- transactionManager.getTransaction().setAbortCause(new IsisTransactionManagerException(ex));
- } finally {
- // will commit or abort
- transactionManager.endTransaction();
- }
- } finally {
- IsisContext.closeSession();
- }
- }
-
- private void installFixturesIfRequired() throws IsisSystemException {
-
- final FixturesInstaller fixtureInstaller = componentProvider.provideFixturesInstaller();
-
- IsisContext.openSession(new InitialisationSession());
- fixtureInstaller.installFixtures();
- try {
-
- // only allow logon fixtures if not in production mode.
- if (!getDeploymentCategory().isProduction()) {
- logonFixture = fixtureInstaller.getLogonFixture();
- }
- } finally {
- IsisContext.closeSession();
- }
- }
-
- /**
- * The act of invoking titleOf(...) will cause translations to be requested.
- */
- private void translateServicesAndEnumConstants() {
- final ServicesInjector servicesInjector = getServicesInjector();
-
- IsisContext.openSession(new InitialisationSession());
- try {
- final List<Object> services = servicesInjector.getRegisteredServices();
- final TitleService titleService = servicesInjector.lookupServiceElseFail(TitleService.class);
- for (Object service : services) {
- final String unused = titleService.titleOf(service);
- }
- for (final ObjectSpecification objSpec : servicesInjector.getSpecificationLoader().allSpecifications()) {
- final Class<?> correspondingClass = objSpec.getCorrespondingClass();
- if(correspondingClass.isEnum()) {
- final Object[] enumConstants = correspondingClass.getEnumConstants();
- for (Object enumConstant : enumConstants) {
- final String unused = titleService.titleOf(enumConstant);
- }
- }
- }
-
- // as used by the Wicket UI
- final TranslationService translationService = servicesInjector.lookupServiceElseFail(TranslationService.class);
-
- final String context = IsisSystem.class.getName();
- translationService.translate(context, MSG_ARE_YOU_SURE);
- translationService.translate(context, MSG_CONFIRM);
- translationService.translate(context, MSG_CANCEL);
-
- } finally {
- IsisContext.closeSession();
- }
- }
-
private ServicesInjector getServicesInjector() {
- return sessionFactory.getServicesInjector();
+ return isisSessionFactory.getServicesInjector();
}
//endregion
@@ -319,7 +337,7 @@ public class IsisSystem implements ApplicationScopedComponent {
}
// call @PreDestroy (in a session)
- IsisContext.openSession(new InitialisationSession());
+ getSessionFactory().openSession(new InitialisationSession());
IsisTransactionManager transactionManager = getCurrentSessionTransactionManager();
try {
transactionManager.startTransaction();
@@ -328,14 +346,14 @@ public class IsisSystem implements ApplicationScopedComponent {
serviceInitializer.preDestroy();
} catch (RuntimeException ex) {
- transactionManager.getTransaction().setAbortCause(
+ transactionManager.getCurrentTransaction().setAbortCause(
new IsisTransactionManagerException(ex));
} finally {
// will commit or abort
transactionManager.endTransaction();
}
} finally {
- IsisContext.closeSession();
+ getSessionFactory().closeSession();
}
}
@@ -364,7 +382,7 @@ public class IsisSystem implements ApplicationScopedComponent {
}
IsisTransactionManager getCurrentSessionTransactionManager() {
- final IsisSession currentSession = sessionFactory.getCurrentSession();
+ final IsisSession currentSession = isisSessionFactory.getCurrentSession();
return currentSession.getPersistenceSession().getTransactionManager();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/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 f8596f1..ab931c5 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
@@ -19,28 +19,14 @@
package org.apache.isis.core.runtime.system.context;
-import java.util.concurrent.Callable;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.isis.applib.profiles.Localization;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.authentication.MessageBroker;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.services.l10n.LocalizationDefault;
-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.system.internal.InitialisationSession;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.session.IsisSession;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
-import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
-import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
/**
* Simply a static field holding the {@link IsisSessionFactory} singleton, and conveneince methods to obtain the
@@ -68,11 +54,19 @@ public final class IsisContext {
}
//endregion
- //region > set (the sessionFactory)
+ //region > sessionFactory (static)
private static IsisSessionFactory sessionFactory;
- public static void set(final IsisSessionFactory sessionFactory) {
+ public static IsisSessionFactory getSessionFactory() {
+ return sessionFactory;
+ }
+
+
+ /**
+ * Intended to be called only by {@link IsisSystem}.
+ */
+ public static void setSessionFactory(final IsisSessionFactory sessionFactory) {
if (IsisContext.sessionFactory != null) {
throw new IsisException("SessionFactory already set up");
}
@@ -100,212 +94,5 @@ public final class IsisContext {
//endregion
- //region > Static Convenience methods (session management)
-
-
- /**
- * Convenience method to open a new {@link IsisSession}.
- */
- public static IsisSession openSession(final AuthenticationSession authenticationSession) {
- return sessionFactory.openSession(authenticationSession);
- }
-
- /**
- * Convenience method to close the current {@link IsisSession}.
- */
- public static void closeSession() {
- sessionFactory.closeSession();
- }
-
- //endregion
-
- //region > Static Convenience methods (application scoped)
- /**
- * Convenience method returning the {@link IsisSessionFactory} of the
- * current {@link #getCurrentSession() session}.
- */
- public static IsisSessionFactory getSessionFactory() {
- return sessionFactory;
- }
-
-
- /**
- * Convenience method.
- *
- * @see IsisSessionFactory#getConfiguration()
- */
- public static IsisConfiguration getConfiguration() {
- return getSessionFactory().getConfiguration();
- }
-
-
- /**
- * Convenience method.
- *
- * @see IsisSessionFactory#getDeploymentCategory()
- */
- public static DeploymentCategory getDeploymentCategory() {
- return getSessionFactory().getDeploymentCategory();
- }
-
- /**
- * Convenience method.
- *
- * @see IsisSessionFactory#getSpecificationLoader()
- */
- public static SpecificationLoader getSpecificationLoader() {
- return getSessionFactory().getSpecificationLoader();
- }
-
- /**
- * Convenience method.
- *
- * @see IsisSessionFactory#getAuthenticationManager()
- */
- public static AuthenticationManager getAuthenticationManager() {
- return getSessionFactory().getAuthenticationManager();
- }
-
- /**
- * Convenience method.
- *
- * @see IsisSessionFactory#getOidMarshaller()
- */
- public static OidMarshaller getOidMarshaller() {
- return getSessionFactory().getOidMarshaller();
- }
-
- //endregion
-
- //region > Static Convenience methods (session scoped)
-
- public static boolean inSession() {
- return sessionFactory.inSession();
- }
-
- /**
- * Convenience method returning the current {@link IsisSession}.
- */
- public static IsisSession getCurrentSession() {
- return sessionFactory.getCurrentSession();
- }
-
- /**
- * @see IsisSession#getAuthenticationSession()
- */
- public static AuthenticationSession getAuthenticationSession() {
- return sessionFactory.getCurrentSession().getAuthenticationSession();
- }
-
- /**
- * Convenience method.
- *
- * @see IsisSession#getPersistenceSession()
- */
- public static PersistenceSession getPersistenceSession() {
- return sessionFactory.getCurrentSession().getPersistenceSession();
- }
-
- /**
- * Convenience method.
- */
- public static Localization getLocalization() {
- return new LocalizationDefault();
- }
-
- /**
- * Convenience methods
- *
- * @see IsisSession#getPersistenceSession()
- * @see PersistenceSession#getTransactionManager()
- */
- public static IsisTransactionManager getTransactionManager() {
- return getPersistenceSession().getTransactionManager();
- }
-
- //endregion
-
- //region > Static Convenience methods (transaction scoped)
-
- public static boolean inTransaction() {
- if (inSession()) {
- if (getCurrentTransaction() != null) {
- if (!getCurrentTransaction().getState().isComplete()) {
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * Convenience method, returning the current {@link IsisTransaction
- * transaction} (if any).
- *
- * <p>
- * Transactions are managed using the {@link IsisTransactionManager}
- * obtainable from the {@link IsisSession's} {@link PersistenceSession}.
- *
- * @see IsisSession#getCurrentTransaction()
- * @see PersistenceSession#getTransactionManager()
- */
- public static IsisTransaction getCurrentTransaction() {
- return getCurrentSession().getCurrentTransaction();
- }
-
- /**
- * Convenience method, returning the {@link org.apache.isis.core.commons.authentication.MessageBroker} of the
- * {@link #getCurrentTransaction() current transaction}.
- */
- public static MessageBroker getMessageBroker() {
- return getAuthenticationSession().getMessageBroker();
- }
-
-
- /**
- * A template method that executes a piece of code in a session.
- * If there is an open session then it is reused, otherwise a temporary one
- * is created.
- *
- * @param runnable The piece of code to run.
- */
- public static void doInSession(final Runnable runnable) {
- doInSession(new Callable<Void>() {
- @Override
- public Void call() throws Exception {
- runnable.run();
- return null;
- }
- });
- }
-
- /**
- * A template method that executes a piece of code in a session.
- * If there is an open session then it is reused, otherwise a temporary one
- * is created.
- *
- * @param callable The piece of code to run.
- * @return The result of the code execution.
- */
- public static <R> R doInSession(Callable<R> callable) {
- boolean noSession = !inSession();
- try {
- if (noSession) {
- openSession(new InitialisationSession());
- }
-
- return callable.call();
- } catch (Exception x) {
- throw new RuntimeException(
- String.format("An error occurred while executing code in %s session", noSession ? "a temporary" : "a"),
- x);
- } finally {
- if (noSession) {
- closeSession();
- }
- }
- }
-
- //endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
index 9cd24e7..6a77631 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
@@ -232,7 +232,7 @@ public class DataNucleusApplicationComponents implements ApplicationScopedCompon
private static Map<String, JdoNamedQuery> catalogNamedQueries(Set<String> persistableClassNames) {
final Map<String, JdoNamedQuery> namedQueryByName = Maps.newHashMap();
for (final String persistableClassName: persistableClassNames) {
- final ObjectSpecification spec = IsisContext.getSpecificationLoader().loadSpecification(persistableClassName);
+ final ObjectSpecification spec = IsisContext.getSessionFactory().getSpecificationLoader().loadSpecification(persistableClassName);
final JdoQueryFacet facet = spec.getFacet(JdoQueryFacet.class);
if (facet == null) {
continue;
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/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 5f66961..72c4515 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -41,7 +41,6 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.annotation.Bulk;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService2;
@@ -423,7 +422,7 @@ public class PersistenceSession implements
transactionManager.flushTransaction();
try {
- final IsisTransaction currentTransaction = transactionManager.getTransaction();
+ final IsisTransaction currentTransaction = transactionManager.getCurrentTransaction();
if (currentTransaction != null && !currentTransaction.getState().isComplete()) {
if(currentTransaction.getState().canCommit()) {
transactionManager.endTransaction();
@@ -1233,7 +1232,7 @@ public class PersistenceSession implements
}
private void ensureInSession() {
- ensureThatContext(IsisContext.inSession(), is(true));
+ ensureThatContext(IsisContext.getSessionFactory().inSession(), is(true));
}
private DestroyObjectCommand newDestroyObjectCommand(final ObjectAdapter adapter) {
@@ -1321,7 +1320,7 @@ public class PersistenceSession implements
}
private void ensureInTransaction() {
- ensureThatContext(IsisContext.inTransaction(), is(true));
+ ensureThatContext(IsisContext.getSessionFactory().inTransaction(), is(true));
javax.jdo.Transaction currentTransaction = persistenceManager.currentTransaction();
ensureThatState(currentTransaction, is(notNullValue()));
ensureThatState(currentTransaction.isActive(), is(true));
@@ -2020,7 +2019,7 @@ public class PersistenceSession implements
final Oid oid) {
return new PojoAdapter(
pojo, oid,
- authenticationSession, getLocalization(),
+ authenticationSession,
specificationLoader, this);
}
@@ -2068,17 +2067,10 @@ public class PersistenceSession implements
//endregion
- //region > dependencies (from context)
- protected Localization getLocalization() {
- return IsisContext.getLocalization();
- }
-
- //endregion
-
//region > TransactionManager delegate methods
protected IsisTransaction getCurrentTransaction() {
- return transactionManager.getTransaction();
+ return transactionManager.getCurrentTransaction();
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java
index b112ff2..80d3ebe 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSession.java
@@ -100,7 +100,7 @@ public class IsisSession implements SessionScopedComponent {
* session, if any.
*/
public IsisTransaction getCurrentTransaction() {
- return getTransactionManager().getTransaction();
+ return getTransactionManager().getCurrentTransaction();
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/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 661a516..67aac63 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
@@ -20,10 +20,12 @@
package org.apache.isis.core.runtime.system.session;
import java.util.List;
+import java.util.concurrent.Callable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -34,6 +36,7 @@ import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
+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;
import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProviderUsingInstallers;
@@ -63,7 +66,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
private final DeploymentCategory deploymentCategory;
private final IsisConfiguration configuration;
- private final SpecificationLoader specificationLoaderSpi;
+ private final SpecificationLoader specificationLoader;
private final ServicesInjector servicesInjector;
private final AuthenticationManager authenticationManager;
private final AuthorizationManager authorizationManager;
@@ -78,7 +81,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
this.deploymentCategory = deploymentCategory;
this.configuration = servicesInjector.getConfigurationServiceInternal();
- this.specificationLoaderSpi = servicesInjector.getSpecificationLoader();
+ this.specificationLoader = servicesInjector.getSpecificationLoader();
this.authenticationManager = servicesInjector.getAuthenticationManager();
this.authorizationManager = servicesInjector.getAuthorizationManager();
this.persistenceSessionFactory = servicesInjector.lookupServiceElseFail(PersistenceSessionFactory.class);
@@ -86,10 +89,11 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
this.oidMarshaller = new OidMarshaller();
}
+ @Programmatic
public void shutdown() {
persistenceSessionFactory.shutdown();
authenticationManager.shutdown();
- specificationLoaderSpi.shutdown();
+ specificationLoader.shutdown();
}
//endregion
@@ -100,6 +104,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
/**
* Creates and {@link IsisSession#open() open}s the {@link IsisSession}.
*/
+ @Programmatic
public IsisSession openSession(final AuthenticationSession authenticationSession) {
closeSession();
@@ -112,6 +117,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
return session;
}
+ @Programmatic
public void closeSession() {
final IsisSession existingSessionIfAny = getCurrentSession();
if (existingSessionIfAny == null) {
@@ -121,14 +127,75 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
currentSession.set(null);
}
+ @Programmatic
public IsisSession getCurrentSession() {
return currentSession.get();
}
+ @Programmatic
public boolean inSession() {
return getCurrentSession() != null;
}
+ @Programmatic
+ public boolean inTransaction() {
+ if (inSession()) {
+ if (getCurrentSession().getCurrentTransaction() != null) {
+ if (!getCurrentSession().getCurrentTransaction().getState().isComplete()) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+
+ /**
+ * A template method that executes a piece of code in a session.
+ * If there is an open session then it is reused, otherwise a temporary one
+ * is created.
+ *
+ * @param runnable The piece of code to run.
+ */
+ @Programmatic
+ public void doInSession(final Runnable runnable) {
+ doInSession(new Callable<Void>() {
+ @Override
+ public Void call() throws Exception {
+ runnable.run();
+ return null;
+ }
+ });
+ }
+
+ /**
+ * A template method that executes a piece of code in a session.
+ * If there is an open session then it is reused, otherwise a temporary one
+ * is created.
+ *
+ * @param callable The piece of code to run.
+ * @return The result of the code execution.
+ */
+ @Programmatic
+ public <R> R doInSession(final Callable<R> callable) {
+ final IsisSessionFactory sessionFactory = this;
+ boolean noSession = !sessionFactory.inSession();
+ try {
+ if (noSession) {
+ sessionFactory.openSession(new InitialisationSession());
+ }
+
+ return callable.call();
+ } catch (Exception x) {
+ throw new RuntimeException(
+ String.format("An error occurred while executing code in %s session", noSession ? "a temporary" : "a"),
+ x);
+ } finally {
+ if (noSession) {
+ sessionFactory.closeSession();
+ }
+ }
+ }
//endregion
@@ -137,6 +204,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
* The {@link ApplicationScopedComponent application-scoped}
* {@link DeploymentCategory}.
*/
+ @Programmatic
public DeploymentCategory getDeploymentCategory() {
return deploymentCategory;
}
@@ -145,6 +213,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
* The {@link ApplicationScopedComponent application-scoped}
* {@link IsisConfiguration}.
*/
+ @Programmatic
public IsisConfiguration getConfiguration() {
return configuration;
}
@@ -152,6 +221,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
/**
* The {@link ApplicationScopedComponent application-scoped} {@link ServicesInjector}.
*/
+ @Programmatic
public ServicesInjector getServicesInjector() {
return servicesInjector;
}
@@ -161,6 +231,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
*
* @deprecated - use {@link #getServicesInjector()} instead.
*/
+ @Programmatic
@Deprecated
public List<Object> getServices() {
return servicesInjector.getRegisteredServices();
@@ -171,8 +242,9 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
* The {@link ApplicationScopedComponent application-scoped}
* {@link SpecificationLoader}.
*/
+ @Programmatic
public SpecificationLoader getSpecificationLoader() {
- return specificationLoaderSpi;
+ return specificationLoader;
}
/**
@@ -181,6 +253,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
* {@link IsisSession#getAuthenticationSession() within} the
* {@link IsisSession}.
*/
+ @Programmatic
public AuthenticationManager getAuthenticationManager() {
return authenticationManager;
}
@@ -189,6 +262,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
* The {@link AuthorizationManager} that will be used to authorize access to
* domain objects.
*/
+ @Programmatic
public AuthorizationManager getAuthorizationManager() {
return authorizationManager;
}
@@ -198,6 +272,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
* {@link PersistenceSession} {@link IsisSession#getPersistenceSession()
* within} the {@link IsisSession}.
*/
+ @Programmatic
public PersistenceSessionFactory getPersistenceSessionFactory() {
return persistenceSessionFactory;
}
@@ -206,6 +281,7 @@ public class IsisSessionFactory implements ApplicationScopedComponent {
* The {@link OidMarshaller} to use for marshalling and unmarshalling {@link Oid}s
* into strings.
*/
+ @Programmatic
public OidMarshaller getOidMarshaller() {
return oidMarshaller;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
index 36e6e0d..8a6ed29 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
@@ -29,10 +29,8 @@ import org.apache.isis.applib.services.command.CommandContext;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.services.iactn.InteractionContext;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.authentication.MessageBroker;
import org.apache.isis.core.commons.components.SessionScopedComponent;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommand;
import org.apache.isis.core.runtime.system.context.IsisContext;
@@ -43,27 +41,23 @@ public class IsisTransactionManager implements SessionScopedComponent {
private static final Logger LOG = LoggerFactory.getLogger(IsisTransactionManager.class);
- private final PersistenceSession persistenceSession;
-
private int transactionLevel;
-
+
private IsisSession session;
/**
* Holds the current or most recently completed transaction.
*/
- private IsisTransaction transaction;
+ private IsisTransaction currentTransaction;
+ //region > constructor, fields
+
+ private final PersistenceSession persistenceSession;
private final ServicesInjector servicesInjector;
private final CommandContext commandContext;
private final InteractionContext interactionContext;
-
- // ////////////////////////////////////////////////////////////////
- // constructor
- // ////////////////////////////////////////////////////////////////
-
public IsisTransactionManager(
final PersistenceSession persistenceSession,
final ServicesInjector servicesInjector) {
@@ -71,24 +65,25 @@ public class IsisTransactionManager implements SessionScopedComponent {
this.persistenceSession = persistenceSession;
this.servicesInjector = servicesInjector;
- this.commandContext = lookupService(CommandContext.class);
- this.interactionContext = lookupService(InteractionContext.class);
+ this.commandContext = this.servicesInjector.lookupServiceElseFail(CommandContext.class);
+ this.interactionContext = this.servicesInjector.lookupServiceElseFail(InteractionContext.class);
}
public PersistenceSession getPersistenceSession() {
return persistenceSession;
}
- // ////////////////////////////////////////////////////////////////
- // open, close
- // ////////////////////////////////////////////////////////////////
+ //endregion
+
+
+ //region > open, close
public void open() {
assert session != null;
}
public void close() {
- if (getTransaction() != null) {
+ if (getCurrentTransaction() != null) {
try {
abortTransaction();
} catch (final Exception e2) {
@@ -97,36 +92,24 @@ public class IsisTransactionManager implements SessionScopedComponent {
}
session = null;
}
+ //endregion
- // //////////////////////////////////////////////////////
- // current transaction (if any)
- // //////////////////////////////////////////////////////
-
+ //region > current transaction (if any)
/**
* The current transaction, if any.
*/
- public IsisTransaction getTransaction() {
- return transaction;
+ public IsisTransaction getCurrentTransaction() {
+ return currentTransaction;
}
public int getTransactionLevel() {
return transactionLevel;
}
+ //endregion
- /**
- * Convenience method returning the {@link org.apache.isis.core.commons.authentication.MessageBroker} of the
- * {@link #getTransaction() current transaction}.
- */
- protected MessageBroker getMessageBroker() {
- return getTransaction().getMessageBroker();
- }
-
-
- // ////////////////////////////////////////////////////////////////
- // Transactional Execution
- // ////////////////////////////////////////////////////////////////
+ //region > Transactional Execution
/**
* Run the supplied {@link Runnable block of code (closure)} in a
* {@link IsisTransaction transaction}.
@@ -168,7 +151,7 @@ public class IsisTransactionManager implements SessionScopedComponent {
}
} else {
// ensure that this xactn cannot be committed
- getTransaction().setAbortCause(new IsisException(ex));
+ getCurrentTransaction().setAbortCause(new IsisException(ex));
}
throw ex;
}
@@ -211,20 +194,19 @@ public class IsisTransactionManager implements SessionScopedComponent {
abortTransaction();
} else {
// ensure that this xactn cannot be committed (sets state to MUST_ABORT), and capture the cause so can be rendered appropriately by some higher level in the call stack
- getTransaction().setAbortCause(new IsisException(ex));
+ getCurrentTransaction().setAbortCause(new IsisException(ex));
}
throw ex;
}
}
public boolean inTransaction() {
- return getTransaction() != null && !getTransaction().getState().isComplete();
+ return getCurrentTransaction() != null && !getCurrentTransaction().getState().isComplete();
}
+ //endregion
- // //////////////////////////////////////////////////////
- // startTransaction
- // //////////////////////////////////////////////////////
+ //region > startTransaction
public void startTransaction() {
startTransaction(null);
@@ -235,7 +217,7 @@ public class IsisTransactionManager implements SessionScopedComponent {
*/
public void startTransaction(final Command existingCommandIfAny) {
boolean noneInProgress = false;
- if (getTransaction() == null || getTransaction().getState().isComplete()) {
+ if (getCurrentTransaction() == null || getCurrentTransaction().getState().isComplete()) {
noneInProgress = true;
// previously we called __isis_startRequest here on all RequestScopedServices. This is now
@@ -255,7 +237,7 @@ public class IsisTransactionManager implements SessionScopedComponent {
command = commandContext.getCommand();
final UUID transactionId = command.getTransactionId();
- this.transaction = new IsisTransaction(transactionId,
+ this.currentTransaction = new IsisTransaction(transactionId,
interaction.next(Interaction.Sequence.TRANSACTION.id()), servicesInjector);
transactionLevel = 0;
@@ -269,26 +251,24 @@ public class IsisTransactionManager implements SessionScopedComponent {
}
}
- // //////////////////////////////////////////////////////
- // flush
- // //////////////////////////////////////////////////////
+ //endregion
+ //region > flushTransaction
public boolean flushTransaction() {
if (LOG.isDebugEnabled()) {
LOG.debug("flushTransaction");
}
- if (getTransaction() != null) {
- getTransaction().flush();
+ if (getCurrentTransaction() != null) {
+ getCurrentTransaction().flush();
}
return false;
}
- // //////////////////////////////////////////////////////
- // end, abort
- // //////////////////////////////////////////////////////
+ //endregion
+ //region > endTransaction, abortTransaction
/**
* Ends the transaction if nesting level is 0 (but will abort the transaction instead,
* even if nesting level is not 0, if an {@link IsisTransaction#getAbortCause() abort cause}
@@ -307,14 +287,14 @@ public class IsisTransactionManager implements SessionScopedComponent {
LOG.debug("endTransaction: level " + (transactionLevel) + "->" + (transactionLevel - 1));
}
- final IsisTransaction transaction = getTransaction();
+ final IsisTransaction transaction = getCurrentTransaction();
if (transaction == null || transaction.getState().isComplete()) {
// allow this method to be called >1 with no adverse affects
return;
}
// terminate the transaction early if an abort cause was already set.
- RuntimeException abortCause = this.getTransaction().getAbortCause();
+ RuntimeException abortCause = this.getCurrentTransaction().getAbortCause();
if(transaction.getState().mustAbort()) {
if (LOG.isDebugEnabled()) {
@@ -324,7 +304,7 @@ public class IsisTransactionManager implements SessionScopedComponent {
abortTransaction();
// just in case any different exception was raised...
- abortCause = this.getTransaction().getAbortCause();
+ abortCause = this.getCurrentTransaction().getAbortCause();
} catch(RuntimeException ex) {
// ... or, capture this most recent exception
@@ -358,7 +338,7 @@ public class IsisTransactionManager implements SessionScopedComponent {
}
try {
- getTransaction().preCommit();
+ getCurrentTransaction().preCommit();
} catch(RuntimeException ex) {
// just in case any new exception was raised...
abortCause = ex;
@@ -375,13 +355,13 @@ public class IsisTransactionManager implements SessionScopedComponent {
// hacky... moving the transaction back to something other than COMMITTED
transactionLevel = 1; // because the transactionLevel was decremented earlier
- getTransaction().setAbortCause(new IsisTransactionManagerException(ex));
+ getCurrentTransaction().setAbortCause(new IsisTransactionManagerException(ex));
}
}
if(abortCause == null) {
try {
- getTransaction().commit();
+ getCurrentTransaction().commit();
} catch(RuntimeException ex) {
// just in case any new exception was raised...
abortCause = ex;
@@ -418,74 +398,29 @@ public class IsisTransactionManager implements SessionScopedComponent {
public void abortTransaction() {
- if (getTransaction() != null) {
- getTransaction().markAsAborted();
+ if (getCurrentTransaction() != null) {
+ getCurrentTransaction().markAsAborted();
transactionLevel = 0;
persistenceSession.abortTransaction();
}
}
- public void addCommand(final PersistenceCommand command) {
- getTransaction().addCommand(command);
- }
-
-
- ////////////////////////////////////////////////////////////////////////
- // Dependencies (lookup)
- ////////////////////////////////////////////////////////////////////////
-
- private <T> T lookupService(Class<T> serviceType) {
- T service = lookupServiceIfAny(serviceType);
- if(service == null) {
- throw new IllegalStateException("Could not locate service of type '" + serviceType + "'");
- }
- return service;
- }
-
- /**
- * @return - the service, or <tt>null</tt> if no service registered of specified type.
- */
- private <T> T lookupServiceIfAny(Class<T> serviceType) {
- return servicesInjector.lookupService(serviceType);
- }
-
-
- // ////////////////////////////////////////////////////////////////
- // Dependencies (injected)
- // ////////////////////////////////////////////////////////////////
+ //endregion
- /**
- * The owning {@link IsisSession}.
- *
- * <p>
- * Will be non-<tt>null</tt> when {@link #open() open}ed, but <tt>null</tt>
- * if {@link #close() close}d .
- */
- public IsisSession getSession() {
- return session;
+ //region > addCommand
+ public void addCommand(final PersistenceCommand command) {
+ getCurrentTransaction().addCommand(command);
}
- /**
- * Should be injected prior to {@link #open() opening}
- */
- public void setSession(final IsisSession session) {
- this.session = session;
- }
+ //endregion
-
- // ////////////////////////////////////////////////////////////////
- // Dependencies (from context)
- // ////////////////////////////////////////////////////////////////
/**
* Called back by {@link IsisTransaction}.
*/
protected AuthenticationSession getAuthenticationSession() {
- return IsisContext.getAuthenticationSession();
+ return servicesInjector.getAuthenticationSession();
}
- protected OidMarshaller getOidMarshaller() {
- return IsisContext.getOidMarshaller();
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java
index 9e1e640..516ce99 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java
@@ -45,8 +45,7 @@ import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.commons.lang.StringExtensions;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.session.IsisSession;
-import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.webapp.auth.AuthenticationSessionStrategy;
import org.apache.isis.core.webapp.auth.AuthenticationSessionStrategyDefault;
import org.apache.isis.core.webapp.content.ResourceCachingFilter;
@@ -312,6 +311,7 @@ public class IsisSessionFilter implements Filter {
final HttpServletRequest httpServletRequest = (HttpServletRequest) request;
final HttpServletResponse httpServletResponse = (HttpServletResponse) response;
+ final IsisSessionFactory sessionFactory = getSessionFactory();
try {
final String queryString = httpServletRequest.getQueryString();
if (queryString != null && queryString.contains(QUERY_STRING_FORCE_LOGOUT)) {
@@ -337,7 +337,7 @@ public class IsisSessionFilter implements Filter {
if (authSession != null) {
authSessionStrategy.bind(httpServletRequest, httpServletResponse, authSession);
- openSession(authSession); // is closed in the finally block
+ sessionFactory.openSession(authSession);
chain.doFilter(request, response);
return;
}
@@ -355,7 +355,7 @@ public class IsisSessionFilter implements Filter {
}
} finally {
- closeSession();
+ sessionFactory.closeSession();
}
}
@@ -388,17 +388,9 @@ public class IsisSessionFilter implements Filter {
return false;
}
- protected IsisTransactionManager getTransactionManager() {
- return IsisContext.getTransactionManager();
+ // REVIEW: it ought to be possible to remove this static lookup by binding the IsisSystem or IsisSessionFactory to the thread in an earlier filter
+ private IsisSessionFactory getSessionFactory() {
+ return IsisContext.getSessionFactory();
}
- private IsisSession openSession(final AuthenticationSession authSession) {
- return IsisContext.openSession(authSession);
- }
-
- private void closeSession() {
- IsisContext.closeSession();
- }
-
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
index 00b623a..b6c2b82 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
@@ -90,8 +90,10 @@ public class IsisWebAppBootstrapper implements ServletContextListener {
isisConfigurationBuilder.add(WebAppConstants.WEB_APP_DIR, webappDir);
final IsisConfigurationDefault isisConfiguration = isisConfigurationBuilder.getConfiguration();
+ final DeploymentCategory deploymentCategory = deploymentType.getDeploymentCategory();
+ final IsisInjectModule isisModule = new IsisInjectModule(deploymentCategory, isisConfiguration);
+ this.injector = Guice.createInjector(isisModule);
- injector = createGuiceInjector(isisConfiguration, deploymentType.getDeploymentCategory());
final IsisSystem system = injector.getInstance(IsisSystem.class);
servletContext.setAttribute(WebAppConstants.ISIS_SYSTEM_KEY, system);
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
index 3bb047e..58a8536 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
@@ -115,7 +115,7 @@ public class AuthenticationSessionStrategyDefault extends AuthenticationSessionS
// //////////////////////////////////////////////////////////
protected AuthenticationManager getAuthenticationManager() {
- return IsisContext.getAuthenticationManager();
+ return IsisContext.getSessionFactory().getAuthenticationManager();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
index 88e77af..1a5949a 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
@@ -215,6 +215,6 @@ public class JDOStateManagerForIsis extends ReferentialStateManagerImpl {
}
protected ServicesInjector getServicesInjector() {
- return IsisContext.getPersistenceSession().getServicesInjector();
+ return IsisContext.getSessionFactory().getServicesInjector();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
index b634cf2..6a7bfc3 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
@@ -217,6 +217,6 @@ public final class JdoObjectIdSerializer {
}
private static SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSpecificationLoader();
+ return IsisContext.getSessionFactory().getSpecificationLoader();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
index 1ff10a5..e1e9d57 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/service/support/IsisJdoSupportImpl.java
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
+import javax.inject.Inject;
import javax.jdo.Extent;
import javax.jdo.PersistenceManager;
import javax.jdo.datastore.JDOConnection;
@@ -49,6 +50,7 @@ import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
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;
import org.apache.isis.objectstore.jdo.applib.service.support.IsisJdoSupport;
@@ -192,8 +194,11 @@ public class IsisJdoSupportImpl implements IsisJdoSupport {
// //////////////////////////////////////
+ @Inject
+ IsisSessionFactory isisSessionFactory;
+
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
protected ServicesInjector getServicesInjector() {
[43/50] [abbrv] isis git commit: ISIS-1441: removes
AuthenticationManagerStandardForDfltRuntime,
instead use AuthenticationManagerStandard.
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/security/src/main/java/org/apache/isis/core/security/authorization/AuthorizorBypass.java
----------------------------------------------------------------------
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authorization/AuthorizorBypass.java b/core/security/src/main/java/org/apache/isis/core/security/authorization/AuthorizorBypass.java
index 011415c..6a73ce4 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authorization/AuthorizorBypass.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authorization/AuthorizorBypass.java
@@ -20,12 +20,13 @@
package org.apache.isis.core.security.authorization;
import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.authorization.standard.Authorizor;
public class AuthorizorBypass implements Authorizor {
@Override
- public void init() {
+ public void init(final DeploymentCategory deploymentCategory) {
// does nothing
}
http://git-wip-us.apache.org/repos/asf/isis/blob/364e5b9b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
index 17c4b54..32f7c41 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/UserResourceServerside.java
@@ -26,6 +26,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.webapp.IsisSessionFilter;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
@@ -79,7 +80,10 @@ public class UserResourceServerside extends ResourceAbstract implements UserReso
renderer.includesSelf();
// we do the logout (removes this session from those valid)
- getAuthenticationManager().closeSession(getResourceContext().getAuthenticationSession());
+ final AuthenticationSession authenticationSession = getResourceContext().getAuthenticationSession();
+ getAuthenticationManager().closeSession(authenticationSession);
+
+ getIsisSessionFactory().closeSession();
// we also redirect to home page with special query string; this allows the session filter
// to clear out any cookies/headers (eg if BASIC auth in use).
[42/50] [abbrv] isis git commit: ISIS-1407: ensures that internal
domain services (not annotated with @DomainService) are also loaded into the
metamodel as service specifications.
Posted by da...@apache.org.
ISIS-1407: ensures that internal domain services (not annotated with @DomainService) are also loaded into the metamodel as service specifications.
ie markAsService toggled on. This then means that the code to invoke markAsService() whenever any PersistenceSession is opened can be removed.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/29f1e083
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/29f1e083
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/29f1e083
Branch: refs/heads/master
Commit: 29f1e0839c6a8e7322a2554b5bd611f6254b788e
Parents: e2e206c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 15 16:42:46 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 15 16:42:46 2016 +0100
----------------------------------------------------------------------
.../isis/core/metamodel/specloader/SpecificationLoader.java | 8 +++-----
.../core/runtime/system/persistence/PersistenceSession.java | 5 -----
2 files changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/29f1e083/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
index 5f487e3..ebd988e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/SpecificationLoader.java
@@ -156,11 +156,9 @@ public class SpecificationLoader implements ApplicationScopedComponent {
private void loadSpecificationsForServices() {
for (final Class<?> serviceClass : allServiceClasses()) {
final DomainService domainService = serviceClass.getAnnotation(DomainService.class);
- if(domainService != null) {
- if(domainService.nature() == NatureOfService.VIEW || domainService.nature() == NatureOfService.VIEW_CONTRIBUTIONS_ONLY) {
- internalLoadSpecification(serviceClass, domainService.nature());
- }
- }
+ final NatureOfService nature = domainService != null ? domainService.nature() : NatureOfService.DOMAIN;
+ // will 'markAsService'
+ internalLoadSpecification(serviceClass, nature);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/29f1e083/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 14073cc..5c4d1a0 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
@@ -370,12 +370,7 @@ public class PersistenceSession implements
*/
private void initServices() {
final List<Object> registeredServices = servicesInjector.getRegisteredServices();
-
for (final Object service : registeredServices) {
- final ObjectSpecification serviceSpecification =
- specificationLoader.loadSpecification(service.getClass());
- serviceSpecification.markAsService();
-
final ObjectAdapter serviceAdapter = adapterFor(service);
remapAsPersistentIfRequired(serviceAdapter);
}
[14/50] [abbrv] isis git commit: ISIS-1427: simplifying IsisContext
and minimizing calls to it; also removed Localization (unused)
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
index 1d0c5d7..db02bc4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datejodalocal/JodaLocalDateValueSemanticsProvider.java
@@ -20,12 +20,12 @@
package org.apache.isis.core.metamodel.facets.value.datejodalocal;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.joda.time.LocalDate;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
@@ -33,12 +33,12 @@ import org.joda.time.format.DateTimeFormatter;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.EncodingException;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
public class JodaLocalDateValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<LocalDate> implements JodaLocalDateValueFacet {
@@ -168,7 +168,9 @@ public class JodaLocalDateValueSemanticsProvider extends ValueSemanticsProviderA
// //////////////////////////////////////////////////////////////////
@Override
- protected LocalDate doParse(final Object context, final String entry, final Localization localization) {
+ protected LocalDate doParse(
+ final String entry,
+ final Object context) {
updateTitleStringFormatterIfOverridden();
@@ -180,7 +182,7 @@ public class JodaLocalDateValueSemanticsProvider extends ValueSemanticsProviderA
} else if (dateString.startsWith("-") && contextDate != null) {
return JodaLocalDateUtil.relativeDate(contextDate, dateString, false);
} else {
- return parseDate(dateString, contextDate, localization);
+ return parseDate(dateString, contextDate);
}
}
@@ -195,8 +197,8 @@ public class JodaLocalDateValueSemanticsProvider extends ValueSemanticsProviderA
updateTitleStringFormatter(overridePattern);
}
- private LocalDate parseDate(final String dateStr, final Object original, final Localization localization) {
- return JodaLocalDateUtil.parseDate(dateStr, localization, PARSE_FORMATTERS);
+ private LocalDate parseDate(final String dateStr, final Object original) {
+ return JodaLocalDateUtil.parseDate(dateStr, PARSE_FORMATTERS);
}
@@ -205,15 +207,12 @@ public class JodaLocalDateValueSemanticsProvider extends ValueSemanticsProviderA
// ///////////////////////////////////////////////////////////////////////////
@Override
- public String titleString(final Object value, final Localization localization) {
+ public String titleString(final Object value) {
if (value == null) {
return null;
}
final LocalDate date = (LocalDate) value;
- DateTimeFormatter f = titleStringFormatter;
- if (localization != null) {
- f = titleStringFormatter.withLocale(localization.getLocale());
- }
+ DateTimeFormatter f = titleStringFormatter.withLocale(Locale.getDefault());
return JodaLocalDateUtil.titleString(f, date);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
index 00b73da..4e7dc0e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejoda/JodaDateTimeValueSemanticsProviderAbstract.java
@@ -28,11 +28,8 @@ import java.util.Map;
import com.google.common.collect.Maps;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
import org.apache.isis.core.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
@@ -93,16 +90,20 @@ public abstract class JodaDateTimeValueSemanticsProviderAbstract<T> extends Valu
}
@Override
- protected DateFormat format(final Localization localization) {
- final DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM, localization.getLocale());
+ protected DateFormat format() {
+ final Locale locale = Locale.getDefault();
+
+ final DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.MEDIUM, locale);
dateFormat.setTimeZone(UTC_TIME_ZONE);
return dateFormat;
}
- protected List<DateFormat> formatsToTry(Localization localization) {
+ protected List<DateFormat> formatsToTry() {
+
+ final Locale locale = Locale.getDefault();
+
List<DateFormat> formats = new ArrayList<>();
- Locale locale = localization == null ? Locale.getDefault() : localization.getLocale();
formats.add(DateFormat.getDateInstance(DateFormat.LONG, locale));
formats.add(DateFormat.getDateInstance(DateFormat.MEDIUM, locale));
formats.add(DateFormat.getDateInstance(DateFormat.SHORT, locale));
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeUtil.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeUtil.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeUtil.java
index a5dedc1..4982275 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeUtil.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeUtil.java
@@ -20,6 +20,7 @@
package org.apache.isis.core.metamodel.facets.value.datetimejodalocal;
import java.util.List;
+import java.util.Locale;
import java.util.StringTokenizer;
import com.google.common.collect.Iterables;
@@ -27,7 +28,6 @@ import com.google.common.collect.Iterables;
import org.joda.time.LocalDateTime;
import org.joda.time.format.DateTimeFormatter;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.JodaFunctions;
@@ -35,8 +35,12 @@ public final class JodaLocalDateTimeUtil {
private JodaLocalDateTimeUtil(){}
- static LocalDateTime parseDate(final String dateStr, final Localization localization, List<DateTimeFormatter> parseFormatters) {
- Iterable<DateTimeFormatter> elements = Iterables.transform(parseFormatters, JodaFunctions.withLocale(localization));
+ static LocalDateTime parseDate(
+ final String dateStr,
+ List<DateTimeFormatter> parseFormatters) {
+ final Locale locale = Locale.getDefault();
+
+ Iterable<DateTimeFormatter> elements = Iterables.transform(parseFormatters, JodaFunctions.withLocale(locale));
return parseDateTime(dateStr, elements);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
index 33ce3ee..4c84b75 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProvider.java
@@ -20,12 +20,12 @@
package org.apache.isis.core.metamodel.facets.value.datetimejodalocal;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.joda.time.LocalDateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
@@ -34,12 +34,12 @@ import org.joda.time.format.ISODateTimeFormat;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.EncodingException;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
public class JodaLocalDateTimeValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbstract<LocalDateTime> implements JodaLocalDateTimeValueFacet {
@@ -169,7 +169,9 @@ public class JodaLocalDateTimeValueSemanticsProvider extends ValueSemanticsProvi
// //////////////////////////////////////////////////////////////////
@Override
- protected LocalDateTime doParse(final Object context, final String entry, final Localization localization) {
+ protected LocalDateTime doParse(
+ final String entry,
+ final Object context) {
updateTitleStringFormatterIfOverridden();
@@ -181,7 +183,7 @@ public class JodaLocalDateTimeValueSemanticsProvider extends ValueSemanticsProvi
} else if (dateString.startsWith("-") && contextDateTime != null) {
return JodaLocalDateTimeUtil.relativeDateTime(contextDateTime, dateString, false);
} else {
- return parseDateTime(dateString, contextDateTime, localization);
+ return parseDateTime(dateString, contextDateTime);
}
}
@@ -196,8 +198,8 @@ public class JodaLocalDateTimeValueSemanticsProvider extends ValueSemanticsProvi
updateTitleStringFormatter(overridePattern);
}
- private LocalDateTime parseDateTime(final String dateStr, final Object original, final Localization localization) {
- return JodaLocalDateTimeUtil.parseDate(dateStr, localization, PARSE_FORMATTERS);
+ private LocalDateTime parseDateTime(final String dateStr, final Object original) {
+ return JodaLocalDateTimeUtil.parseDate(dateStr, PARSE_FORMATTERS);
}
@@ -206,15 +208,12 @@ public class JodaLocalDateTimeValueSemanticsProvider extends ValueSemanticsProvi
// ///////////////////////////////////////////////////////////////////////////
@Override
- public String titleString(final Object value, final Localization localization) {
+ public String titleString(final Object value) {
if (value == null) {
return null;
}
final LocalDateTime dateTime = (LocalDateTime) value;
- DateTimeFormatter f = titleStringFormatter;
- if (localization != null) {
- f = titleStringFormatter.withLocale(localization.getLocale());
- }
+ final DateTimeFormatter f = titleStringFormatter.withLocale(Locale.getDefault());
return JodaLocalDateTimeUtil.titleString(f, dateTime);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/doubles/DoubleValueSemanticsProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/doubles/DoubleValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/doubles/DoubleValueSemanticsProviderAbstract.java
index 4e0507b..b9de5aa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/doubles/DoubleValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/doubles/DoubleValueSemanticsProviderAbstract.java
@@ -23,8 +23,6 @@ import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.text.ParseException;
-import org.apache.isis.applib.profiles.Localization;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -68,7 +66,7 @@ public abstract class DoubleValueSemanticsProviderAbstract extends ValueSemantic
// ///////////////////////////////////////////////////////////////////////////
@Override
- public String titleString(final Object value, final Localization localization) {
+ public String titleString(final Object value) {
return titleString(format, value);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java
index a8f1a2d..995df1d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java
@@ -23,8 +23,6 @@ import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.text.ParseException;
-import org.apache.isis.applib.profiles.Localization;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -64,7 +62,7 @@ public class FloatValueSemanticsProviderAbstract extends ValueSemanticsProviderA
}
@Override
- public String titleString(final Object value, final Localization localization) {
+ public String titleString(final Object value) {
return titleString(format, value);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java
index cf93408..89c822d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/image/ImageValueSemanticsProviderAbstract.java
@@ -26,8 +26,6 @@ import java.awt.image.MemoryImageSource;
import java.awt.image.PixelGrabber;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.applib.profiles.Localization;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -270,7 +268,7 @@ public abstract class ImageValueSemanticsProviderAbstract<T> extends ValueSemant
}
@Override
- public String titleString(final Object value, final Localization localization) {
+ public String titleString(final Object value) {
return "image";
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/integer/IntValueSemanticsProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/integer/IntValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/integer/IntValueSemanticsProviderAbstract.java
index 3d4fe1e..caacc9c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/integer/IntValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/integer/IntValueSemanticsProviderAbstract.java
@@ -23,8 +23,6 @@ import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.text.ParseException;
-import org.apache.isis.applib.profiles.Localization;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -64,7 +62,7 @@ public abstract class IntValueSemanticsProviderAbstract extends ValueSemanticsPr
}
@Override
- public String titleString(final Object value, final Localization localization) {
+ public String titleString(final Object value) {
return titleString(format, value);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/longs/LongValueSemanticsProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/longs/LongValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/longs/LongValueSemanticsProviderAbstract.java
index 30721d9..49da38e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/longs/LongValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/longs/LongValueSemanticsProviderAbstract.java
@@ -23,8 +23,6 @@ import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.text.ParseException;
-import org.apache.isis.applib.profiles.Localization;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -64,7 +62,7 @@ public abstract class LongValueSemanticsProviderAbstract extends ValueSemanticsP
}
@Override
- public String titleString(final Object value, final Localization localization) {
+ public String titleString(final Object value) {
return titleString(format, value);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/money/MoneyValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
index caba46c..0b03e67 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
@@ -26,7 +26,6 @@ import java.util.Currency;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.value.Money;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -146,7 +145,7 @@ public class MoneyValueSemanticsProvider extends ValueSemanticsProviderAndFacetA
}
@Override
- public String titleString(final Object object, final Localization localization) {
+ public String titleString(final Object object) {
if (object == null) {
return "";
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/password/PasswordValueSemanticsProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/password/PasswordValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/password/PasswordValueSemanticsProvider.java
index 530494c..1eedcdc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/password/PasswordValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/password/PasswordValueSemanticsProvider.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.value.password;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.value.Password;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
@@ -62,13 +61,13 @@ public class PasswordValueSemanticsProvider extends ValueSemanticsProviderAndFac
}
@Override
- public String titleString(final Object object, final Localization localization) {
+ public String titleString(final Object object) {
return object == null ? "" : password(object).toString();
}
@Override
public String titleStringWithMask(final Object object, final String usingMask) {
- return titleString(object, null);
+ return titleString(object);
}
// //////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
index f859d86..98adff9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/percentage/PercentageValueSemanticsProvider.java
@@ -25,7 +25,6 @@ import java.text.ParseException;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.value.Percentage;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -92,7 +91,7 @@ public class PercentageValueSemanticsProvider extends ValueSemanticsProviderAndF
}
@Override
- public String titleString(final Object value, final Localization localization) {
+ public String titleString(final Object value) {
return titleString(format, value);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java
index 09683e8..c09e0e7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/shortint/ShortValueSemanticsProviderAbstract.java
@@ -23,8 +23,6 @@ import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.text.ParseException;
-import org.apache.isis.applib.profiles.Localization;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -64,7 +62,7 @@ public class ShortValueSemanticsProviderAbstract extends ValueSemanticsProviderA
}
@Override
- public String titleString(final Object value, final Localization localization) {
+ public String titleString(final Object value) {
return titleString(format, value);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/string/StringValueSemanticsProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/string/StringValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/string/StringValueSemanticsProvider.java
index e78acb6..32b92ec 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/string/StringValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/string/StringValueSemanticsProvider.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.facets.value.string;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -63,14 +62,14 @@ public class StringValueSemanticsProvider extends ValueSemanticsProviderAndFacet
}
@Override
- public String titleString(final Object object, final Localization localization) {
+ public String titleString(final Object object) {
final String string = (String) (object == null ? "" : object);
return string;
}
@Override
public String titleStringWithMask(final Object object, final String usingMask) {
- return titleString(object, null);
+ return titleString(object);
}
// //////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/time/TimeValueSemanticsProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/time/TimeValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/time/TimeValueSemanticsProviderAbstract.java
index 7e5c001..22f1f14 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/time/TimeValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/time/TimeValueSemanticsProviderAbstract.java
@@ -26,11 +26,8 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
import org.apache.isis.core.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
@@ -82,17 +79,20 @@ public abstract class TimeValueSemanticsProviderAbstract<T> extends ValueSemanti
}
@Override
- protected DateFormat format(final Localization localization) {
- final DateFormat dateFormat = DateFormat.getTimeInstance(DateFormat.SHORT, localization.getLocale());
+ protected DateFormat format() {
+
+ final Locale locale = Locale.getDefault();
+ final DateFormat dateFormat = DateFormat.getTimeInstance(DateFormat.SHORT, locale);
dateFormat.setTimeZone(UTC_TIME_ZONE);
return dateFormat;
}
- protected List<DateFormat> formatsToTry(Localization localization) {
- List<DateFormat> formats = new ArrayList<DateFormat>();
-
- Locale locale = localization == null ? Locale.getDefault() : localization.getLocale();
- formats.add(DateFormat.getTimeInstance(DateFormat.LONG, locale));
+ protected List<DateFormat> formatsToTry() {
+ List<DateFormat> formats = new ArrayList<DateFormat>();
+
+ final Locale locale = Locale.getDefault();
+
+ formats.add(DateFormat.getTimeInstance(DateFormat.LONG, locale));
formats.add(DateFormat.getTimeInstance(DateFormat.MEDIUM, locale));
formats.add(DateFormat.getTimeInstance(DateFormat.SHORT, locale));
formats.add(createDateFormat("HH:mm:ss.SSS"));
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestamp/TimeStampValueSemanticsProviderAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestamp/TimeStampValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestamp/TimeStampValueSemanticsProviderAbstract.java
index 0ac98f6..f285b6e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestamp/TimeStampValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/timestamp/TimeStampValueSemanticsProviderAbstract.java
@@ -23,14 +23,13 @@ import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
+import java.util.TimeZone;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.value.TimeStamp;
import org.apache.isis.core.commons.config.ConfigurationConstants;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-
import org.apache.isis.core.metamodel.facets.value.ValueSemanticsProviderAbstractTemporal;
import org.apache.isis.core.metamodel.services.ServicesInjector;
@@ -76,21 +75,29 @@ public abstract class TimeStampValueSemanticsProviderAbstract<T> extends ValueSe
}
@Override
- protected DateFormat format(final Localization localization) {
- final DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.LONG, localization.getLocale());
- dateFormat.setTimeZone(localization.getTimeZone());
+ protected DateFormat format() {
+
+ final Locale locale = Locale.getDefault();
+ final TimeZone timeZone = TimeZone.getDefault();
+
+ final DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.LONG, locale);
+ dateFormat.setTimeZone(timeZone);
+
return dateFormat;
}
- protected List<DateFormat> formatsToTry(Localization localization) {
- List<DateFormat> formats = new ArrayList<DateFormat>();
+ protected List<DateFormat> formatsToTry() {
+ final List<DateFormat> formats = new ArrayList<DateFormat>();
+
+ final Locale locale = Locale.getDefault();
+ final TimeZone timeZone = TimeZone.getDefault();
- formats.add(DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.LONG, localization.getLocale()));
- formats.add(DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.LONG, localization.getLocale()));
+ formats.add(DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.LONG, locale));
+ formats.add(DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.LONG, locale));
formats.add(createDateFormat("yyyy-MM-dd HH:mm:ss.SSS"));
- for (DateFormat format : formats) {
- format.setTimeZone(localization.getTimeZone());
+ for (final DateFormat format : formats) {
+ format.setTimeZone(timeZone);
}
return formats;
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/url/URLValueSemanticsProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/url/URLValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/url/URLValueSemanticsProvider.java
index 2a30fa6..88710dc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/url/URLValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/url/URLValueSemanticsProvider.java
@@ -23,7 +23,6 @@ import java.net.MalformedURLException;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -74,13 +73,13 @@ public class URLValueSemanticsProvider extends ValueSemanticsProviderAndFacetAbs
}
@Override
- public String titleString(final Object object, final Localization localization) {
+ public String titleString(final Object object) {
return object != null? object.toString(): "";
}
@Override
public String titleStringWithMask(final Object object, final String usingMask) {
- return titleString(object, null);
+ return titleString(object);
}
// //////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/uuid/UUIDValueSemanticsProvider.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/uuid/UUIDValueSemanticsProvider.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/uuid/UUIDValueSemanticsProvider.java
index 55db0de..b15f280 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/uuid/UUIDValueSemanticsProvider.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/uuid/UUIDValueSemanticsProvider.java
@@ -23,7 +23,6 @@ import java.util.UUID;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
@@ -67,13 +66,13 @@ public class UUIDValueSemanticsProvider extends ValueSemanticsProviderAndFacetAb
}
@Override
- public String titleString(final Object object, final Localization localization) {
+ public String titleString(final Object object) {
return object == null ? "" : object.toString();
}
@Override
public String titleStringWithMask(final Object object, final String usingMask) {
- return titleString(object, null);
+ return titleString(object);
}
// //////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/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 01b223d..dce4cbe 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
@@ -49,6 +49,7 @@ 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;
@@ -514,7 +515,7 @@ public class ServicesInjector implements ApplicationScopedComponent {
public AuthenticationManager getAuthenticationManager() {
return authenticationManager != null
? authenticationManager
- : (authenticationManager = lookupService(AuthenticationManager.class));
+ : (authenticationManager = lookupServiceElseFail(AuthenticationManager.class));
}
private AuthorizationManager authorizationManager;
@@ -523,7 +524,7 @@ public class ServicesInjector implements ApplicationScopedComponent {
public AuthorizationManager getAuthorizationManager() {
return authorizationManager != null
? authorizationManager
- : (authorizationManager = lookupService(AuthorizationManager.class));
+ : (authorizationManager = lookupServiceElseFail(AuthorizationManager.class));
}
private SpecificationLoader specificationLoader;
@@ -532,7 +533,7 @@ public class ServicesInjector implements ApplicationScopedComponent {
public SpecificationLoader getSpecificationLoader() {
return specificationLoader != null
? specificationLoader
- : (specificationLoader = lookupService(SpecificationLoader.class));
+ : (specificationLoader = lookupServiceElseFail(SpecificationLoader.class));
}
private DeploymentCategoryProvider deploymentCategoryProvider;
@@ -540,7 +541,7 @@ public class ServicesInjector implements ApplicationScopedComponent {
public DeploymentCategoryProvider getDeploymentCategoryProvider() {
return deploymentCategoryProvider != null
? deploymentCategoryProvider
- : (deploymentCategoryProvider = lookupService(DeploymentCategoryProvider.class));
+ : (deploymentCategoryProvider = lookupServiceElseFail(DeploymentCategoryProvider.class));
}
private AuthenticationSessionProvider authenticationSessionProvider;
@@ -548,7 +549,7 @@ public class ServicesInjector implements ApplicationScopedComponent {
public AuthenticationSessionProvider getAuthenticationSessionProvider() {
return authenticationSessionProvider != null
? authenticationSessionProvider
- : (authenticationSessionProvider = lookupService(AuthenticationSessionProvider.class));
+ : (authenticationSessionProvider = lookupServiceElseFail(AuthenticationSessionProvider.class));
}
private PersistenceSessionServiceInternal persistenceSessionServiceInternal;
@@ -556,7 +557,7 @@ public class ServicesInjector implements ApplicationScopedComponent {
public PersistenceSessionServiceInternal getPersistenceSessionServiceInternal() {
return persistenceSessionServiceInternal != null
? persistenceSessionServiceInternal
- : (persistenceSessionServiceInternal = lookupService(PersistenceSessionServiceInternal.class));
+ : (persistenceSessionServiceInternal = lookupServiceElseFail(PersistenceSessionServiceInternal.class));
}
private ConfigurationServiceInternal configurationServiceInternal;
@@ -564,9 +565,19 @@ public class ServicesInjector implements ApplicationScopedComponent {
public ConfigurationServiceInternal getConfigurationServiceInternal() {
return configurationServiceInternal != null
? configurationServiceInternal
- : (configurationServiceInternal = lookupService(ConfigurationServiceInternal.class));
+ : (configurationServiceInternal = lookupServiceElseFail(ConfigurationServiceInternal.class));
}
+ private OidMarshaller oidMarshaller;
+
+ @Programmatic
+ public OidMarshaller getOidMarshaller() {
+ return oidMarshaller != null
+ ? oidMarshaller
+ : (oidMarshaller = lookupServiceElseFail(OidMarshaller.class));
+ }
+
+
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/l10n/LocalizationDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/l10n/LocalizationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/l10n/LocalizationDefault.java
deleted file mode 100644
index 018103b..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/l10n/LocalizationDefault.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.metamodel.services.l10n;
-
-import java.util.Locale;
-import java.util.TimeZone;
-
-import org.apache.isis.applib.profiles.Localization;
-
-public final class LocalizationDefault implements Localization {
-
- @Override
- public Locale getLocale() {
- return Locale.getDefault();
- }
-
- @Override
- public TimeZone getTimeZone() {
- return TimeZone.getDefault();
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/l10n/LocalizationProviderInternal.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/l10n/LocalizationProviderInternal.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/l10n/LocalizationProviderInternal.java
deleted file mode 100644
index f35632e..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/l10n/LocalizationProviderInternal.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.metamodel.services.l10n;
-
-import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.applib.profiles.Localization;
-
-public interface LocalizationProviderInternal {
-
- @Programmatic
- Localization getLocalization();
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/l10n/LocalizationProviderInternalNoop.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/l10n/LocalizationProviderInternalNoop.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/l10n/LocalizationProviderInternalNoop.java
deleted file mode 100644
index 39e5c69..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/l10n/LocalizationProviderInternalNoop.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.isis.core.metamodel.services.l10n;
-
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.profiles.Localization;
-
-@DomainService(nature = NatureOfService.DOMAIN)
-public class LocalizationProviderInternalNoop implements LocalizationProviderInternal {
-
- private final Localization defaultLocalization = new LocalizationDefault();
-
- @Override
- public Localization getLocalization() {
- return defaultLocalization;
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
index 95b58af..e80abd3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
@@ -27,7 +27,6 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.services.l10n.LocalizationProviderInternal;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
@DomainService(
@@ -41,7 +40,7 @@ public class TitleServiceDefault implements TitleService {
final ObjectAdapter objectAdapter = adapterManager.adapterFor(unwrapped(domainObject));
final boolean destroyed = objectAdapter.isDestroyed();
if(!destroyed) {
- return objectAdapter.getSpecification().getTitle(objectAdapter, localizationProviderInternal.getLocalization());
+ return objectAdapter.getSpecification().getTitle(objectAdapter);
} else {
return "[DELETED]";
}
@@ -69,9 +68,6 @@ public class TitleServiceDefault implements TitleService {
PersistenceSessionServiceInternal adapterManager;
@javax.inject.Inject
- LocalizationProviderInternal localizationProviderInternal;
-
- @javax.inject.Inject
WrapperFactory wrapperFactory;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/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 7ad59bf..ec1b856 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
@@ -26,7 +26,6 @@ import java.util.List;
import com.google.common.base.Function;
import org.apache.isis.applib.annotation.ObjectType;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
@@ -167,19 +166,19 @@ public interface ObjectSpecification extends Specification, ObjectActionContaine
* Corresponds to the {@link TitleFacet#value()) value} of
* {@link TitleFacet}; is not necessarily immutable.
*
- * @deprecated use {@link #getTitle(ObjectAdapter, ObjectAdapter, Localization)}
+ * @deprecated use {@link #getTitle(ObjectAdapter, ObjectAdapter)}
*/
@Deprecated
- String getTitle(ObjectAdapter adapter, Localization localization);
+ String getTitle(ObjectAdapter adapter);
/**
* Returns the title to display of target adapter, rendered within the context
* of some other adapter (if any).
*
* <p>
- * @see TitleFacet#title(ObjectAdapter, ObjectAdapter, org.apache.isis.applib.profiles.Localization)
+ * @see TitleFacet#title(ObjectAdapter, ObjectAdapter)
*/
- String getTitle(ObjectAdapter contextAdapterIfAny, ObjectAdapter targetAdapter, Localization localization);
+ String getTitle(ObjectAdapter contextAdapterIfAny, ObjectAdapter targetAdapter);
/**
* Returns the name of an icon to use for the specified object.
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
index 5c722fc..0ddbec1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectActionParameter.java
@@ -22,7 +22,6 @@ package org.apache.isis.core.metamodel.spec.feature;
import com.google.common.base.Function;
import org.apache.isis.applib.filter.Filter;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
@@ -124,8 +123,7 @@ public interface ObjectActionParameter extends ObjectFeature, CurrentHolder {
String isValid(
final ObjectAdapter adapter,
final Object proposedValue,
- final InteractionInitiatedBy interactionInitiatedBy,
- final Localization localization);
+ final InteractionInitiatedBy interactionInitiatedBy);
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
index 10c2c65..2f4d704 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstract.java
@@ -25,7 +25,6 @@ import com.google.common.collect.Lists;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.filter.Filter;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.query.QueryFindAllInstances;
import org.apache.isis.core.commons.lang.ClassExtensions;
@@ -460,8 +459,7 @@ public abstract class ObjectActionParameterAbstract implements ObjectActionParam
public String isValid(
final ObjectAdapter objectAdapter,
final Object proposedValue,
- final InteractionInitiatedBy interactionInitiatedBy,
- final Localization localization) {
+ final InteractionInitiatedBy interactionInitiatedBy) {
ObjectAdapter proposedValueAdapter = null;
ObjectSpecification proposedValueSpec;
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/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 5b0de02..48a1112 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
@@ -44,7 +44,6 @@ import org.apache.isis.applib.annotation.When;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.filter.Filter;
import org.apache.isis.applib.filter.Filters;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.exceptions.UnknownTypeException;
import org.apache.isis.core.commons.lang.ClassExtensions;
@@ -387,14 +386,16 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
//region > Title, Icon
@Override
- public String getTitle(final ObjectAdapter targetAdapter, final Localization localization) {
- return getTitle(null, targetAdapter, localization);
+ public String getTitle(final ObjectAdapter targetAdapter) {
+ return getTitle(null, targetAdapter);
}
@Override
- public String getTitle(ObjectAdapter contextAdapterIfAny, ObjectAdapter targetAdapter, Localization localization) {
+ public String getTitle(
+ ObjectAdapter contextAdapterIfAny,
+ ObjectAdapter targetAdapter) {
if (titleFacet != null) {
- final String titleString = titleFacet.title(contextAdapterIfAny, targetAdapter, localization);
+ final String titleString = titleFacet.title(contextAdapterIfAny, targetAdapter);
if (titleString != null && !titleString.equals("")) {
return titleString;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
index e810f58..3b9079d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/standalonelist/ObjectSpecificationOnStandaloneList.java
@@ -21,7 +21,6 @@ package org.apache.isis.core.metamodel.specloader.specimpl.standalonelist;
import java.util.List;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacetDefaultToObject;
@@ -136,7 +135,7 @@ public class ObjectSpecificationOnStandaloneList extends ObjectSpecificationAbst
// /////////////////////////////////////////////////////
@Override
- public String getTitle(final ObjectAdapter object, final Localization localization) {
+ public String getTitle(final ObjectAdapter object) {
return ((FreeStandingList) object.getObject()).titleString();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
index e703f48..5cee089 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/TitleFacetViaMethodTest.java
@@ -77,7 +77,7 @@ public class TitleFacetViaMethodTest {
@Test
public void testTitleThrowsException() {
- final String title = facet.title(mockOwningAdapter, null);
+ final String title = facet.title(mockOwningAdapter);
assertThat(title, is("Failed Title"));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
index 7d18c7f..0889ac0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
@@ -44,9 +44,6 @@ import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation.TitleComponent;
-import org.apache.isis.core.metamodel.services.l10n.LocalizationDefault;
-import org.apache.isis.core.metamodel.services.l10n.LocalizationProviderInternal;
-import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Allowing;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -57,9 +54,6 @@ public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
@Mock
private ObjectAdapter mockObjectAdapter;
- @Allowing
- @Mock
- private LocalizationProviderInternal mockLocalizationProviderInternal;
@Mock
private AuthenticationSession mockAuthenticationSession;
@@ -79,9 +73,6 @@ public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
allowing(mockServicesInjector).lookupService(DeploymentCategoryProvider.class);
will(returnValue(mockDeploymentCategoryProvider));
- allowing(mockLocalizationProviderInternal).getLocalization();
- will(returnValue(new LocalizationDefault()));
-
allowing(mockDeploymentCategoryProvider).getDeploymentCategory();
will(returnValue(DeploymentCategory.PRODUCTION));
@@ -183,7 +174,7 @@ public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
will(returnValue(customer));
}
});
- final String title = titleFacetViaTitleAnnotation.title(mockObjectAdapter, mockLocalizationProviderInternal.getLocalization());
+ final String title = titleFacetViaTitleAnnotation.title(mockObjectAdapter);
assertThat(title, is("titleElement1. titleElement3,titleElement2"));
}
@@ -259,7 +250,7 @@ public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4T
will(returnValue(customer));
}
});
- final String title = titleFacetViaTitleAnnotation.title(mockObjectAdapter, mockLocalizationProviderInternal.getLocalization());
+ final String title = titleFacetViaTitleAnnotation.title(mockObjectAdapter);
assertThat(title, is("titleElement1 titleElement3 titleElement5 3 this needs to be trimmed"));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
index 9ccd792..473d751 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
@@ -37,7 +37,6 @@ import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleAnnotationFacetFactory;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation;
import org.apache.isis.core.metamodel.facets.object.title.annotation.TitleFacetViaTitleAnnotation.TitleComponent;
-import org.apache.isis.core.metamodel.services.l10n.LocalizationProviderInternal;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
@@ -58,13 +57,10 @@ public class TitleFacetViaTitleAnnotationTest {
@Mock
private AdapterManager mockAdapterManager;
- @Mock
- private LocalizationProviderInternal mockLocalizationProviderInternal;
-
protected static class DomainObjectWithProblemInItsAnnotatedTitleMethod {
@Title
- public String screwedTitle() {
+ public String brokenTitle() {
throw new NullPointerException();
}
@@ -116,7 +112,7 @@ public class TitleFacetViaTitleAnnotationTest {
}
});
- final String title = facet.title(mockObjectAdapter, null);
+ final String title = facet.title(mockObjectAdapter);
assertThat(title, is("Normal Domain Object"));
}
@@ -136,7 +132,7 @@ public class TitleFacetViaTitleAnnotationTest {
}
});
- final String title = facet.title(mockObjectAdapter, null);
+ final String title = facet.title(mockObjectAdapter);
assertThat(title, is("Failed Title"));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java
index 9a253a9..ee7b3f7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetAnnotationElseConfigurationFactoryTest.java
@@ -19,11 +19,8 @@
package org.apache.isis.core.metamodel.facets.object.parseable;
-import org.jmock.Expectations;
-
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.annotation.Parseable;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.parseable.annotcfg.ParseableFacetAnnotationElseConfigurationFactory;
@@ -94,7 +91,7 @@ public class ParseableFacetAnnotationElseConfigurationFactoryTest extends Abstra
public static class ParserNoop<T> implements Parser<T> {
@Override
- public T parseTextEntry(final Object context, final String entry, Localization localization) {
+ public T parseTextEntry(final Object context, final String entry) {
return null;
}
@@ -104,7 +101,7 @@ public class ParseableFacetAnnotationElseConfigurationFactoryTest extends Abstra
}
@Override
- public String displayTitleOf(final T object, final Localization localization) {
+ public String displayTitleOf(final T object) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
index fbbc315..ad074c8 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
@@ -30,9 +30,7 @@ import org.junit.Test;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.adapters.ParsingException;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser;
@@ -83,7 +81,7 @@ public class ParseableFacetUsingParserTest {
final Parser<String> parser = new Parser<String>() {
@Override
- public String parseTextEntry(final Object contextPojo, final String entry, Localization localization) {
+ public String parseTextEntry(final Object contextPojo, final String entry) {
if (entry.equals("invalid")) {
throw new ParsingException();
}
@@ -102,7 +100,7 @@ public class ParseableFacetUsingParserTest {
}
@Override
- public String displayTitleOf(final String object, final Localization localization) {
+ public String displayTitleOf(final String object) {
return null;
}
@@ -147,16 +145,16 @@ public class ParseableFacetUsingParserTest {
@Test(expected = TextEntryParseException.class)
public void parsingExceptionRethrown() throws Exception {
- parseableFacetUsingParser.parseTextEntry(null, "invalid", InteractionInitiatedBy.USER, null);
+ parseableFacetUsingParser.parseTextEntry(null, "invalid", InteractionInitiatedBy.USER);
}
@Test(expected = TextEntryParseException.class)
public void numberFormatExceptionRethrown() throws Exception {
- parseableFacetUsingParser.parseTextEntry(null, "number", InteractionInitiatedBy.USER, null);
+ parseableFacetUsingParser.parseTextEntry(null, "number", InteractionInitiatedBy.USER);
}
@Test(expected = TextEntryParseException.class)
public void illegalFormatExceptionRethrown() throws Exception {
- parseableFacetUsingParser.parseTextEntry(null, "format", InteractionInitiatedBy.USER, null);
+ parseableFacetUsingParser.parseTextEntry(null, "format", InteractionInitiatedBy.USER);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
index 36efb18..53de53c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
@@ -24,7 +24,6 @@ import org.apache.isis.applib.adapters.DefaultsProvider;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.Parser;
import org.apache.isis.applib.annotation.Value;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacet;
@@ -189,12 +188,14 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
}
@Override
- public MyValueSemanticsProviderThatIsAParser parseTextEntry(final Object context, final String entry, Localization localization) {
+ public MyValueSemanticsProviderThatIsAParser parseTextEntry(
+ final Object context,
+ final String entry) {
return null;
}
@Override
- public String displayTitleOf(final MyValueSemanticsProviderThatIsAParser object, final Localization localization) {
+ public String displayTitleOf(final MyValueSemanticsProviderThatIsAParser object) {
return null;
}
@@ -398,12 +399,14 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
}
@Override
- public MyValueWithSemanticsProviderSpecifiedUsingConfiguration parseTextEntry(final Object context, final String entry, Localization localization) {
+ public MyValueWithSemanticsProviderSpecifiedUsingConfiguration parseTextEntry(
+ final Object context,
+ final String entry) {
return null;
}
@Override
- public String displayTitleOf(final MyValueWithSemanticsProviderSpecifiedUsingConfiguration object, final Localization localization) {
+ public String displayTitleOf(final MyValueWithSemanticsProviderSpecifiedUsingConfiguration object) {
return null;
}
@@ -449,12 +452,14 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
}
@Override
- public NonAnnotatedValueSemanticsProviderSpecifiedUsingConfiguration parseTextEntry(final Object context, final String entry, Localization localization) {
+ public NonAnnotatedValueSemanticsProviderSpecifiedUsingConfiguration parseTextEntry(
+ final Object context,
+ final String entry) {
return null;
}
@Override
- public String displayTitleOf(final NonAnnotatedValueSemanticsProviderSpecifiedUsingConfiguration object, final Localization localization) {
+ public String displayTitleOf(final NonAnnotatedValueSemanticsProviderSpecifiedUsingConfiguration object) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
index 61ceb61..942b22a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
@@ -28,7 +28,6 @@ import org.jmock.Expectations;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
@@ -59,14 +58,14 @@ public class BigDecimalValueSemanticsProviderTest extends ValueSemanticsProvider
@Test
public void testParseValidString() throws Exception {
- final Object newValue = value.parseTextEntry(null, "2142342334", null);
+ final Object newValue = value.parseTextEntry(null, "2142342334");
assertEquals(new BigDecimal(2142342334L), newValue);
}
@Test
public void testParseInvalidString() throws Exception {
try {
- value.parseTextEntry(null, "214xxx2342334", null);
+ value.parseTextEntry(null, "214xxx2342334");
fail();
} catch (final TextEntryParseException expected) {
}
@@ -74,7 +73,7 @@ public class BigDecimalValueSemanticsProviderTest extends ValueSemanticsProvider
@Test
public void testTitleOf() {
- assertEquals("34,132.199", value.displayTitleOf(bigDecimal, (Localization) null));
+ assertEquals("34,132.199", value.displayTitleOf(bigDecimal));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
index 2754c7f..3a12e4b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
@@ -28,7 +28,6 @@ import org.jmock.Expectations;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
@@ -58,14 +57,14 @@ public class BigIntValueSemanticsProviderTest extends ValueSemanticsProviderAbst
@Test
public void testParseValidString() throws Exception {
- final Object newValue = getValue().parseTextEntry(null, "2142342334", null);
+ final Object newValue = getValue().parseTextEntry(null, "2142342334");
assertEquals(new BigInteger("2142342334"), newValue);
}
@Test
public void testParseInvalidString() throws Exception {
try {
- getValue().parseTextEntry(null, "214xxx2342334", null);
+ getValue().parseTextEntry(null, "214xxx2342334");
fail();
} catch (final TextEntryParseException expected) {
}
@@ -73,7 +72,7 @@ public class BigIntValueSemanticsProviderTest extends ValueSemanticsProviderAbst
@Test
public void testTitle() throws Exception {
- assertEquals("132,199", getValue().displayTitleOf(bigInt, (Localization) null));
+ assertEquals("132,199", getValue().displayTitleOf(bigInt));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java
index 17c738e..a1dd819 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BlobValueSemanticsProviderTest.java
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertThat;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
@@ -49,7 +48,7 @@ public class BlobValueSemanticsProviderTest extends ValueSemanticsProviderAbstra
@Test
public void testTitleOf() {
- assertEquals("myfile1.docx", value.displayTitleOf(blob, (Localization) null));
+ assertEquals("myfile1.docx", value.displayTitleOf(blob));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BooleanValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BooleanValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BooleanValueSemanticsProviderTest.java
index a414a02..1e3e05e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BooleanValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BooleanValueSemanticsProviderTest.java
@@ -25,7 +25,6 @@ import static org.junit.Assert.fail;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
@@ -48,32 +47,32 @@ public class BooleanValueSemanticsProviderTest extends ValueSemanticsProviderAbs
@Test
public void testParseFalseString() throws Exception {
- final Object parsed = value.parseTextEntry(null, "faLSe", null);
+ final Object parsed = value.parseTextEntry(null, "faLSe");
assertEquals(Boolean.valueOf(false), parsed);
}
@Test
public void testParseStringWithPrecedingSpace() throws Exception {
- final Object parsed = value.parseTextEntry(null, " false", null);
+ final Object parsed = value.parseTextEntry(null, " false");
assertEquals(Boolean.valueOf(false), parsed);
}
@Test
public void testParseStringWithTrailingSpace() throws Exception {
- final Object parsed = value.parseTextEntry(null, " false", null);
+ final Object parsed = value.parseTextEntry(null, " false");
assertEquals(Boolean.valueOf(false), parsed);
}
@Test
public void testParseTrueString() throws Exception {
- final Object parsed = value.parseTextEntry(null, "TRue", null);
+ final Object parsed = value.parseTextEntry(null, "TRue");
assertEquals(Boolean.valueOf(true), parsed);
}
@Test
public void testParseInvalidString() throws Exception {
try {
- value.parseTextEntry(null, "yes", null);
+ value.parseTextEntry(null, "yes");
fail();
} catch (final TextEntryParseException expected) {
}
@@ -81,12 +80,12 @@ public class BooleanValueSemanticsProviderTest extends ValueSemanticsProviderAbs
@Test
public void testTitle() throws Exception {
- assertEquals("True", value.displayTitleOf(booleanObj, (Localization) null));
+ assertEquals("True", value.displayTitleOf(booleanObj));
}
@Test
public void testTitleWhenNotSet() throws Exception {
- assertEquals("", value.titleString(null, null));
+ assertEquals("", value.titleString(null));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
index 02573bd..c1c890f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
@@ -26,7 +26,6 @@ import org.jmock.Expectations;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
@@ -58,14 +57,14 @@ public class ByteValueSemanticsProviderTest extends ValueSemanticsProviderAbstra
@Test
public void testParseValidString() throws Exception {
- final Object parsed = value.parseTextEntry(null, "21", null);
+ final Object parsed = value.parseTextEntry(null, "21");
assertEquals(Byte.valueOf((byte) 21), parsed);
}
@Test
public void testParseInvalidString() throws Exception {
try {
- value.parseTextEntry(null, "xs21z4xxx23", null);
+ value.parseTextEntry(null, "xs21z4xxx23");
fail();
} catch (final TextEntryParseException expected) {
}
@@ -73,7 +72,7 @@ public class ByteValueSemanticsProviderTest extends ValueSemanticsProviderAbstra
@Test
public void testTitleOf() throws Exception {
- assertEquals("102", value.displayTitleOf(byteObj, (Localization) null));
+ assertEquals("102", value.displayTitleOf(byteObj));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/CharacterValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/CharacterValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/CharacterValueSemanticsProviderTest.java
index 7349c47..0b057b7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/CharacterValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/CharacterValueSemanticsProviderTest.java
@@ -25,7 +25,6 @@ import static org.junit.Assert.fail;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.InvalidEntryException;
@@ -50,7 +49,7 @@ public class CharacterValueSemanticsProviderTest extends ValueSemanticsProviderA
@Test
public void testParseLongString() throws Exception {
try {
- value.parseTextEntry(null, "one", null);
+ value.parseTextEntry(null, "one");
fail();
} catch (final InvalidEntryException expected) {
}
@@ -58,12 +57,12 @@ public class CharacterValueSemanticsProviderTest extends ValueSemanticsProviderA
@Test
public void testTitleOf() {
- assertEquals("r", value.displayTitleOf(character, (Localization) null));
+ assertEquals("r", value.displayTitleOf(character));
}
@Test
public void testValidParse() throws Exception {
- final Object parse = value.parseTextEntry(null, "t", null);
+ final Object parse = value.parseTextEntry(null, "t");
assertEquals(Character.valueOf('t'), parse);
}
[40/50] [abbrv] isis git commit: ISIS-1438: initializes JaxbContexts
within the various DtoUtils in the background (via ThreadPool).
Posted by da...@apache.org.
ISIS-1438: initializes JaxbContexts within the various DtoUtils in the background (via ThreadPool).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/51143d15
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/51143d15
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/51143d15
Branch: refs/heads/master
Commit: 51143d152814a31b415dc9c193aea210a3f891f0
Parents: 9eb35d3
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 15 12:12:04 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 15 12:12:04 2016 +0100
----------------------------------------------------------------------
.../apache/isis/schema/utils/ChangesDtoUtils.java | 13 ++++---------
.../apache/isis/schema/utils/CommandDtoUtils.java | 4 ++++
.../isis/schema/utils/InteractionDtoUtils.java | 6 ++++++
.../wicket/viewer/IsisWicketApplication.java | 18 ++++++++++++++++++
4 files changed, 32 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/51143d15/core/applib/src/main/java/org/apache/isis/schema/utils/ChangesDtoUtils.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/ChangesDtoUtils.java b/core/applib/src/main/java/org/apache/isis/schema/utils/ChangesDtoUtils.java
index 7fa619e..25f8627 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/ChangesDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/ChangesDtoUtils.java
@@ -26,27 +26,22 @@ import java.io.StringReader;
import java.io.Writer;
import java.net.URL;
import java.nio.charset.Charset;
-import java.sql.Timestamp;
-import java.util.Collection;
-import java.util.List;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import com.google.common.collect.Lists;
import com.google.common.io.Resources;
-import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.schema.chg.v1.ChangesDto;
-import org.apache.isis.schema.chg.v1.ObjectsDto;
-import org.apache.isis.schema.common.v1.OidDto;
-import org.apache.isis.schema.common.v1.OidsDto;
-import org.apache.isis.schema.utils.jaxbadapters.JavaSqlTimestampXmlGregorianCalendarAdapter;
public final class ChangesDtoUtils {
+ public static void init() {
+ getJaxbContext();
+ }
+
//region > marshalling
static JAXBContext jaxbContext;
static JAXBContext getJaxbContext() {
http://git-wip-us.apache.org/repos/asf/isis/blob/51143d15/core/applib/src/main/java/org/apache/isis/schema/utils/CommandDtoUtils.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/CommandDtoUtils.java b/core/applib/src/main/java/org/apache/isis/schema/utils/CommandDtoUtils.java
index 3d60b10..f3a3b7a 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/CommandDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/CommandDtoUtils.java
@@ -40,6 +40,10 @@ import org.apache.isis.schema.common.v1.OidsDto;
public final class CommandDtoUtils {
+ public static void init() {
+ getJaxbContext();
+ }
+
//region > marshalling
static JAXBContext jaxbContext;
static JAXBContext getJaxbContext() {
http://git-wip-us.apache.org/repos/asf/isis/blob/51143d15/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java b/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
index 81d7085..370bdff 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/InteractionDtoUtils.java
@@ -55,6 +55,12 @@ import org.apache.isis.schema.ixn.v1.PropertyEditDto;
public final class InteractionDtoUtils {
+
+ public static void init() {
+ getJaxbContext();
+ }
+
+
//region > marshalling
static JAXBContext jaxbContext;
static JAXBContext getJaxbContext() {
http://git-wip-us.apache.org/repos/asf/isis/blob/51143d15/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 7efc13a..e4455c1 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -347,6 +347,24 @@ public class IsisWicketApplication
configureWicketSelect2();
return null;
}
+ },
+ new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ ChangesDtoUtils.init();
+ return null;
+ }
+ },
+ new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ InteractionDtoUtils.init();
+ return null;
+ }
+ },
+ new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ CommandDtoUtils.init();
+ return null;
+ }
}
));
}
[27/50] [abbrv] isis git commit: ISIS-1427: completes rationalization
for minimizing calls to IsisContext#getIsisSessionFactory static.
Posted by da...@apache.org.
ISIS-1427: completes rationalization for minimizing calls to IsisContext#getIsisSessionFactory static.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/95c3ecc1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/95c3ecc1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/95c3ecc1
Branch: refs/heads/master
Commit: 95c3ecc1144d9093dc71088a173480ab7a64cfcb
Parents: 69b4859
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jun 10 16:23:32 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jun 10 16:23:53 2016 +0100
----------------------------------------------------------------------
.../ExceptionRecognizerTranslate.java | 7 +-
.../fixtures/FixturesInstallerDelegate.java | 3 +-
.../apache/isis/core/runtime/memento/Data.java | 4 +-
.../isis/core/runtime/memento/Memento.java | 9 +-
.../core/runtime/memento/StandaloneData.java | 5 +-
.../AuthenticationSessionProviderDefault.java | 8 +-
.../EventBusImplementationAbstract.java | 20 +--
.../eventbus/EventBusServiceDefault.java | 10 ++
.../EventBusImplementationForAxonSimple.java | 16 +--
.../adapter/EventBusImplementationForGuava.java | 7 +-
.../MessageBrokerServiceInternalDefault.java | 10 +-
.../AbstractIsisSessionTemplate.java | 14 +-
.../DataNucleusApplicationComponents.java | 37 ++----
.../system/persistence/PersistenceSession.java | 27 +---
.../persistence/PersistenceSessionFactory.java | 3 +-
.../isis/core/webapp/IsisSessionFilter.java | 6 +-
.../AuthenticationSessionStrategyAbstract.java | 9 ++
.../AuthenticationSessionStrategyDefault.java | 9 +-
.../persistence/spi/JdoObjectIdSerializer.java | 7 +-
.../rendering/ReprRendererAbstract.java | 6 +-
.../domainobjects/JsonValueEncoder.java | 9 +-
.../rendering/util/JsonWriterUtil.java | 9 +-
.../AuthenticationSessionStrategyBasicAuth.java | 10 +-
.../server/resources/SwaggerSpecResource.java | 15 ++-
.../IsisTransactionFilterForRestfulObjects.java | 21 ++-
.../wicket/ConverterForObjectAdapter.java | 9 +-
.../ConverterForObjectAdapterMemento.java | 12 +-
.../viewer/services/DeepLinkServiceWicket.java | 13 +-
.../wicket/model/mementos/ActionMemento.java | 21 ++-
.../model/mementos/ActionParameterMemento.java | 26 ++--
.../model/mementos/CollectionMemento.java | 19 +--
.../model/mementos/ObjectAdapterMemento.java | 92 ++++++++-----
.../wicket/model/mementos/PropertyMemento.java | 11 +-
.../viewer/wicket/model/mementos/SpecUtils.java | 12 +-
.../viewer/wicket/model/models/ActionModel.java | 96 +++++++-------
.../models/BookmarkTreeNodeComparator.java | 23 +---
.../model/models/BookmarkedPagesModel.java | 10 +-
.../model/models/EntityCollectionModel.java | 11 +-
.../viewer/wicket/model/models/EntityModel.java | 12 +-
.../wicket/model/models/ModelAbstract.java | 2 +-
.../viewer/wicket/model/models/ScalarModel.java | 128 +++++++++++--------
.../model/models/ScalarModelWithPending.java | 16 ++-
.../viewer/wicket/model/models/ValueModel.java | 3 +-
.../wicket/model/util/ComponentHintKey.java | 10 +-
.../model/util/ObjectAdapterFunctions.java | 62 ---------
.../components/actionlink/ActionLinkPanel.java | 2 +-
.../actionlink/ActionLinkPanelFactory.java | 2 +-
.../entityactions/EntityActionLinkFactory.java | 3 +-
.../entityactions/EntityActionUtil.java | 3 +-
.../actionmenu/serviceactions/CssMenuItem.java | 19 ++-
.../ServiceActionLinkFactory.java | 21 ++-
.../actionprompt/ActionPromptHeaderPanel.java | 4 +-
.../ui/components/actions/ActionInfoPanel.java | 2 +-
.../ui/components/actions/ActionPanel.java | 7 +-
.../actions/ActionParametersFormPanel.java | 4 +-
.../bookmarkedpages/BookmarkedPagesPanel.java | 5 -
.../components/collection/CollectionPanel.java | 2 +-
.../collection/bulk/BulkActionsLinkFactory.java | 28 ++--
.../selector/CollectionSelectorHelper.java | 6 +-
.../CollectionContentsAsAjaxTablePanel.java | 3 +-
.../collection/EntityCollectionPanel.java | 3 +-
.../icontitle/EntityIconAndTitlePanel.java | 3 +-
.../components/property/PropertyEditPanel.java | 16 ++-
.../property/PropertyEditPromptHeaderPanel.java | 7 +-
.../components/scalars/ScalarPanelAbstract.java | 4 +-
.../scalars/reference/ReferencePanel.java | 12 +-
.../StandaloneCollectionPanel.java | 2 +-
.../ObjectAdapterMementoProviderAbstract.java | 35 ++++-
.../widgets/breadcrumbs/BreadcrumbModel.java | 3 +-
.../FormComponentPanelAbstract.java | 32 +----
.../valuechoices/ValueChoicesSelect2Panel.java | 5 +-
.../pages/accmngt/EmailAvailableValidator.java | 6 +-
.../pages/accmngt/register/RegisterPanel.java | 17 +--
.../ui/pages/actionprompt/ActionPromptPage.java | 15 ++-
.../wicket/ui/pages/mmverror/MmvErrorPage.java | 6 +-
.../StandaloneCollectionPage.java | 2 +-
.../viewer/wicket/ui/pages/value/ValuePage.java | 2 +-
.../ui/pages/voidreturn/VoidReturnPage.java | 2 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 6 +
79 files changed, 621 insertions(+), 537 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/ExceptionRecognizerTranslate.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/ExceptionRecognizerTranslate.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/ExceptionRecognizerTranslate.java
index f66fe44..4a1f710 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/ExceptionRecognizerTranslate.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/ExceptionRecognizerTranslate.java
@@ -22,6 +22,7 @@ import org.junit.runners.model.FrameworkMethod;
import org.junit.runners.model.Statement;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
public class ExceptionRecognizerTranslate implements MethodRule {
@@ -57,10 +58,14 @@ public class ExceptionRecognizerTranslate implements MethodRule {
* Simply invokes {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer#recognize(Throwable)} for all registered {@link org.apache.isis.applib.services.exceprecog.ExceptionRecognizer}s for the provided exception, so that the message will be translated.
*/
private void recognize(final Throwable ex) {
- final List<ExceptionRecognizer> exceptionRecognizers = IsisContext.getSessionFactory().getServicesInjector().lookupServices(ExceptionRecognizer.class);
+ final List<ExceptionRecognizer> exceptionRecognizers = getIsisSessionFactory().getServicesInjector().lookupServices(ExceptionRecognizer.class);
for (final ExceptionRecognizer exceptionRecognizer : exceptionRecognizers) {
final String unused = exceptionRecognizer.recognize(ex);
}
}
+ IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
index 1a3effd..3065591 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
@@ -35,7 +35,6 @@ import org.apache.isis.applib.fixtures.switchuser.SwitchUserService;
import org.apache.isis.core.commons.lang.ObjectExtensions;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.runtime.system.DeploymentType;
-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;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
@@ -162,7 +161,7 @@ public class FixturesInstallerDelegate {
private boolean shouldInstallFixture(final InstallableFixture installableFixture) {
final FixtureType fixtureType = installableFixture.getType();
if (fixtureType == FixtureType.DOMAIN_OBJECTS) {
- return !IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().isFixturesInstalled();
+ return !isisSessionFactory.getCurrentSession().getPersistenceSession().isFixturesInstalled();
}
// fixtureType is OTHER; always install.
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Data.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Data.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Data.java
index 3d01bad..dfde4e0 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Data.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Data.java
@@ -79,10 +79,10 @@ public class Data implements Encodable, Serializable {
protected PersistenceSession getPersistenceSession() {
- return getSessionFactory().getCurrentSession().getPersistenceSession();
+ return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
}
- protected IsisSessionFactory getSessionFactory() {
+ protected IsisSessionFactory getIsisSessionFactory() {
return IsisContext.getSessionFactory();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/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 78e47cb..aa9e242 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
@@ -48,6 +48,7 @@ import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
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;
/**
* Holds the state for the specified object in serializable form.
@@ -400,11 +401,15 @@ public class Memento implements Serializable {
// ///////////////////////////////////////////////////////////////
protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSessionFactory().getSpecificationLoader();
+ return getIsisSessionFactory().getSpecificationLoader();
}
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+ return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
+ }
+
+ IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
index cd7e0b9..d560cbc 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
@@ -29,9 +29,6 @@ import org.apache.isis.core.commons.encoding.DataOutputExtended;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-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;
public class StandaloneData extends Data {
@@ -122,7 +119,7 @@ public class StandaloneData extends Data {
if (objectAsSerializable != null) {
return getPersistenceSession().adapterFor(objectAsSerializable);
} else {
- final ObjectSpecification spec = getSessionFactory().getSpecificationLoader().loadSpecification(getClassName());
+ final ObjectSpecification spec = getIsisSessionFactory().getSpecificationLoader().loadSpecification(getClassName());
final EncodableFacet encodeableFacet = spec.getFacet(EncodableFacet.class);
return encodeableFacet.fromEncodedString(objectAsEncodedString);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
index b298fe7..2997502 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
@@ -21,7 +21,7 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@DomainService(nature = NatureOfService.DOMAIN)
public class AuthenticationSessionProviderDefault implements AuthenticationSessionProvider {
@@ -29,6 +29,10 @@ public class AuthenticationSessionProviderDefault implements AuthenticationSessi
@Programmatic
@Override
public AuthenticationSession getAuthenticationSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
+ return isisSessionFactory.getCurrentSession().getAuthenticationSession();
}
+
+ @javax.inject.Inject
+ IsisSessionFactory isisSessionFactory;
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusImplementationAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusImplementationAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusImplementationAbstract.java
index f8b7555..068b75d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusImplementationAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusImplementationAbstract.java
@@ -18,17 +18,18 @@ package org.apache.isis.core.runtime.services.eventbus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import org.apache.isis.applib.services.eventbus.AbstractDomainEvent;
import org.apache.isis.applib.services.eventbus.EventBusImplementation;
import org.apache.isis.core.commons.exceptions.IsisApplicationException;
-import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
public abstract class EventBusImplementationAbstract implements EventBusImplementation {
private static final Logger LOG = LoggerFactory.getLogger(EventBusImplementationAbstract.class);
- protected static void processException(
+ protected void processException(
final Throwable exception,
final Object event) {
if (!(event instanceof AbstractDomainEvent)) {
@@ -65,17 +66,18 @@ public abstract class EventBusImplementationAbstract implements EventBusImplemen
}
- // region > exception handling
-
- private static void abortTransaction(final Throwable exception) {
+ private void abortTransaction(final Throwable exception) {
getTransactionManager().getCurrentTransaction().setAbortCause(new IsisApplicationException(exception));
- return;
}
- private static IsisTransactionManager getTransactionManager() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager();
+
+
+
+ private IsisTransactionManager getTransactionManager() {
+ return isisSessionFactory.getCurrentSession().getPersistenceSession().getTransactionManager();
}
- // endregion
+ @javax.inject.Inject
+ IsisSessionFactory isisSessionFactory;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
index cf6a630..2fc5b72 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/EventBusServiceDefault.java
@@ -27,6 +27,7 @@ import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.eventbus.EventBusImplementation;
import org.apache.isis.applib.services.eventbus.EventBusService;
+import org.apache.isis.applib.services.registry.ServiceRegistry2;
import org.apache.isis.core.commons.lang.ClassUtil;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.runtime.services.RequestScopedService;
@@ -119,6 +120,12 @@ public abstract class EventBusServiceDefault extends EventBusService {
@Override
protected org.apache.isis.applib.services.eventbus.EventBusImplementation newEventBus() {
+ final EventBusImplementation implementation = instantiateEventBus();
+ serviceRegistry2.injectServicesInto(implementation);
+ return implementation;
+ }
+
+ private EventBusImplementation instantiateEventBus() {
if("guava".equals(implementation)) {
return new EventBusImplementationForGuava();
}
@@ -139,4 +146,7 @@ public abstract class EventBusServiceDefault extends EventBusService {
}
//endregion
+ @javax.inject.Inject
+ ServiceRegistry2 serviceRegistry2;
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/adapter/EventBusImplementationForAxonSimple.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/adapter/EventBusImplementationForAxonSimple.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/adapter/EventBusImplementationForAxonSimple.java
index 8739c0d..af3572a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/adapter/EventBusImplementationForAxonSimple.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/adapter/EventBusImplementationForAxonSimple.java
@@ -30,24 +30,22 @@ import org.apache.isis.core.runtime.services.eventbus.EventBusImplementationAbst
*/
public class EventBusImplementationForAxonSimple extends EventBusImplementationAbstract {
- // TODO: does this need to be static?
- private static SimpleEventBus simpleEventBus = new SimpleEventBus();
+ private SimpleEventBus simpleEventBus = new SimpleEventBus();
- // TODO: does this need to be static?
- private static Map<Object, AxonEventListenerAdapter> adapters = Maps.newConcurrentMap();
+ private Map<Object, AxonEventListenerAdapter> listenerAdapterByDomainService = Maps.newConcurrentMap();
- private static AxonEventListenerAdapter adapterFor(final Object domainService) {
- AxonEventListenerAdapter annotationEventListenerAdapter = adapters.get(domainService);
+ private AxonEventListenerAdapter adapterFor(final Object domainService) {
+ AxonEventListenerAdapter annotationEventListenerAdapter = listenerAdapterByDomainService.get(domainService);
if (annotationEventListenerAdapter == null) {
annotationEventListenerAdapter = new AxonEventListenerAdapter(domainService);
- adapters.put(domainService, annotationEventListenerAdapter);
+ listenerAdapterByDomainService.put(domainService, annotationEventListenerAdapter);
}
return annotationEventListenerAdapter;
}
@Override
public void register(final Object domainService) {
- simpleEventBus.subscribe(EventBusImplementationForAxonSimple.adapterFor(domainService));
+ simpleEventBus.subscribe(adapterFor(domainService));
}
@Override
@@ -70,7 +68,7 @@ public class EventBusImplementationForAxonSimple extends EventBusImplementationA
}
- static class AxonEventListenerAdapter extends AnnotationEventListenerAdapter {
+ class AxonEventListenerAdapter extends AnnotationEventListenerAdapter {
public AxonEventListenerAdapter(final Object annotatedEventListener) {
super(annotatedEventListener);
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/adapter/EventBusImplementationForGuava.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/adapter/EventBusImplementationForGuava.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/adapter/EventBusImplementationForGuava.java
index 6801561..3d16bf5 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/adapter/EventBusImplementationForGuava.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/eventbus/adapter/EventBusImplementationForGuava.java
@@ -26,11 +26,9 @@ import org.apache.isis.core.runtime.services.eventbus.EventBusImplementationAbst
*/
public class EventBusImplementationForGuava extends EventBusImplementationAbstract {
- // TODO: does this need to be static?
- private static final com.google.common.eventbus.EventBus eventBus = new com.google.common.eventbus.EventBus(newEventBusSubscriberExceptionHandler());
+ private final com.google.common.eventbus.EventBus eventBus = new com.google.common.eventbus.EventBus(newEventBusSubscriberExceptionHandler());
- // TODO: does this need to be static?
- protected static SubscriberExceptionHandler newEventBusSubscriberExceptionHandler() {
+ protected SubscriberExceptionHandler newEventBusSubscriberExceptionHandler() {
return new SubscriberExceptionHandler() {
@Override
public void handleException(final Throwable exception,
@@ -58,4 +56,5 @@ public class EventBusImplementationForGuava extends EventBusImplementationAbstra
eventBus.post(event);
}
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/runtime/src/main/java/org/apache/isis/core/runtime/services/msgbroker/MessageBrokerServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/msgbroker/MessageBrokerServiceInternalDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/msgbroker/MessageBrokerServiceInternalDefault.java
index a6158ea..3a62663 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/msgbroker/MessageBrokerServiceInternalDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/msgbroker/MessageBrokerServiceInternalDefault.java
@@ -23,7 +23,7 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.core.commons.authentication.MessageBroker;
import org.apache.isis.core.metamodel.services.msgbroker.MessageBrokerServiceInternal;
-import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@DomainService(
nature = NatureOfService.DOMAIN,
@@ -46,8 +46,12 @@ public class MessageBrokerServiceInternalDefault implements MessageBrokerService
throw new RecoverableException(message);
}
- private static MessageBroker getMessageBroker() {
- return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession().getMessageBroker();
+
+ private MessageBroker getMessageBroker() {
+ return isisSessionFactory.getCurrentSession().getAuthenticationSession().getMessageBroker();
}
+ @javax.inject.Inject
+ IsisSessionFactory isisSessionFactory;
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
index 6d763a0..df2aa76 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/sessiontemplate/AbstractIsisSessionTemplate.java
@@ -35,12 +35,12 @@ public abstract class AbstractIsisSessionTemplate {
*/
public void execute(final AuthenticationSession authSession, final Object context) {
try {
- getSessionFactory().openSession(authSession);
+ getIsisSessionFactory().openSession(authSession);
PersistenceSession persistenceSession = getPersistenceSession();
persistenceSession.getServicesInjector().injectServicesInto(this);
doExecute(context);
} finally {
- getSessionFactory().closeSession();
+ getIsisSessionFactory().closeSession();
}
}
@@ -91,16 +91,12 @@ public abstract class AbstractIsisSessionTemplate {
// //////////////////////////////////////
- protected IsisSessionFactory getSessionFactory() {
+ protected IsisSessionFactory getIsisSessionFactory() {
return IsisContext.getSessionFactory();
}
protected PersistenceSession getPersistenceSession() {
- return getSessionFactory().getCurrentSession().getPersistenceSession();
- }
-
- protected AdapterManager getAdapterManager() {
- return getPersistenceSession();
+ return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
}
protected IsisTransactionManager getTransactionManager(PersistenceSession persistenceSession) {
@@ -108,7 +104,7 @@ public abstract class AbstractIsisSessionTemplate {
}
protected SpecificationLoader getSpecificationLoader() {
- return getSessionFactory().getSpecificationLoader();
+ return getIsisSessionFactory().getSpecificationLoader();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
index 6a77631..52ac35b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/DataNucleusApplicationComponents.java
@@ -40,7 +40,7 @@ import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.objectstore.jdo.datanucleus.CreateSchemaObjectFromClassMetadata;
import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPropertiesAware;
import org.apache.isis.objectstore.jdo.metamodel.facets.object.query.JdoNamedQuery;
@@ -81,19 +81,22 @@ public class DataNucleusApplicationComponents implements ApplicationScopedCompon
private final Set<String> persistableClassNameSet;
private final IsisConfiguration jdoObjectstoreConfig;
+ private final SpecificationLoader specificationLoader;
private final Map<String, String> datanucleusProps;
private Map<String, JdoNamedQuery> namedQueryByName;
private PersistenceManagerFactory persistenceManagerFactory;
public DataNucleusApplicationComponents(
- final IsisConfiguration jdoObjectstoreConfig,
+ final IsisConfiguration configuration,
+ final SpecificationLoader specificationLoader,
final Map<String, String> datanucleusProps,
final Set<String> persistableClassNameSet) {
-
+ this.specificationLoader = specificationLoader;
+
this.datanucleusProps = datanucleusProps;
this.persistableClassNameSet = persistableClassNameSet;
- this.jdoObjectstoreConfig = jdoObjectstoreConfig;
+ this.jdoObjectstoreConfig = configuration;
initialize();
@@ -229,10 +232,10 @@ public class DataNucleusApplicationComponents implements ApplicationScopedCompon
return properties;
}
- private static Map<String, JdoNamedQuery> catalogNamedQueries(Set<String> persistableClassNames) {
+ private Map<String, JdoNamedQuery> catalogNamedQueries(Set<String> persistableClassNames) {
final Map<String, JdoNamedQuery> namedQueryByName = Maps.newHashMap();
for (final String persistableClassName: persistableClassNames) {
- final ObjectSpecification spec = IsisContext.getSessionFactory().getSpecificationLoader().loadSpecification(persistableClassName);
+ final ObjectSpecification spec = specificationLoader.loadSpecification(persistableClassName);
final JdoQueryFacet facet = spec.getFacet(JdoQueryFacet.class);
if (facet == null) {
continue;
@@ -243,31 +246,11 @@ public class DataNucleusApplicationComponents implements ApplicationScopedCompon
}
return namedQueryByName;
}
-
+
public PersistenceManagerFactory getPersistenceManagerFactory() {
return persistenceManagerFactory;
}
- ///////////////////////////////////////////////////////////////////////////
- //
- ///////////////////////////////////////////////////////////////////////////
-
- public void init() {
- }
-
- public void shutdown() {
- }
-
-
-
- ///////////////////////////////////////////////////////////////////////////
- //
- ///////////////////////////////////////////////////////////////////////////
-
- public JdoNamedQuery getNamedQuery(String queryName) {
- return namedQueryByName.get(queryName);
- }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/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 0c5b58e..b15e087 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
@@ -124,7 +124,6 @@ import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindUsingA
import org.apache.isis.core.runtime.runner.opts.OptionHandlerFixtureAbstract;
import org.apache.isis.core.runtime.services.RequestScopedService;
import org.apache.isis.core.runtime.services.changes.ChangedObjectsServiceInternal;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.adaptermanager.OidAdapterHashMap;
import org.apache.isis.core.runtime.system.persistence.adaptermanager.PojoAdapterHashMap;
import org.apache.isis.core.runtime.system.persistence.adaptermanager.RootAndCollectionAdapters;
@@ -140,8 +139,6 @@ import org.apache.isis.objectstore.jdo.datanucleus.persistence.queries.Persisten
import org.apache.isis.objectstore.jdo.datanucleus.persistence.spi.JdoObjectIdSerializer;
import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
-import static org.apache.isis.core.commons.ensure.Ensure.ensureThatContext;
-import static org.apache.isis.core.commons.ensure.Ensure.ensureThatState;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
@@ -1310,13 +1307,6 @@ public class PersistenceSession implements
}
}
- private void ensureInTransaction() {
- ensureThatContext(IsisContext.getSessionFactory().inTransaction(), is(true));
- javax.jdo.Transaction currentTransaction = persistenceManager.currentTransaction();
- ensureThatState(currentTransaction, is(notNullValue()));
- ensureThatState(currentTransaction.isActive(), is(true));
- }
-
//endregion
@@ -1349,10 +1339,10 @@ public class PersistenceSession implements
return transactionManager;
}
- // for testing only
- void setTransactionManager(final IsisTransactionManager transactionManager) {
- this.transactionManager = transactionManager;
- }
+// // for testing only
+// void setTransactionManager(final IsisTransactionManager transactionManager) {
+// this.transactionManager = transactionManager;
+// }
//endregion
@@ -1377,15 +1367,6 @@ public class PersistenceSession implements
private final PojoAdapterHashMap pojoAdapterMap = new PojoAdapterHashMap();
private final OidAdapterHashMap oidAdapterMap = new OidAdapterHashMap();
- /**
- * @deprecated
- * @return - simply returns this {@link PersistenceSession}.
- */
- @Deprecated
- public AdapterManager getAdapterManager() {
- return this;
- }
-
@Override
public ObjectAdapter getAdapterFor(final Object pojo) {
ensureThatArg(pojo, is(notNullValue()));
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
index f9ebd07..8d45740 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSessionFactory.java
@@ -91,7 +91,8 @@ public class PersistenceSessionFactory implements ApplicationScopedComponent, Fi
final RegisterEntities registerEntities = new RegisterEntities(configuration.asMap(), specificationLoader);
final Set<String> classesToBePersisted = registerEntities.getEntityTypes();
- applicationComponents = new DataNucleusApplicationComponents(jdoObjectstoreConfig, datanucleusProps, classesToBePersisted);
+ applicationComponents = new DataNucleusApplicationComponents(jdoObjectstoreConfig, specificationLoader,
+ datanucleusProps, classesToBePersisted);
}
return applicationComponents;
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java
index 14e1d69..3704088 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisSessionFilter.java
@@ -311,7 +311,7 @@ public class IsisSessionFilter implements Filter {
final HttpServletRequest httpServletRequest = (HttpServletRequest) request;
final HttpServletResponse httpServletResponse = (HttpServletResponse) response;
- final IsisSessionFactory sessionFactory = getIsisSessionFactory();
+ final IsisSessionFactory sessionFactory = isisSessionFactoryFrom(httpServletRequest);
try {
final String queryString = httpServletRequest.getQueryString();
if (queryString != null && queryString.contains(QUERY_STRING_FORCE_LOGOUT)) {
@@ -388,8 +388,8 @@ public class IsisSessionFilter implements Filter {
return false;
}
- // REVIEW: it ought to be possible to remove this static lookup by binding the IsisSystem or IsisSessionFactory to the thread in an earlier filter
- private IsisSessionFactory getIsisSessionFactory() {
+ // REVIEW: it ought to be possible to remove this static lookup by binding the IsisSessionFactory to the request in an earlier filter
+ private IsisSessionFactory isisSessionFactoryFrom(final HttpServletRequest httpServletRequest) {
return IsisContext.getSessionFactory();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyAbstract.java
index c49d079..edc38a1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyAbstract.java
@@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@@ -53,9 +54,17 @@ public abstract class AuthenticationSessionStrategyAbstract implements Authentic
httpServletResponse.setStatus(STATUS_UNAUTHORIZED);
}
+
+ //region > Dependencies (from request)
+ protected AuthenticationManager authenticationManagerFrom(final HttpServletRequest httpServletRequest) {
+ return isisSessionFactoryFrom(httpServletRequest).getAuthenticationManager();
+ }
+
// TODO
protected IsisSessionFactory isisSessionFactoryFrom(final HttpServletRequest httpServletRequest) {
return IsisContext.getSessionFactory();
}
+ //endregion
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
index 9103685..4b218fd 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/auth/AuthenticationSessionStrategyDefault.java
@@ -30,7 +30,6 @@ import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.exploration.AuthenticationRequestExploration;
import org.apache.isis.core.runtime.fixtures.authentication.AuthenticationRequestLogonFixture;
import org.apache.isis.core.runtime.system.IsisSystem;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.webapp.WebAppConstants;
/**
@@ -58,7 +57,7 @@ public class AuthenticationSessionStrategyDefault extends AuthenticationSessionS
@Override
public AuthenticationSession lookupValid(final HttpServletRequest httpServletRequest, final HttpServletResponse httpServletResponse) {
- final AuthenticationManager authenticationManager = getAuthenticationManager();
+ final AuthenticationManager authenticationManager = authenticationManagerFrom(httpServletRequest);
final HttpSession httpSession = getHttpSession(httpServletRequest);
// use previously authenticated session if available
@@ -110,12 +109,6 @@ public class AuthenticationSessionStrategyDefault extends AuthenticationSessionS
}
- // //////////////////////////////////////////////////////////
- // Dependencies (from context)
- // //////////////////////////////////////////////////////////
- protected AuthenticationManager getAuthenticationManager() {
- return IsisContext.getSessionFactory().getAuthenticationManager();
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
index 6a7bfc3..48d4da9 100644
--- a/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
@@ -37,6 +37,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
public final class JdoObjectIdSerializer {
@@ -217,6 +218,10 @@ public final class JdoObjectIdSerializer {
}
private static SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSessionFactory().getSpecificationLoader();
+ return getIsisSessionFactory().getSpecificationLoader();
+ }
+
+ static IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
index c09cada..443ce13 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/ReprRendererAbstract.java
@@ -20,14 +20,16 @@ package org.apache.isis.viewer.restfulobjects.rendering;
import java.util.List;
import java.util.Map;
+
import javax.ws.rs.core.MediaType;
+
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
@@ -222,7 +224,7 @@ public abstract class ReprRendererAbstract<R extends ReprRendererAbstract<R, T>,
}
protected List<ObjectAdapter> getServiceAdapters() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().getServices();
+ return rendererContext.getPersistenceSession().getServices();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
index 5425c22..33d6d46 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
@@ -42,6 +42,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
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;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
/**
@@ -50,10 +51,8 @@ import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
*/
public final class JsonValueEncoder {
-
private JsonValueEncoder(){}
-
public static class ExpectedStringRepresentingValueException extends IllegalArgumentException {
private static final long serialVersionUID = 1L;
}
@@ -846,7 +845,11 @@ public final class JsonValueEncoder {
}
private static PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+ return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
+ }
+
+ static IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
index 446682d..82267cd 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.restfulobjects.applib.util.JsonMapper;
public final class JsonWriterUtil {
@@ -29,8 +30,8 @@ public final class JsonWriterUtil {
private JsonWriterUtil(){}
public static String jsonFor(final Object object) {
- final JsonMapper.PrettyPrinting prettyPrinting = inferPrettyPrinting(
- IsisContext.getSessionFactory().getDeploymentCategory());
+ final DeploymentCategory deploymentCategory = getIsisSessionFactory().getDeploymentCategory();
+ final JsonMapper.PrettyPrinting prettyPrinting = inferPrettyPrinting(deploymentCategory);
try {
return JsonMapper.instance(prettyPrinting).write(object);
} catch (final IOException e) {
@@ -38,6 +39,10 @@ public final class JsonWriterUtil {
}
}
+ static IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
+ }
+
private static JsonMapper.PrettyPrinting inferPrettyPrinting(final DeploymentCategory deploymentCategory) {
return deploymentCategory.isProduction() ? JsonMapper.PrettyPrinting.DISABLE : JsonMapper.PrettyPrinting.ENABLE;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyBasicAuth.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyBasicAuth.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyBasicAuth.java
index 1e43a0b..2ddbcf2 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyBasicAuth.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/authentication/AuthenticationSessionStrategyBasicAuth.java
@@ -63,7 +63,7 @@ public class AuthenticationSessionStrategyBasicAuth extends AuthenticationSessio
final AuthenticationRequestPassword request = new AuthenticationRequestPassword(user, password);
final AuthenticationSession authSession =
- getAuthenticationManager().authenticate(request);
+ authenticationManagerFrom(httpServletRequest).authenticate(request);
return authSession;
}
@@ -83,12 +83,4 @@ public class AuthenticationSessionStrategyBasicAuth extends AuthenticationSessio
}
- // //////////////////////////////////////////////////////////
- // Dependencies (from context)
- // //////////////////////////////////////////////////////////
-
- protected AuthenticationManager getAuthenticationManager() {
- return IsisContext.getSessionFactory().getAuthenticationManager();
- }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
index c292d92..1d6479d 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/SwaggerSpecResource.java
@@ -19,7 +19,6 @@ package org.apache.isis.viewer.restfulobjects.server.resources;
import java.util.List;
import java.util.concurrent.Callable;
-import javax.inject.Inject;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@@ -72,7 +71,7 @@ public class SwaggerSpecResource {
private String swagger(final SwaggerService.Visibility visibility) {
final SwaggerService.Format format = deriveFrom(httpHeaders);
- String spec = getSessionFactory().doInSession(new MyCallable(visibility, format));
+ String spec = getIsisSessionFactory().doInSession(new MyCallable(visibility, format));
return spec;
}
@@ -94,10 +93,6 @@ public class SwaggerSpecResource {
return SwaggerService.Format.JSON;
}
- IsisSessionFactory getSessionFactory() {
- return IsisContext.getSessionFactory();
- }
-
class MyCallable implements Callable<String> {
@@ -125,7 +120,13 @@ public class SwaggerSpecResource {
}
PersistenceSession getPersistenceSession() {
- return getSessionFactory().getCurrentSession().getPersistenceSession();
+ return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
}
}
+
+ IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
index 2b19f0a..b93d82a 100644
--- a/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
+++ b/core/viewer-restfulobjects-server/src/main/java/org/apache/isis/viewer/restfulobjects/server/webapp/IsisTransactionFilterForRestfulObjects.java
@@ -38,18 +38,21 @@ public class IsisTransactionFilterForRestfulObjects implements Filter {
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
// no-op if no session available.
- if(!getSessionFactory().inSession()) {
+ final IsisSessionFactory isisSessionFactory = isisSessionFactoryFrom(request);
+ if(!isisSessionFactory.inSession()) {
chain.doFilter(request, response);
return;
}
- getTransactionManager().startTransaction();
+
+ final IsisTransactionManager isisTransactionManager = transactionManagerFrom(isisSessionFactory);
+ isisTransactionManager.startTransaction();
try {
chain.doFilter(request, response);
} finally {
- final boolean inTransaction = inTransaction();
+ final boolean inTransaction = isisSessionFactory.inTransaction();
if(inTransaction) {
// user/logout will have invalidated the current transaction and also persistence session.
- getTransactionManager().endTransaction();
+ isisTransactionManager.endTransaction();
}
}
}
@@ -60,16 +63,12 @@ public class IsisTransactionFilterForRestfulObjects implements Filter {
// REVIEW: ought to be able to obtain from thread or as a request attribute
- protected IsisSessionFactory getSessionFactory() {
+ protected IsisSessionFactory isisSessionFactoryFrom(final ServletRequest request) {
return IsisContext.getSessionFactory();
}
- protected boolean inTransaction() {
- return getSessionFactory().inTransaction();
- }
-
- protected IsisTransactionManager getTransactionManager() {
- return getSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager();
+ protected IsisTransactionManager transactionManagerFrom(final IsisSessionFactory isisSessionFactory) {
+ return isisSessionFactory.getCurrentSession().getPersistenceSession().getTransactionManager();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
index 1d1de06..077b947 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
@@ -29,6 +29,7 @@ import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
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;
/**
* Implementation of a Wicket {@link IConverter} for {@link ObjectAdapter}s,
@@ -70,8 +71,12 @@ public class ConverterForObjectAdapter implements IConverter<ObjectAdapter> {
// Dependencies (from context)
// //////////////////////////////////////////////////////////
- protected PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+ PersistenceSession getPersistenceSession() {
+ return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
+ }
+
+ IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
index 0e8aad5..1a35039 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
@@ -30,6 +30,7 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChec
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.RootOid;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
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;
@@ -69,7 +70,8 @@ public class ConverterForObjectAdapterMemento implements IConverter<ObjectAdapte
if (memento == null) {
return null;
}
- final Oid oid = memento.getObjectAdapter(ConcurrencyChecking.NO_CHECK).getOid();
+ final Oid oid = memento.getObjectAdapter(ConcurrencyChecking.NO_CHECK, getPersistenceSession(),
+ getSpecificationLoader()).getOid();
if (oid == null) {
// values don't have an Oid...
// REVIEW: is this right?
@@ -77,14 +79,16 @@ public class ConverterForObjectAdapterMemento implements IConverter<ObjectAdapte
}
return oid.enString(OID_MARSHALLER);
}
-
-
// //////////////////////////////////////////////////////////
// Dependencies (from context)
// //////////////////////////////////////////////////////////
- protected PersistenceSession getPersistenceSession() {
+ SpecificationLoader getSpecificationLoader() {
+ return getIsisSessionFactory().getSpecificationLoader();
+ }
+
+ PersistenceSession getPersistenceSession() {
return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
index 7c8bbac..a7458fd 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
@@ -21,8 +21,6 @@ package org.apache.isis.viewer.wicket.viewer.services;
import java.net.URI;
import java.net.URISyntaxException;
-import javax.inject.Inject;
-
import org.apache.wicket.Page;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -34,9 +32,8 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.guice.GuiceBeanProvider;
import org.apache.isis.applib.services.linking.DeepLinkService;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-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;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
@@ -54,8 +51,7 @@ public class DeepLinkServiceWicket implements DeepLinkService {
@Override
public URI deepLinkFor(final Object domainObject) {
- final AdapterManager adapterManager = getPersistenceSession();
- final ObjectAdapter objectAdapter = adapterManager.adapterFor(domainObject);
+ final ObjectAdapter objectAdapter = getPersistenceSession().adapterFor(domainObject);
final PageParameters pageParameters = EntityModel.createPageParameters(objectAdapter);
PageClassRegistry pageClassRegistry = guiceBeanProvider.lookup(PageClassRegistry.class);
@@ -72,9 +68,12 @@ public class DeepLinkServiceWicket implements DeepLinkService {
}
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+ return isisSessionFactory.getCurrentSession().getPersistenceSession();
}
@javax.inject.Inject
+ private IsisSessionFactory isisSessionFactory;
+
+ @javax.inject.Inject
private GuiceBeanProvider guiceBeanProvider;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java
index 509455c..1b5b949 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionMemento.java
@@ -27,6 +27,7 @@ import org.apache.isis.core.metamodel.spec.ActionType;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
/**
* {@link Serializable} represention of a {@link ObjectAction}
@@ -46,8 +47,12 @@ public class ActionMemento implements Serializable {
this(action.getOnType().getSpecId(), action.getType(), action.getIdentifier().toNameParmsIdentityString(), action);
}
- public ActionMemento(final ObjectSpecId owningType, final ActionType actionType, final String nameParmsId) {
- this(owningType, actionType, nameParmsId, actionFor(owningType, actionType, nameParmsId));
+ public ActionMemento(
+ final ObjectSpecId owningType,
+ final ActionType actionType,
+ final String nameParmsId,
+ final SpecificationLoader specificationLoader) {
+ this(owningType, actionType, nameParmsId, actionFor(owningType, actionType, nameParmsId, specificationLoader));
}
private ActionMemento(
@@ -78,15 +83,19 @@ public class ActionMemento implements Serializable {
return ConcurrencyChecking.concurrencyCheckingFor(this.actionSemantics);
}
- public ObjectAction getAction() {
+ public ObjectAction getAction(final SpecificationLoader specificationLoader) {
if (action == null) {
- action = actionFor(owningType, actionType, nameParmsId);
+ action = actionFor(owningType, actionType, nameParmsId, specificationLoader);
}
return action;
}
- private static ObjectAction actionFor(ObjectSpecId owningType, ActionType actionType, String nameParmsId) {
- final ObjectSpecification objectSpec = SpecUtils.getSpecificationFor(owningType);
+ private static ObjectAction actionFor(
+ ObjectSpecId owningType,
+ ActionType actionType,
+ String nameParmsId,
+ final SpecificationLoader specificationLoader) {
+ final ObjectSpecification objectSpec = SpecUtils.getSpecificationFor(owningType, specificationLoader);
return objectSpec.getObjectAction(actionType, nameParmsId);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java
index fd92b44..d6d1fb3 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ActionParameterMemento.java
@@ -24,10 +24,11 @@ import java.io.Serializable;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
/**
* {@link Serializable} representation of a {@link ObjectActionParameter parameter}
- * of a {@link ObjecObjectAction}.
+ * of a {@link ObjectAction}.
*
* @see ActionMemento
*/
@@ -40,8 +41,11 @@ public class ActionParameterMemento implements Serializable {
private transient ObjectActionParameter actionParameter;
- public ActionParameterMemento(final ActionMemento actionMemento, final int number) {
- this(actionMemento, number, actionParameterFor(actionMemento, number));
+ public ActionParameterMemento(
+ final ActionMemento actionMemento,
+ final int number,
+ final SpecificationLoader specificationLoader) {
+ this(actionMemento, number, actionParameterFor(actionMemento, number, specificationLoader));
}
public ActionParameterMemento(final ObjectActionParameter actionParameter) {
@@ -65,23 +69,27 @@ public class ActionParameterMemento implements Serializable {
return number;
}
- public ObjectActionParameter getActionParameter() {
+ public ObjectActionParameter getActionParameter(final SpecificationLoader specificationLoader) {
if (actionParameter == null) {
- this.actionParameter = actionParameterFor(actionMemento, number);
+ this.actionParameter = actionParameterFor(actionMemento, number, specificationLoader);
}
return actionParameter;
}
- private static ObjectActionParameter actionParameterFor(ActionMemento actionMemento, int number) {
- final ObjectAction action = actionMemento.getAction();
+ private static ObjectActionParameter actionParameterFor(
+ final ActionMemento actionMemento,
+ final int number,
+ final SpecificationLoader specificationLoader) {
+ final ObjectAction action = actionMemento.getAction(specificationLoader);
return action.getParameters().get(number);
}
/**
* Convenience.
+ * @param specificationLoader
*/
- public ObjectSpecification getSpecification() {
- return getActionParameter().getSpecification();
+ public ObjectSpecification getSpecification(final SpecificationLoader specificationLoader) {
+ return getActionParameter(specificationLoader).getSpecification();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
index 13d3334..8b17d53 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
@@ -49,8 +49,8 @@ public class CollectionMemento implements Serializable {
public CollectionMemento(
final ObjectSpecId owningType,
- final String id) {
- this(owningType, id, collectionFor(owningType, id));
+ final String id, final SpecificationLoader specificationLoader) {
+ this(owningType, id, collectionFor(owningType, id, specificationLoader));
}
public CollectionMemento(final OneToManyAssociation collection, final IsisSessionFactory isisSessionFactory) {
@@ -78,19 +78,22 @@ public class CollectionMemento implements Serializable {
return id;
}
- public String getName() {
- return getCollection().getName();
+ public String getName(final SpecificationLoader specificationLoader) {
+ return getCollection(specificationLoader).getName();
}
- public OneToManyAssociation getCollection() {
+ public OneToManyAssociation getCollection(final SpecificationLoader specificationLoader) {
if (collection == null) {
- collection = collectionFor(owningType, id);
+ collection = collectionFor(owningType, id, specificationLoader);
}
return collection;
}
- private static OneToManyAssociation collectionFor(ObjectSpecId owningType, String id) {
- return (OneToManyAssociation) SpecUtils.getSpecificationFor(owningType).getAssociation(id);
+ private static OneToManyAssociation collectionFor(
+ ObjectSpecId owningType,
+ String id,
+ final SpecificationLoader specificationLoader) {
+ return (OneToManyAssociation) SpecUtils.getSpecificationFor(owningType, specificationLoader).getAssociation(id);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
index 0de17f1..a6e8a88 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
@@ -38,9 +38,9 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.memento.Memento;
import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
-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;
@@ -78,9 +78,13 @@ public class ObjectAdapterMemento implements Serializable {
*/
ENCODEABLE {
@Override
- ObjectAdapter recreateAdapter(final ObjectAdapterMemento oam, ConcurrencyChecking concurrencyChecking) {
+ ObjectAdapter recreateAdapter(
+ final ObjectAdapterMemento oam,
+ final ConcurrencyChecking concurrencyChecking,
+ final PersistenceSession persistenceSession,
+ final SpecificationLoader specificationLoader) {
ObjectSpecId objectSpecId = oam.objectSpecId;
- ObjectSpecification objectSpec = SpecUtils.getSpecificationFor(objectSpecId);
+ ObjectSpecification objectSpec = SpecUtils.getSpecificationFor(objectSpecId, specificationLoader);
final EncodableFacet encodableFacet = objectSpec.getFacet(EncodableFacet.class);
return encodableFacet.fromEncodedString(oam.encodableValue);
}
@@ -101,7 +105,9 @@ public class ObjectAdapterMemento implements Serializable {
}
@Override
- public void resetVersion(ObjectAdapterMemento objectAdapterMemento) {
+ public void resetVersion(
+ ObjectAdapterMemento objectAdapterMemento,
+ final PersistenceSession persistenceSession, final SpecificationLoader specificationLoader) {
}
},
/**
@@ -110,10 +116,13 @@ public class ObjectAdapterMemento implements Serializable {
*/
PERSISTENT {
@Override
- ObjectAdapter recreateAdapter(final ObjectAdapterMemento oam, ConcurrencyChecking concurrencyChecking) {
+ ObjectAdapter recreateAdapter(
+ final ObjectAdapterMemento oam,
+ ConcurrencyChecking concurrencyChecking,
+ final PersistenceSession persistenceSession, final SpecificationLoader specificationLoader) {
RootOid oid = OID_MARSHALLER.unmarshal(oam.persistentOidStr, RootOid.class);
try {
- final ObjectAdapter adapter = getPersistenceSession().adapterFor(oid, concurrencyChecking);
+ final ObjectAdapter adapter = persistenceSession.adapterFor(oid, concurrencyChecking);
return adapter;
} finally {
@@ -127,9 +136,13 @@ public class ObjectAdapterMemento implements Serializable {
}
@Override
- public void resetVersion(ObjectAdapterMemento oam) {
+ public void resetVersion(
+ ObjectAdapterMemento oam,
+ final PersistenceSession persistenceSession,
+ final SpecificationLoader specificationLoader) {
// REVIEW: this may be redundant because recreateAdapter also guarantees the version will be reset.
- final ObjectAdapter adapter = recreateAdapter(oam, ConcurrencyChecking.NO_CHECK);
+ final ObjectAdapter adapter = recreateAdapter(
+ oam, ConcurrencyChecking.NO_CHECK, persistenceSession, specificationLoader);
Oid oid = adapter.getOid();
oam.persistentOidStr = oid.enString(OID_MARSHALLER);
}
@@ -159,7 +172,10 @@ public class ObjectAdapterMemento implements Serializable {
* {@link AdapterManager.ConcurrencyChecking} is ignored for transients.
*/
@Override
- ObjectAdapter recreateAdapter(final ObjectAdapterMemento oam, ConcurrencyChecking concurrencyChecking) {
+ ObjectAdapter recreateAdapter(
+ final ObjectAdapterMemento oam,
+ ConcurrencyChecking concurrencyChecking,
+ final PersistenceSession persistenceSession, final SpecificationLoader specificationLoader) {
return oam.transientMemento.recreateObject();
}
@@ -179,22 +195,33 @@ public class ObjectAdapterMemento implements Serializable {
}
@Override
- public void resetVersion(ObjectAdapterMemento objectAdapterMemento) {
+ public void resetVersion(
+ ObjectAdapterMemento objectAdapterMemento,
+ final PersistenceSession persistenceSession, final SpecificationLoader specificationLoader) {
}
};
- public ObjectAdapter getAdapter(final ObjectAdapterMemento nom, ConcurrencyChecking concurrencyChecking) {
- return recreateAdapter(nom, concurrencyChecking);
+ public ObjectAdapter getAdapter(
+ final ObjectAdapterMemento nom,
+ ConcurrencyChecking concurrencyChecking,
+ final PersistenceSession persistenceSession,
+ final SpecificationLoader specificationLoader) {
+ return recreateAdapter(nom, concurrencyChecking, persistenceSession, specificationLoader);
}
- abstract ObjectAdapter recreateAdapter(ObjectAdapterMemento nom, ConcurrencyChecking concurrencyChecking);
+ abstract ObjectAdapter recreateAdapter(
+ ObjectAdapterMemento nom,
+ ConcurrencyChecking concurrencyChecking,
+ final PersistenceSession persistenceSession, final SpecificationLoader specificationLoader);
public abstract boolean equals(ObjectAdapterMemento oam, ObjectAdapterMemento other);
public abstract int hashCode(ObjectAdapterMemento objectAdapterMemento);
public abstract String toString(ObjectAdapterMemento adapterMemento);
- public abstract void resetVersion(ObjectAdapterMemento objectAdapterMemento);
+ public abstract void resetVersion(
+ ObjectAdapterMemento objectAdapterMemento,
+ final PersistenceSession persistenceSession, final SpecificationLoader specificationLoader);
}
private Type type;
@@ -277,8 +304,9 @@ public class ObjectAdapterMemento implements Serializable {
type = Type.PERSISTENT;
}
- public void resetVersion() {
- type.resetVersion(this);
+ public void resetVersion(
+ final PersistenceSession persistenceSession, final SpecificationLoader specificationLoader) {
+ type.resetVersion(this, persistenceSession, specificationLoader);
}
@@ -292,8 +320,10 @@ public class ObjectAdapterMemento implements Serializable {
* best to call once and then hold onto the value thereafter. Alternatively,
* can call {@link #setAdapter(ObjectAdapter)} to keep this memento in sync.
*/
- public ObjectAdapter getObjectAdapter(ConcurrencyChecking concurrencyChecking) {
- return type.getAdapter(this, concurrencyChecking);
+ public ObjectAdapter getObjectAdapter(
+ final ConcurrencyChecking concurrencyChecking,
+ final PersistenceSession persistenceSession, final SpecificationLoader specificationLoader) {
+ return type.getAdapter(this, concurrencyChecking, persistenceSession, specificationLoader);
}
/**
@@ -316,16 +346,20 @@ public class ObjectAdapterMemento implements Serializable {
* Analogous to {@link List#contains(Object)}, but does not perform
* {@link ConcurrencyChecking concurrency checking} of the OID.
*/
- public boolean containedIn(List<ObjectAdapterMemento> list) {
+ public boolean containedIn(
+ List<ObjectAdapterMemento> list,
+ final PersistenceSession persistenceSession,
+ final SpecificationLoader specificationLoader) {
// REVIEW: heavy handed, ought to be possible to just compare the OIDs
// ignoring the concurrency checking
- final ObjectAdapter currAdapter = getObjectAdapter(ConcurrencyChecking.NO_CHECK);
+ final ObjectAdapter currAdapter = getObjectAdapter(ConcurrencyChecking.NO_CHECK, persistenceSession,
+ specificationLoader);
for (ObjectAdapterMemento each : list) {
if(each == null) {
continue;
}
final ObjectAdapter otherAdapter = each.getObjectAdapter(
- ConcurrencyChecking.NO_CHECK);
+ ConcurrencyChecking.NO_CHECK, persistenceSession, specificationLoader);
if(currAdapter == otherAdapter) {
return true;
}
@@ -432,13 +466,15 @@ public class ObjectAdapterMemento implements Serializable {
}
- public static Function<ObjectAdapterMemento, ObjectAdapter> fromMemento(final
- ConcurrencyChecking concurrencyChecking) {
+ public static Function<ObjectAdapterMemento, ObjectAdapter> fromMemento(
+ final ConcurrencyChecking concurrencyChecking,
+ final PersistenceSession persistenceSession,
+ final SpecificationLoader specificationLoader) {
return new Function<ObjectAdapterMemento, ObjectAdapter>() {
@Override
public ObjectAdapter apply(final ObjectAdapterMemento from) {
try {
- return from.getObjectAdapter(concurrencyChecking);
+ return from.getObjectAdapter(concurrencyChecking, persistenceSession, specificationLoader);
} catch (ObjectNotFoundException e) {
// this can happen if for example the object is not visible (due to the security tenanted facet)
return null;
@@ -460,13 +496,5 @@ public class ObjectAdapterMemento implements Serializable {
}
-
- //////////////////////////////////////////////////
- // Dependencies (from context)
- //////////////////////////////////////////////////
-
- private static PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/95c3ecc1/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
index 6a4f951..1f153ca 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
@@ -73,12 +73,15 @@ public class PropertyMemento implements Serializable {
return identifier;
}
- public OneToOneAssociation getProperty() {
- return propertyFor(owningSpecId, identifier);
+ public OneToOneAssociation getProperty(final SpecificationLoader specificationLoader) {
+ return propertyFor(owningSpecId, identifier, specificationLoader);
}
- private static OneToOneAssociation propertyFor(ObjectSpecId owningType, String identifier) {
- return (OneToOneAssociation) SpecUtils.getSpecificationFor(owningType).getAssociation(identifier);
+ private static OneToOneAssociation propertyFor(
+ ObjectSpecId owningType,
+ String identifier,
+ final SpecificationLoader specificationLoader) {
+ return (OneToOneAssociation) SpecUtils.getSpecificationFor(owningType, specificationLoader).getAssociation(identifier);
}
/**
[48/50] [abbrv] isis git commit: ISIS-1335: fixes fa icon for the
rebuildMetamodel mixin action.
Posted by da...@apache.org.
ISIS-1335: fixes fa icon for the rebuildMetamodel mixin action.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3bae84e7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3bae84e7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3bae84e7
Branch: refs/heads/master
Commit: 3bae84e7a95347b67fa3c0887b18d9110aa6058b
Parents: bff240e
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jun 16 10:04:22 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jun 16 10:26:33 2016 +0100
----------------------------------------------------------------------
.../isis/applib/services/layout/Object_rebuildMetamodel.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3bae84e7/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_rebuildMetamodel.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_rebuildMetamodel.java b/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_rebuildMetamodel.java
index bc4d27f..69d0cb7 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_rebuildMetamodel.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_rebuildMetamodel.java
@@ -16,8 +16,6 @@
*/
package org.apache.isis.applib.services.layout;
-import javax.inject.Inject;
-
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.MemberOrder;
@@ -43,7 +41,7 @@ public class Object_rebuildMetamodel {
restrictTo = RestrictTo.PROTOTYPING
)
@ActionLayout(
- cssClassFa = "fa-trash-o",
+ cssClassFa = "fa-refresh",
position = ActionLayout.Position.PANEL_DROPDOWN
)
@MemberOrder(name = "Metadata", sequence = "800.1")
[13/50] [abbrv] isis git commit: ISIS-1427: simplifying IsisContext
and minimizing calls to it; also removed Localization (unused)
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java
index 7919404..04dc137 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ClobValueSemanticsProviderTest.java
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertThat;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
@@ -49,7 +48,7 @@ public class ClobValueSemanticsProviderTest extends ValueSemanticsProviderAbstra
@Test
public void testTitleOf() {
- assertEquals("myfile1.xml", value.displayTitleOf(clob, (Localization) null));
+ assertEquals("myfile1.xml", value.displayTitleOf(clob));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ColorValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ColorValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ColorValueSemanticsProviderTest.java
index 58c5625..ef9d6a9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ColorValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ColorValueSemanticsProviderTest.java
@@ -25,7 +25,6 @@ import static org.junit.Assert.fail;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.value.Color;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
@@ -49,14 +48,14 @@ public class ColorValueSemanticsProviderTest extends ValueSemanticsProviderAbstr
@Test
public void testParseValidString() throws Exception {
- final Object newValue = value.parseTextEntry(null, "#3366fF", null);
+ final Object newValue = value.parseTextEntry(null, "#3366fF");
assertEquals(color, newValue);
}
@Test
public void testParseInvalidString() throws Exception {
try {
- value.parseTextEntry(null, "red", null);
+ value.parseTextEntry(null, "red");
fail();
} catch (final TextEntryParseException expected) {
}
@@ -64,17 +63,17 @@ public class ColorValueSemanticsProviderTest extends ValueSemanticsProviderAbstr
@Test
public void testTitleOf() {
- assertEquals("#3366FF", value.displayTitleOf(color, (Localization) null));
+ assertEquals("#3366FF", value.displayTitleOf(color));
}
@Test
public void testTitleOfBlack() {
- assertEquals("Black", value.displayTitleOf(new Color(0), (Localization) null));
+ assertEquals("Black", value.displayTitleOf(new Color(0)));
}
@Test
public void testTitleOfWhite() {
- assertEquals("White", value.displayTitleOf(new Color(0xffffff), (Localization) null));
+ assertEquals("White", value.displayTitleOf(new Color(0xffffff)));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateTimeValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateTimeValueSemanticsProviderTest.java
index b30015b..363a7bf 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateTimeValueSemanticsProviderTest.java
@@ -74,7 +74,7 @@ public class DateTimeValueSemanticsProviderTest extends ValueSemanticsProviderAb
}
private void assertEntry(final String entry, final int year, final int month, final int day, final int hour, final int minute, final int second) {
- final Object object = adapter.parseTextEntry(null, entry, null);
+ final Object object = adapter.parseTextEntry(null, entry);
assertEquals(new DateTime(year, month, day, hour, minute, second), object);
}
@@ -100,7 +100,7 @@ public class DateTimeValueSemanticsProviderTest extends ValueSemanticsProviderAb
@Test
public void testEmptyClears() {
- assertNull(adapter.parseTextEntry(null, "", null));
+ assertNull(adapter.parseTextEntry(null, ""));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateValueSemanticsProviderTest.java
index b7d0483..5ccd091 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DateValueSemanticsProviderTest.java
@@ -61,85 +61,85 @@ public class DateValueSemanticsProviderTest extends ValueSemanticsProviderAbstra
@Test
public void testParseEntryOfDaysAfterDate() throws Exception {
- final Date parsed = adapter.parseTextEntry(date, "+7", null);
+ final Date parsed = adapter.parseTextEntry(date, "+7");
assertEquals(new Date(2001, 2, 11), parsed);
}
@Test
public void testParseEntryOfDaysAfterToToday() throws Exception {
- final Date parsed = adapter.parseTextEntry(null, "+5", null);
+ final Date parsed = adapter.parseTextEntry(null, "+5");
assertEquals(new Date(2003, 8, 22), parsed);
}
@Test
public void testParseEntryOfDaysBeforeDate() throws Exception {
- final Date parsed = adapter.parseTextEntry(date, "-7", null);
+ final Date parsed = adapter.parseTextEntry(date, "-7");
assertEquals(new Date(2001, 1, 28), parsed);
}
@Test
public void testParseEntryOfDaysBeforeToToday() throws Exception {
- final Date parsed = adapter.parseTextEntry(null, "-5", null);
+ final Date parsed = adapter.parseTextEntry(null, "-5");
assertEquals(new Date(2003, 8, 12), parsed);
}
@Test
public void testParseEntryOfKeywordToday() throws Exception {
- final Date parsed = adapter.parseTextEntry(date, "today", null);
+ final Date parsed = adapter.parseTextEntry(date, "today");
assertEquals(new Date(2003, 8, 17), parsed);
}
@Test
public void testParseEntryOfWeeksAfterDate() throws Exception {
- final Date parsed = adapter.parseTextEntry(date, "+3w", null);
+ final Date parsed = adapter.parseTextEntry(date, "+3w");
assertEquals(new Date(2001, 2, 25), parsed);
}
@Test
public void testParseEntryOfWeeksAfterToToday() throws Exception {
- final Date parsed = adapter.parseTextEntry(null, "+4w", null);
+ final Date parsed = adapter.parseTextEntry(null, "+4w");
assertEquals(new Date(2003, 9, 14), parsed);
}
@Test
public void testParseEntryOfWeeksBeforeDate() throws Exception {
- final Date parsed = adapter.parseTextEntry(date, "-3w", null);
+ final Date parsed = adapter.parseTextEntry(date, "-3w");
assertEquals(new Date(2001, 1, 14), parsed);
}
@Test
public void testParseEntryOfWeeksBeforeToToday() throws Exception {
- final Date parsed = adapter.parseTextEntry(null, "-4w", null);
+ final Date parsed = adapter.parseTextEntry(null, "-4w");
assertEquals(new Date(2003, 7, 20), parsed);
}
@Test
public void testParseEntryOfMonthsAfterDate() throws Exception {
- final Date parsed = adapter.parseTextEntry(date, "+3m", null);
+ final Date parsed = adapter.parseTextEntry(date, "+3m");
assertEquals(new Date(2001, 5, 4), parsed);
}
@Test
public void testParseEntryOfMonthsAfterToToday() throws Exception {
- final Date parsed = adapter.parseTextEntry(null, "+4m", null);
+ final Date parsed = adapter.parseTextEntry(null, "+4m");
assertEquals(new Date(2003, 12, 17), parsed);
}
@Test
public void testParseEntryOfMonthsBeforeDate() throws Exception {
- final Date parsed = adapter.parseTextEntry(date, "-3m", null);
+ final Date parsed = adapter.parseTextEntry(date, "-3m");
assertEquals(new Date(2000, 11, 4), parsed);
}
@Test
public void testParseEntryOfMonthsBeforeToToday() throws Exception {
- final Date parsed = adapter.parseTextEntry(null, "-4m", null);
+ final Date parsed = adapter.parseTextEntry(null, "-4m");
assertEquals(new Date(2003, 4, 17), parsed);
}
@Test(expected = TextEntryParseException.class)
public void illegalEntry() throws Exception {
- adapter.parseTextEntry(null, "xxx", null);
+ adapter.parseTextEntry(null, "xxx");
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
index 16885a1..fc6378f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
@@ -26,7 +26,6 @@ import org.jmock.Expectations;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
@@ -57,13 +56,13 @@ public class DoubleValueSemanticsProviderTest extends ValueSemanticsProviderAbst
@Test
public void testValue() {
- assertEquals("32.5", getValue().displayTitleOf(doubleObj, (Localization) null));
+ assertEquals("32.5", getValue().displayTitleOf(doubleObj));
}
@Test
public void testInvalidParse() throws Exception {
try {
- getValue().parseTextEntry(null, "one", null);
+ getValue().parseTextEntry(null, "one");
fail();
} catch (final TextEntryParseException expected) {
}
@@ -71,18 +70,18 @@ public class DoubleValueSemanticsProviderTest extends ValueSemanticsProviderAbst
@Test
public void testTitleOf() {
- assertEquals("35,000,000", getValue().displayTitleOf(Double.valueOf(35000000.0), (Localization) null));
+ assertEquals("35,000,000", getValue().displayTitleOf(Double.valueOf(35000000.0)));
}
@Test
public void testParse() throws Exception {
- final Object newValue = getValue().parseTextEntry(null, "120.56", null);
+ final Object newValue = getValue().parseTextEntry(null, "120.56");
assertEquals(120.56, ((Double) newValue).doubleValue(), 0.0);
}
@Test
public void testParse2() throws Exception {
- final Object newValue = getValue().parseTextEntry(null, "1,20.0", null);
+ final Object newValue = getValue().parseTextEntry(null, "1,20.0");
assertEquals(120, ((Double) newValue).doubleValue(), 0.0);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
index b3b7ef6..a3cd834 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
@@ -26,7 +26,6 @@ import org.jmock.Expectations;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
@@ -58,7 +57,7 @@ public class FloatValueSemanticsProviderTest extends ValueSemanticsProviderAbstr
@Test
public void testInvalidParse() throws Exception {
try {
- value.parseTextEntry(null, "one", null);
+ value.parseTextEntry(null, "one");
fail();
} catch (final TextEntryParseException expected) {
}
@@ -66,18 +65,18 @@ public class FloatValueSemanticsProviderTest extends ValueSemanticsProviderAbstr
@Test
public void testTitleOf() {
- assertEquals("32.5", value.displayTitleOf(float1, (Localization) null));
+ assertEquals("32.5", value.displayTitleOf(float1));
}
@Test
public void testParse() throws Exception {
- final Object parsed = value.parseTextEntry(null, "120.50", null);
+ final Object parsed = value.parseTextEntry(null, "120.50");
assertEquals(120.5f, ((Float) parsed).floatValue(), 0.0);
}
@Test
public void testParseBadlyFormatedEntry() throws Exception {
- final Object parsed = value.parseTextEntry(null, "1,20.0", null);
+ final Object parsed = value.parseTextEntry(null, "1,20.0");
assertEquals(120.0f, ((Float) parsed).floatValue(), 0.0);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
index 2414583..b4e5519 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
@@ -26,7 +26,6 @@ import org.jmock.Expectations;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
@@ -58,7 +57,7 @@ public class IntValueSemanticsProviderTest extends ValueSemanticsProviderAbstrac
@Test
public void testInvalidParse() throws Exception {
try {
- value.parseTextEntry(null, "one", null);
+ value.parseTextEntry(null, "one");
fail();
} catch (final TextEntryParseException expected) {
}
@@ -66,18 +65,18 @@ public class IntValueSemanticsProviderTest extends ValueSemanticsProviderAbstrac
@Test
public void testTitleString() {
- assertEquals("32", value.displayTitleOf(integer, (Localization) null));
+ assertEquals("32", value.displayTitleOf(integer));
}
@Test
public void testParse() throws Exception {
- final Object newValue = value.parseTextEntry(null, "120", null);
+ final Object newValue = value.parseTextEntry(null, "120");
assertEquals(Integer.valueOf(120), newValue);
}
@Test
public void testParseOddlyFormedEntry() throws Exception {
- final Object newValue = value.parseTextEntry(null, "1,20.0", null);
+ final Object newValue = value.parseTextEntry(null, "1,20.0");
assertEquals(Integer.valueOf(120), newValue);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
index 142ae7f..0df5fd2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
@@ -30,7 +30,6 @@ import org.jmock.Expectations;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
@@ -65,7 +64,7 @@ public class JavaSqlDateValueSemanticsProviderTest extends ValueSemanticsProvide
@Test
public void testInvalidParse() throws Exception {
try {
- adapter.parseTextEntry(null, "date", null);
+ adapter.parseTextEntry(null, "date");
fail();
} catch (final TextEntryParseException expected) {
}
@@ -73,12 +72,12 @@ public class JavaSqlDateValueSemanticsProviderTest extends ValueSemanticsProvide
@Test
public void testTitleOf() {
- assertEquals("1970-01-01", adapter.displayTitleOf(date, (Localization) null));
+ assertEquals("1970-01-01", adapter.displayTitleOf(date));
}
@Test
public void testParse() throws Exception {
- final Object newValue = adapter.parseTextEntry(null, "1/1/1980", null);
+ final Object newValue = adapter.parseTextEntry(null, "1/1/1980");
final Calendar calendar = Calendar.getInstance();
calendar.setTimeZone(TimeZone.getTimeZone("Etc/UTC"));
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeStampValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeStampValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeStampValueSemanticsProviderTest.java
index a1a11b9..db97583 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeStampValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeStampValueSemanticsProviderTest.java
@@ -55,13 +55,13 @@ public class JavaSqlTimeStampValueSemanticsProviderTest extends ValueSemanticsPr
@Override
public void testParseEmptyString() {
- final Object parsed = adapter.parseTextEntry(null, "", null);
+ final Object parsed = adapter.parseTextEntry(null, "");
assertNull(parsed);
}
@Test
public void testTitle() {
- assertEquals("01/01/70 00:00:00 UTC", adapter.titleString(timestamp, null));
+ assertEquals("01/01/70 00:00:00 UTC", adapter.titleString(timestamp));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
index 9d66cb6..0db1744 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
@@ -30,7 +30,6 @@ import org.jmock.Expectations;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
@@ -65,7 +64,7 @@ public class JavaUtilDateValueSemanticsProviderTest extends ValueSemanticsProvid
@Test
public void testInvalidParse() throws Exception {
try {
- getValue().parseTextEntry(null, "invalid entry", null);
+ getValue().parseTextEntry(null, "invalid entry");
fail();
} catch (final TextEntryParseException expected) {
}
@@ -79,12 +78,12 @@ public class JavaUtilDateValueSemanticsProviderTest extends ValueSemanticsProvid
@Test
public void testTitleOf() {
final String EXPECTED = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new java.util.Date(0));
- assertEquals(EXPECTED, getValue().displayTitleOf(date, (Localization) null));
+ assertEquals(EXPECTED, getValue().displayTitleOf(date));
}
@Test
public void testParse() throws Exception {
- final Object newValue = getValue().parseTextEntry(null, "1980-01-01 10:40", null);
+ final Object newValue = getValue().parseTextEntry(null, "1980-01-01 10:40");
final Calendar calendar = Calendar.getInstance();
calendar.setTimeZone(TimeZone.getTimeZone("Etc/UTC"));
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
index 79fc899..b397fa3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
@@ -26,7 +26,6 @@ import org.jmock.Expectations;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
@@ -59,7 +58,7 @@ public class LongValueSemanticsProviderTest extends ValueSemanticsProviderAbstra
@Test
public void testInvalidParse() throws Exception {
try {
- value.parseTextEntry(null, "one", null);
+ value.parseTextEntry(null, "one");
fail();
} catch (final TextEntryParseException expected) {
}
@@ -67,18 +66,18 @@ public class LongValueSemanticsProviderTest extends ValueSemanticsProviderAbstra
@Test
public void testOutputAsString() {
- assertEquals("367,322", value.displayTitleOf(longObj, (Localization) null));
+ assertEquals("367,322", value.displayTitleOf(longObj));
}
@Test
public void testParse() throws Exception {
- final Object parsed = value.parseTextEntry(null, "120", null);
+ final Object parsed = value.parseTextEntry(null, "120");
assertEquals("120", parsed.toString());
}
@Test
public void testParseWithBadlyFormattedEntry() throws Exception {
- final Object parsed = value.parseTextEntry(null, "1,20.0", null);
+ final Object parsed = value.parseTextEntry(null, "1,20.0");
assertEquals("120", parsed.toString());
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/MoneyValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
index 8b1bfe7..9d8d7f8 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/MoneyValueSemanticsProviderTest.java
@@ -27,7 +27,6 @@ import java.util.Locale;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.value.Money;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
@@ -75,30 +74,30 @@ public class MoneyValueSemanticsProviderTest extends ValueSemanticsProviderAbstr
@Test
public void testTitleOfWithPounds() {
originalMoney = new Money(10.5, "gbp");
- assertEquals(POUND_SYMBOL + "10.50", adapter.displayTitleOf(originalMoney, (Localization) null));
+ assertEquals(POUND_SYMBOL + "10.50", adapter.displayTitleOf(originalMoney));
}
@Test
public void testTitleOfWithNonLocalCurrency() {
- assertEquals("10.50 USD", adapter.displayTitleOf(createMoney(10.50, "usd"), (Localization) null));
+ assertEquals("10.50 USD", adapter.displayTitleOf(createMoney(10.50, "usd")));
}
@Test
public void testTitleWithUnknownCurrency() {
- assertEquals("10.50 UNK", adapter.displayTitleOf(createMoney(10.50, "UNK"), (Localization) null));
+ assertEquals("10.50 UNK", adapter.displayTitleOf(createMoney(10.50, "UNK")));
}
@Test
public void testUserEntryWithCurrency() {
final Money money = createMoney(10.5, "gbp");
- final Money parsed = adapter.parseTextEntry(money, "22.45 USD", null);
+ final Money parsed = adapter.parseTextEntry(money, "22.45 USD");
assertEquals(new Money(22.45, "usd"), parsed);
}
@Test
public void testNewUserEntryUsesPreviousCurrency() {
originalMoney = new Money(10.5, "gbp");
- final Object parsed = adapter.parseTextEntry(originalMoney, "22.45", null);
+ final Object parsed = adapter.parseTextEntry(originalMoney, "22.45");
assertEquals(new Money(22.45, "gbp"), parsed);
}
@@ -106,28 +105,28 @@ public class MoneyValueSemanticsProviderTest extends ValueSemanticsProviderAbstr
public void testReplacementEntryForDefaultCurrency() {
// MoneyValueSemanticsProvider adapter = new
// MoneyValueSemanticsProvider(new Money(10.3, "gbp"));
- final Object parsed = adapter.parseTextEntry(originalMoney, POUND_SYMBOL + "80.90", null);
+ final Object parsed = adapter.parseTextEntry(originalMoney, POUND_SYMBOL + "80.90");
assertEquals(new Money(80.90, "gbp"), parsed);
}
@Test
public void testSpecifyingCurrencyInEntry() {
- final Object parsed = adapter.parseTextEntry(originalMoney, "3021.50 EUr", null);
- assertEquals("3,021.50 EUR", adapter.displayTitleOf(parsed, (Localization) null));
+ final Object parsed = adapter.parseTextEntry(originalMoney, "3021.50 EUr");
+ assertEquals("3,021.50 EUR", adapter.displayTitleOf(parsed));
}
@Test
public void testUsingLocalCurrencySymbol() {
// MoneyValueSemanticsProvider adapter = new
// MoneyValueSemanticsProvider(new Money(0L, "gbp"));
- final Object parsed = adapter.parseTextEntry(originalMoney, POUND_SYMBOL + "3021.50", null);
- assertEquals(POUND_SYMBOL + "3,021.50", adapter.titleString(parsed, null));
+ final Object parsed = adapter.parseTextEntry(originalMoney, POUND_SYMBOL + "3021.50");
+ assertEquals(POUND_SYMBOL + "3,021.50", adapter.titleString(parsed));
}
@Test
public void testInvalidCurrencyCodeIsRejected() throws Exception {
try {
- adapter.parseTextEntry(originalMoney, "3021.50 XYZ", null);
+ adapter.parseTextEntry(originalMoney, "3021.50 XYZ");
fail("invalid code accepted " + adapter);
} catch (final TextEntryParseException expected) {
}
@@ -136,7 +135,7 @@ public class MoneyValueSemanticsProviderTest extends ValueSemanticsProviderAbstr
@Test
public void testInvalidCurrencySymbolIsRejected() throws Exception {
try {
- adapter.parseTextEntry(originalMoney, EURO_SYMBOL + "3021.50", null);
+ adapter.parseTextEntry(originalMoney, EURO_SYMBOL + "3021.50");
fail("invalid code accepted " + adapter);
} catch (final TextEntryParseException expected) {
}
@@ -144,15 +143,15 @@ public class MoneyValueSemanticsProviderTest extends ValueSemanticsProviderAbstr
@Test
public void testNewValueDefaultsToLocalCurrency() throws Exception {
- final Money parsed = adapter.parseTextEntry(originalMoney, "3021.50", null);
- assertEquals(POUND_SYMBOL + "3,021.50", adapter.displayTitleOf(parsed, (Localization) null));
+ final Money parsed = adapter.parseTextEntry(originalMoney, "3021.50");
+ assertEquals(POUND_SYMBOL + "3,021.50", adapter.displayTitleOf(parsed));
}
@Test
public void testUnrelatedCurrencySymbolIsRejected() throws Exception {
final Money money = createMoney(1, "eur");
try {
- adapter.parseTextEntry(money, "$3021.50", null);
+ adapter.parseTextEntry(money, "$3021.50");
fail("invalid code accepted " + adapter);
} catch (final TextEntryParseException expected) {
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PercentageValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
index 6d2ce17..6461fde 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
@@ -25,7 +25,6 @@ import org.jmock.Expectations;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.value.Percentage;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
@@ -61,19 +60,19 @@ public class PercentageValueSemanticsProviderTest extends ValueSemanticsProvider
@Test
public void testParseTextEntryWithNumber() {
- final Percentage parsed = adapter.parseTextEntry(percentage, "21%", null);
+ final Percentage parsed = adapter.parseTextEntry(percentage, "21%");
assertEquals(new Percentage(0.21f), parsed);
}
@Test
public void testParseTextEntryWithNumberAndDecimalPoint() {
- final Percentage parsed = adapter.parseTextEntry(percentage, "21.4%", null);
+ final Percentage parsed = adapter.parseTextEntry(percentage, "21.4%");
assertEquals(new Percentage(0.214f), parsed);
}
@Test
public void testParseTextEntryWithBlank() {
- final Percentage parsed = adapter.parseTextEntry(percentage, "", null);
+ final Percentage parsed = adapter.parseTextEntry(percentage, "");
assertEquals(null, parsed);
}
@@ -85,7 +84,7 @@ public class PercentageValueSemanticsProviderTest extends ValueSemanticsProvider
@Test
public void testTitleOf() {
- assertEquals("10%", adapter.displayTitleOf(percentage, (Localization) null));
+ assertEquals("10%", adapter.displayTitleOf(percentage));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
index 811add6..86fe655 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/PolishMoneyValueSemanticsProviderTest.java
@@ -30,7 +30,6 @@ import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.applib.value.Money;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
@@ -83,62 +82,62 @@ public class PolishMoneyValueSemanticsProviderTest extends ValueSemanticsProvide
@Test
public void testTitleOfWithZlotych() {
- assertEquals("10,5 " + ZLOTYCH_SYMBOL, adapter.displayTitleOf(originalMoney, (Localization) null));
+ assertEquals("10,5 " + ZLOTYCH_SYMBOL, adapter.displayTitleOf(originalMoney));
}
@Test
public void testTitleOfWithNonLocalCurrency() {
- assertEquals("10,5 USD", adapter.displayTitleOf(createMoney(10.50, "usd"), (Localization) null));
+ assertEquals("10,5 USD", adapter.displayTitleOf(createMoney(10.50, "usd")));
}
@Test
public void testTitleWithUnknownCurrency() {
- assertEquals("10,5 UNK", adapter.displayTitleOf(createMoney(10.50, "UNK"), (Localization) null));
+ assertEquals("10,5 UNK", adapter.displayTitleOf(createMoney(10.50, "UNK")));
}
@Test
public void testUserEntryWithCurrency() {
final Money money = createMoney(10.5, "gbp");
- final Money parsed = adapter.parseTextEntry(money, "22,45 USD", null);
+ final Money parsed = adapter.parseTextEntry(money, "22,45 USD");
assertEquals(new Money(22.45, "usd"), parsed);
}
@Test
public void testUserEntryUsesPreviousCurrency() {
- final Object parsed = adapter.parseTextEntry(originalMoney, "22,45", null);
+ final Object parsed = adapter.parseTextEntry(originalMoney, "22,45");
assertEquals(new Money(22.45, "pln"), parsed);
}
@Test
public void testReplacementEntryForDefaultCurrency() {
- final Object parsed = adapter.parseTextEntry(originalMoney, "80,90 " + ZLOTYCH_SYMBOL, null);
+ final Object parsed = adapter.parseTextEntry(originalMoney, "80,90 " + ZLOTYCH_SYMBOL);
assertEquals(new Money(80.90, "pln"), parsed);
}
@Test
public void testSpecifyingCurrencyInEntry() {
- final Object parsed = adapter.parseTextEntry(originalMoney, "3021,50 cad", null);
- assertEquals("3" + CURRENCY_SPACE + "021,5 CAD", adapter.displayTitleOf(parsed, (Localization) null));
+ final Object parsed = adapter.parseTextEntry(originalMoney, "3021,50 cad");
+ assertEquals("3" + CURRENCY_SPACE + "021,5 CAD", adapter.displayTitleOf(parsed));
}
@Test
public void testUsingLocalCurrencySymbol() {
// MoneyValueSemanticsProvider adapter = new
// MoneyValueSemanticsProvider(new Money(0L, "gbp"));
- final Object parsed = adapter.parseTextEntry(originalMoney, "3021,50 " + ZLOTYCH_SYMBOL, null);
- assertEquals("3" + CURRENCY_SPACE + "021,5 " + ZLOTYCH_SYMBOL, adapter.titleString(parsed, (Localization) null));
+ final Object parsed = adapter.parseTextEntry(originalMoney, "3021,50 " + ZLOTYCH_SYMBOL);
+ assertEquals("3" + CURRENCY_SPACE + "021,5 " + ZLOTYCH_SYMBOL, adapter.titleString(parsed));
}
@Test
public void testInvalidCurrencySuffixRejected() throws Exception {
- final Object parsed = adapter.parseTextEntry(originalMoney, "3" + CURRENCY_SPACE + "021,50 Dm", null);
- assertEquals("3" + CURRENCY_SPACE + "021,5 " + ZLOTYCH_SYMBOL, adapter.titleString(parsed, null));
+ final Object parsed = adapter.parseTextEntry(originalMoney, "3" + CURRENCY_SPACE + "021,50 Dm");
+ assertEquals("3" + CURRENCY_SPACE + "021,5 " + ZLOTYCH_SYMBOL, adapter.titleString(parsed));
}
@Test
public void testInvalidCurrencySymbolIsRejected() throws Exception {
try {
- adapter.parseTextEntry(originalMoney, EURO_SYMBOL + "3021.50", null);
+ adapter.parseTextEntry(originalMoney, EURO_SYMBOL + "3021.50");
fail("invalid code accepted " + adapter);
} catch (final TextEntryParseException expected) {
}
@@ -146,15 +145,15 @@ public class PolishMoneyValueSemanticsProviderTest extends ValueSemanticsProvide
@Test
public void testNewValueDefaultsToLocalCurrency() throws Exception {
- final Money parsed = adapter.parseTextEntry(originalMoney, "3021,50", null);
- assertEquals("3" + CURRENCY_SPACE + "021,5 " + ZLOTYCH_SYMBOL, adapter.displayTitleOf(parsed, (Localization) null));
+ final Money parsed = adapter.parseTextEntry(originalMoney, "3021,50");
+ assertEquals("3" + CURRENCY_SPACE + "021,5 " + ZLOTYCH_SYMBOL, adapter.displayTitleOf(parsed));
}
@Test
public void testUnrelatedCurrencySymbolIsRejected() throws Exception {
final Money money = createMoney(1, "eur");
try {
- adapter.parseTextEntry(money, "$3021.50", null);
+ adapter.parseTextEntry(money, "$3021.50");
fail("invalid code accepted " + adapter);
} catch (final TextEntryParseException expected) {
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
index 558a31b..d4f30bf 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
@@ -26,7 +26,6 @@ import org.jmock.Expectations;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
@@ -59,7 +58,7 @@ public class ShortValueSemanticsProviderTest extends ValueSemanticsProviderAbstr
@Test
public void testInvalidParse() throws Exception {
try {
- value.parseTextEntry(null, "one", null);
+ value.parseTextEntry(null, "one");
fail();
} catch (final TextEntryParseException expected) {
}
@@ -67,23 +66,23 @@ public class ShortValueSemanticsProviderTest extends ValueSemanticsProviderAbstr
@Test
public void testTitleOfForPositiveValue() {
- assertEquals("32", value.displayTitleOf(short1, (Localization) null));
+ assertEquals("32", value.displayTitleOf(short1));
}
@Test
public void testTitleOfForLargestNegativeValue() {
- assertEquals("-128", value.displayTitleOf(Short.valueOf((short) -128), (Localization) null));
+ assertEquals("-128", value.displayTitleOf(Short.valueOf((short) -128)));
}
@Test
public void testParse() throws Exception {
- final Object newValue = value.parseTextEntry(null, "120", null);
+ final Object newValue = value.parseTextEntry(null, "120");
assertEquals(Short.valueOf((short) 120), newValue);
}
@Test
public void testParseOfOddEntry() throws Exception {
- final Object newValue = value.parseTextEntry(null, "1,20.0", null);
+ final Object newValue = value.parseTextEntry(null, "1,20.0");
assertEquals(Short.valueOf((short) 120), newValue);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/StringValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/StringValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/StringValueSemanticsProviderTest.java
index 70b82ba..fa5e41e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/StringValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/StringValueSemanticsProviderTest.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.value.string.StringValueSemanticsProvider;
@@ -46,12 +45,12 @@ public class StringValueSemanticsProviderTest extends ValueSemanticsProviderAbst
@Test
public void testTitleOf() {
- assertEquals("text entry", value.displayTitleOf(string, (Localization) null));
+ assertEquals("text entry", value.displayTitleOf(string));
}
@Test
public void testParse() throws Exception {
- final Object parsed = value.parseTextEntry(null, "tRUe", null);
+ final Object parsed = value.parseTextEntry(null, "tRUe");
assertEquals("tRUe", parsed.toString());
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeStampValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeStampValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeStampValueSemanticsProviderTest.java
index 361f9ad..bbe1d32 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeStampValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeStampValueSemanticsProviderTest.java
@@ -54,13 +54,13 @@ public class TimeStampValueSemanticsProviderTest extends ValueSemanticsProviderA
@Override
public void testParseEmptyString() {
- final Object parsed = adapter.parseTextEntry(null, "", null);
+ final Object parsed = adapter.parseTextEntry(null, "");
assertNull(parsed);
}
@Test
public void testTitle() {
- assertEquals("01/01/70 00:00:00 UTC", adapter.titleString(timestamp, null));
+ assertEquals("01/01/70 00:00:00 UTC", adapter.titleString(timestamp));
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeValueSemanticsProviderTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeValueSemanticsProviderTest.java
index 964081d..976ecb2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/TimeValueSemanticsProviderTest.java
@@ -61,14 +61,14 @@ public class TimeValueSemanticsProviderTest extends ValueSemanticsProviderAbstra
@Test
public void testParseEntryOfHoursMinutesText() throws Exception {
- final Object parsed = adapter.parseTextEntry(null, "8:30", null);
+ final Object parsed = adapter.parseTextEntry(null, "8:30");
assertEquals(new Time(8, 30), parsed);
}
@Test
@Ignore
public void testParseEntryOfHoursMinutesSecondsText() throws Exception {
- final Object parsed = adapter.parseTextEntry(null, "8:30:45", null);
+ final Object parsed = adapter.parseTextEntry(null, "8:30:45");
// I can't get the text parser to parse HH:mm:ss before HH:mm!!
final Time expected = new Time(8, 30, 45);
assertEquals(expected, parsed);
@@ -76,31 +76,31 @@ public class TimeValueSemanticsProviderTest extends ValueSemanticsProviderAbstra
@Test
public void testParseEntryOfHoursAfterTime() throws Exception {
- final Object parsed = adapter.parseTextEntry(time, "+5H", null);
+ final Object parsed = adapter.parseTextEntry(time, "+5H");
assertEquals(new Time(13, 13), parsed);
}
@Test
public void testParseEntryOfHoursAfterNow() throws Exception {
- final Object parsed = adapter.parseTextEntry(null, "+5H", null);
+ final Object parsed = adapter.parseTextEntry(null, "+5H");
assertEquals(new Time(2, 30, 25), parsed);
}
@Test
public void testParseEntryOfHoursBeforeTime() throws Exception {
- final Object parsed = adapter.parseTextEntry(time, "-7H", null);
+ final Object parsed = adapter.parseTextEntry(time, "-7H");
assertEquals(new Time(1, 13), parsed);
}
@Test
public void testParseEntryOfHoursBeforeToNow() throws Exception {
- final Object parsed = adapter.parseTextEntry(null, "-5H", null);
+ final Object parsed = adapter.parseTextEntry(null, "-5H");
assertEquals(new Time(16, 30, 25), parsed);
}
@Test
public void testParseEntryOfKeywordNow() throws Exception {
- final Object parsed = adapter.parseTextEntry(time, "now", null);
+ final Object parsed = adapter.parseTextEntry(time, "now");
assertEquals(new Time(), parsed);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index cae4912..aa47c93 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -31,11 +31,8 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.facets.object.encodeable.encoder.EncodableFacetUsingEncoderDecoder;
@@ -156,7 +153,7 @@ public abstract class ValueSemanticsProviderAbstractTestCase {
public void testParseNull() throws Exception {
Assume.assumeThat(valueSemanticsProvider.getParser(), is(not(nullValue())));
try {
- valueSemanticsProvider.parseTextEntry(null, null, null);
+ valueSemanticsProvider.parseTextEntry(null, null);
fail();
} catch (final IllegalArgumentException expected) {
}
@@ -166,7 +163,7 @@ public abstract class ValueSemanticsProviderAbstractTestCase {
public void testParseEmptyString() throws Exception {
Assume.assumeThat(valueSemanticsProvider.getParser(), is(not(nullValue())));
- final Object newValue = valueSemanticsProvider.parseTextEntry(null, "", null);
+ final Object newValue = valueSemanticsProvider.parseTextEntry(null, "");
assertNull(newValue);
}
@@ -187,6 +184,6 @@ public abstract class ValueSemanticsProviderAbstractTestCase {
@Test
public void testTitleOfForNullObject() {
- assertEquals("", valueSemanticsProvider.displayTitleOf(null, (Localization) null));
+ assertEquals("", valueSemanticsProvider.displayTitleOf(null));
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
index 69d56fd..e1cd597 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
@@ -44,7 +44,6 @@ import org.apache.isis.core.metamodel.layoutmetadata.LayoutMetadataReader;
import org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson;
import org.apache.isis.core.metamodel.metamodelvalidator.dflt.MetaModelValidatorDefault;
import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.services.l10n.LocalizationProviderInternal;
import org.apache.isis.core.metamodel.services.msgbroker.MessageBrokerServiceInternal;
import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.services.transtate.TransactionStateProviderInternal;
@@ -73,8 +72,6 @@ public abstract class SpecificationLoaderTestAbstract {
private TransactionStateProviderInternal mockTransactionStateProviderInternal;
@Mock
private MessageBrokerServiceInternal mockMessageBrokerServiceInternal;
- @Mock
- private LocalizationProviderInternal mockLocalizationProviderInternal;
ServicesInjector stubServicesInjector;
IsisConfigurationDefault stubConfiguration;
@@ -96,7 +93,6 @@ public abstract class SpecificationLoaderTestAbstract {
ignoring(mockPersistenceSessionServiceInternal);
ignoring(mockTransactionStateProviderInternal);
ignoring(mockMessageBrokerServiceInternal);
- ignoring(mockLocalizationProviderInternal);
}});
@@ -109,7 +105,6 @@ public abstract class SpecificationLoaderTestAbstract {
stubConfiguration,
mockDeploymentCategoryProvider,
mockPersistenceSessionServiceInternal,
- mockLocalizationProviderInternal,
mockMessageBrokerServiceInternal,
mockTransactionStateProviderInternal,
mockGridService,
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
index c70d616..52bc0e6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
@@ -31,7 +31,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.applib.filter.Filter;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
@@ -83,7 +82,7 @@ public class ObjectActionParameterAbstractTest_getId_and_getName {
public String isValid(
final ObjectAdapter objectAdapter,
final Object proposedValue,
- final InteractionInitiatedBy interactionInitiatedBy, final Localization localization) {
+ final InteractionInitiatedBy interactionInitiatedBy) {
return null;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
index 6720a7e..a9e95f0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
@@ -27,7 +27,6 @@ import com.google.common.collect.Lists;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.filter.Filter;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -241,12 +240,14 @@ public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSp
}
@Override
- public String getTitle(final ObjectAdapter targetAdapter, final Localization localization) {
- return getTitle(null, targetAdapter, localization);
+ public String getTitle(final ObjectAdapter targetAdapter) {
+ return getTitle(null, targetAdapter);
}
@Override
- public String getTitle(final ObjectAdapter contextAdapterIfAny, final ObjectAdapter targetAdapter, final Localization localization) {
+ public String getTitle(
+ final ObjectAdapter contextAdapterIfAny,
+ final ObjectAdapter targetAdapter) {
return title;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
index 1d9a39c..822a496 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
@@ -72,7 +72,7 @@ public class AuthenticationManagerStandardForDfltRuntime extends AuthenticationM
@Override
public void closeSession(final AuthenticationSession session) {
super.closeSession(session);
- IsisContext.closeSession();
+ IsisContext.getSessionFactory().closeSession();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
index b7d4390..efd7419 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
@@ -30,6 +30,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import javax.inject.Inject;
+
import com.google.common.collect.Maps;
import org.slf4j.Logger;
@@ -42,12 +44,12 @@ import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetU
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
-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.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
public class ObjectFixtureFilePersistor {
@@ -57,7 +59,7 @@ public class ObjectFixtureFilePersistor {
final Set<Object> objects = new HashSet<Object>();
final BufferedReader buffer = new BufferedReader(reader);
- final LoadedObjects loaded = new LoadedObjects(objects);
+ final LoadedObjects loaded = new LoadedObjects(objects, specificationLoader, getPersistenceSession());
String line;
ObjectAdapter object = null;
int lineNo = 0;
@@ -114,7 +116,7 @@ public class ObjectFixtureFilePersistor {
} else if (association.getSpecification().isParseable()) {
data = data.replaceAll("\\n", "\n");
final ParseableFacet facet = association.getSpecification().getFacet(ParseableFacet.class);
- final ObjectAdapter value = facet.parseTextEntry(null, data, InteractionInitiatedBy.FRAMEWORK, null);
+ final ObjectAdapter value = facet.parseTextEntry(null, data, InteractionInitiatedBy.FRAMEWORK);
((OneToOneAssociation) association).initAssociation(object, value);
} else if (association.isOneToOneAssociation()) {
final ObjectAdapter value = loaded.get(data);
@@ -177,15 +179,16 @@ public class ObjectFixtureFilePersistor {
}
}
-
-
+
+ @Inject
+ IsisSessionFactory isisSessionFactory;
+
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return isisSessionFactory.getCurrentSession().getPersistenceSession();
}
- protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSpecificationLoader();
- }
+ @Inject
+ SpecificationLoader specificationLoader;
}
@@ -193,9 +196,16 @@ public class ObjectFixtureFilePersistor {
class LoadedObjects {
private final Map<String, ObjectAdapter> idMap = Maps.newHashMap();
private final Set<Object> objects;
+ private final SpecificationLoader specificationLoader;
+ private final PersistenceSession persistenceSession;
- public LoadedObjects(final Set<Object> objects) {
+ public LoadedObjects(
+ final Set<Object> objects,
+ final SpecificationLoader specificationLoader,
+ final PersistenceSession persistenceSession) {
this.objects = objects;
+ this.specificationLoader = specificationLoader;
+ this.persistenceSession = persistenceSession;
}
public ObjectAdapter get(final String data) {
@@ -207,22 +217,13 @@ class LoadedObjects {
ObjectAdapter object = idMap.get(id);
if (object == null) {
final String className = data.substring(0, pos);
- final ObjectSpecification specification = getSpecificationLoader().loadSpecification(className);
- object = getPersistenceSession().createTransientInstance(specification);
+ final ObjectSpecification specification = specificationLoader.loadSpecification(className);
+ object = persistenceSession.createTransientInstance(specification);
idMap.put(id, object);
objects.add(object.getObject());
}
return object;
}
-
-
- protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
- }
-
- protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSpecificationLoader();
- }
}
class SavedObjects {
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
index 8ec93fd..c7ae44b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
@@ -27,16 +27,21 @@ import java.io.IOException;
import java.util.List;
import java.util.Set;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
import com.google.common.collect.Sets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.isis.applib.AbstractService;
-import org.apache.isis.applib.annotation.DescribedAs;
-import org.apache.isis.applib.annotation.Exploration;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.RestrictTo;
+import org.apache.isis.applib.services.registry.ServiceRegistry2;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -47,8 +52,8 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.Persistability;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-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;
public class ObjectFixtureService {
@@ -56,9 +61,17 @@ public class ObjectFixtureService {
private static final String DATA_FILEPATH = ConfigurationConstants.ROOT + "exploration-objects.file";
private static final String DEFAULT_FILEPATH = "fixture-data";
- private final ObjectFixtureFilePersistor persistor = new ObjectFixtureFilePersistor();
+ private ObjectFixtureFilePersistor persistor;
+
private Set<Object> objects = Sets.newHashSet();
+
+ @PostConstruct
+ public void init() {
+ persistor = new ObjectFixtureFilePersistor();
+ serviceRegistry.injectServicesInto(persistor);
+ }
+
// {{ title, Id
public String title() {
return "Fixture Objects";
@@ -75,9 +88,13 @@ public class ObjectFixtureService {
// }}
// {{ action: save
- @DescribedAs("Add this object to the set of saved objects")
+ @Action(
+ restrictTo = RestrictTo.PROTOTYPING
+ )
+ @ActionLayout(
+ describedAs = "Add this object to the set of saved objects"
+ )
@MemberOrder(sequence = "1")
- @Exploration
public void save(final Object object) {
final ObjectAdapter adapter = getPersistenceSession().adapterFor(object);
if (adapter.getSpecification().persistability() != Persistability.TRANSIENT) {
@@ -126,9 +143,13 @@ public class ObjectFixtureService {
// }}
// {{ action: remove
- @DescribedAs("Remove this object from the set of saved objects")
+ @Action(
+ restrictTo = RestrictTo.PROTOTYPING
+ )
+ @ActionLayout(
+ describedAs = "Remove this object from the set of saved objects"
+ )
@MemberOrder(sequence = "2")
- @Exploration
public void remove(final Object object) {
objects.remove(object);
saveAll();
@@ -144,9 +165,13 @@ public class ObjectFixtureService {
// }}
// {{ action: all Saved Objects
- @DescribedAs("Retrieved all the saved objects")
+ @Action(
+ restrictTo = RestrictTo.PROTOTYPING
+ )
+ @ActionLayout(
+ describedAs = "Retrieved all the saved objects"
+ )
@MemberOrder(sequence = "4")
- @Exploration
public Set<Object> allSavedObjects() {
return objects;
}
@@ -154,9 +179,13 @@ public class ObjectFixtureService {
// }}
// {{ action: saveAll
- @DescribedAs("Save the current state of the saved objects")
+ @Action(
+ restrictTo = RestrictTo.PROTOTYPING
+ )
+ @ActionLayout(
+ describedAs = "Save the current state of the saved objects"
+ )
@MemberOrder(sequence = "3")
- @Exploration
public void saveAll() {
FileWriter out = null;
try {
@@ -178,11 +207,7 @@ public class ObjectFixtureService {
// }}
- // //////////////////////////////////////////////////////////////////
- // programmatic
- // //////////////////////////////////////////////////////////////////
-
- // {{ loadFile (ignored)
+ // {{ loadFile (programmtic)
@Programmatic
public void loadFile() {
FileReader reader = null;
@@ -206,7 +231,7 @@ public class ObjectFixtureService {
}
private File file(final boolean createFileIfDoesntExist) throws IOException {
- final String fixturePath = getConfiguration().getString(DATA_FILEPATH, DEFAULT_FILEPATH);
+ final String fixturePath = configuration.getString(DATA_FILEPATH, DEFAULT_FILEPATH);
final File file = new File(fixturePath);
final File directory = file.getParentFile();
mkdirIfRequired(directory);
@@ -226,17 +251,18 @@ public class ObjectFixtureService {
file.createNewFile();
}
// }}
-
- // //////////////////////////////////////////////////////////////////
- // from context
- // //////////////////////////////////////////////////////////////////
+
+ @Inject
+ IsisSessionFactory isisSessionFactory;
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return isisSessionFactory.getCurrentSession().getPersistenceSession();
}
- protected IsisConfiguration getConfiguration() {
- return IsisContext.getConfiguration();
- }
+ @Inject
+ IsisConfiguration configuration;
+
+ @Inject
+ ServiceRegistry2 serviceRegistry;
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
index c54a01b..68afcb5 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
@@ -216,7 +216,7 @@ public class FixturesInstallerDelegate {
private boolean shouldInstallFixture(final InstallableFixture installableFixture) {
final FixtureType fixtureType = installableFixture.getType();
if (fixtureType == FixtureType.DOMAIN_OBJECTS) {
- return !IsisContext.getPersistenceSession().isFixturesInstalled();
+ return !IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().isFixturesInstalled();
}
// fixtureType is OTHER; always install.
@@ -270,7 +270,8 @@ public class FixturesInstallerDelegate {
* that use the singleton to break).
*/
private PersistenceSession getPersistenceSession() {
- return persistenceSession != null ? persistenceSession : IsisContext.getPersistenceSession();
+ return persistenceSession != null ? persistenceSession :
+ IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
private ServicesInjector getServicesInjector() {
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/SwitchUserServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/SwitchUserServiceImpl.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/SwitchUserServiceImpl.java
index 6e9e04b..79ddadb 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/SwitchUserServiceImpl.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/SwitchUserServiceImpl.java
@@ -20,18 +20,23 @@
package org.apache.isis.core.runtime.fixtures;
import java.util.List;
+
+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.fixtures.LogonFixture;
import org.apache.isis.applib.fixtures.switchuser.SwitchUserService;
import org.apache.isis.applib.fixtures.switchuser.SwitchUserServiceAware;
+import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.fixtures.authentication.AuthenticationRequestLogonFixture;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@DomainService(
nature = NatureOfService.DOMAIN
@@ -55,11 +60,13 @@ public class SwitchUserServiceImpl implements SwitchUserService {
}
private void reopenSession(final AuthenticationRequest authRequest) {
- getTransactionManager().endTransaction();
- IsisContext.closeSession();
- final AuthenticationSession session = getAuthenticationManager().authenticate(authRequest);
- IsisContext.openSession(session);
- getTransactionManager().startTransaction();
+ persistenceSessionServiceInternal.commit();
+ isisSessionFactory.closeSession();
+
+ final AuthenticationSession authenticationSession = authenticationManager.authenticate(authRequest);
+
+ isisSessionFactory.openSession(authenticationSession);
+ persistenceSessionServiceInternal.beginTran();
}
@@ -72,12 +79,13 @@ public class SwitchUserServiceImpl implements SwitchUserService {
}
}
- protected AuthenticationManager getAuthenticationManager() {
- return IsisContext.getAuthenticationManager();
- }
+ @Inject
+ AuthenticationManager authenticationManager;
- protected IsisTransactionManager getTransactionManager() {
- return IsisContext.getTransactionManager();
- }
+ @Inject
+ IsisSessionFactory isisSessionFactory;
+
+ @Inject
+ PersistenceSessionServiceInternal persistenceSessionServiceInternal;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/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 3ebbb98..78e47cb 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
@@ -400,11 +400,11 @@ public class Memento implements Serializable {
// ///////////////////////////////////////////////////////////////
protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSpecificationLoader();
+ return IsisContext.getSessionFactory().getSpecificationLoader();
}
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
index b93074a..a7fb36f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
@@ -121,14 +121,14 @@ public class StandaloneData extends Data {
if (objectAsSerializable != null) {
return getPersistenceSession().adapterFor(objectAsSerializable);
} else {
- final ObjectSpecification spec = IsisContext.getSpecificationLoader().loadSpecification(getClassName());
+ final ObjectSpecification spec = IsisContext.getSessionFactory().getSpecificationLoader().loadSpecification(getClassName());
final EncodableFacet encodeableFacet = spec.getFacet(EncodableFacet.class);
return encodeableFacet.fromEncodedString(objectAsEncodedString);
}
}
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
index ee9989c..d8211cb 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
@@ -23,26 +23,25 @@ import org.datanucleus.enhancement.Persistable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.ensure.Ensure;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.ParentedCollectionOid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.adapter.version.Version;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.spec.ElementSpecificationProvider;
import org.apache.isis.core.metamodel.spec.Instance;
import org.apache.isis.core.metamodel.spec.InstanceAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.Specification;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import static org.hamcrest.CoreMatchers.is;
@@ -56,7 +55,6 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
private final AuthenticationSession authenticationSession;
private final SpecificationLoader specificationLoader;
- private final Localization localization;
private final PersistenceSession persistenceSession;
/**
@@ -77,13 +75,11 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
final Object pojo,
final Oid oid,
final AuthenticationSession authenticationSession,
- final Localization localization,
final SpecificationLoader specificationLoader,
final PersistenceSession persistenceSession) {
this.persistenceSession = persistenceSession;
this.specificationLoader = specificationLoader;
- this.localization = localization;
this.authenticationSession = authenticationSession;
if (pojo instanceof ObjectAdapter) {
@@ -310,7 +306,7 @@ public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
return (String) getObject();
}
final ObjectSpecification specification = getSpecification();
- String title = specification.getTitle(contextAdapterIfAny, this, localization);
+ String title = specification.getTitle(contextAdapterIfAny, this);
if (title == null) {
title = getDefaultTitle();
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java
index b0fb3b3..d35647d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java
@@ -42,7 +42,7 @@ public abstract class PersistenceCommandAbstract implements PersistenceCommand {
// /////////////////////////////////////////////////////////////////////
protected static AuthenticationSession getAuthenticationSession() {
- return IsisContext.getAuthenticationSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
index cbdd81b..01e6af4 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
@@ -129,7 +129,7 @@ public abstract class PersistenceQueryAbstract implements PersistenceQuery, Enco
// ///////////////////////////////////////////////////////
protected static SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSpecificationLoader();
+ return IsisContext.getSessionFactory().getSpecificationLoader();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/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 62cd1d0..9fc4bc4 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
@@ -29,9 +29,12 @@ import com.google.inject.Singleton;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.fixturescripts.FixtureScript;
+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.IsisSessionFactory;
import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProviderUsingInstallers;
public class IsisInjectModule extends AbstractModule {
@@ -107,4 +110,32 @@ public class IsisInjectModule extends AbstractModule {
return system;
}
+ @Provides
+ @Inject
+ @Singleton
+ protected IsisConfiguration provideConfiguration() {
+ return isisConfiguration;
+ }
+
+ @Provides
+ @Inject
+ @Singleton
+ protected DeploymentCategory provideDeploymentCaeg() {
+ return deploymentCategory;
+ }
+
+ @Provides
+ @Inject
+ @Singleton
+ protected IsisSessionFactory provideIsisSessionFactory(final IsisSystem isisSystem) {
+ return isisSystem.getSessionFactory();
+ }
+
+ @Provides
+ @Inject
+ @Singleton
+ protected ServicesInjector provideServicesInjector(final IsisSessionFactory isisSessionFactory) {
+ return isisSessionFactory.getServicesInjector();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java
index b82dca4..7bb61fa 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java
@@ -51,8 +51,7 @@ public class AuditingServiceInternal {
Boolean whetherCanAudit;
- @Programmatic
- public boolean canAudit() {
+ private boolean canAudit() {
if(whetherCanAudit == null) {
whetherCanAudit = determineWhetherCanAudit();
}
@@ -73,6 +72,9 @@ public class AuditingServiceInternal {
@Programmatic
public void audit() {
+ if(!canAudit()) {
+ return;
+ }
final Set<Map.Entry<AdapterAndProperty, PreAndPostValues>> changedObjectProperties =
changedObjectsServiceInternal.getChangedObjectProperties();
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
index 312f231..b298fe7 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/authsess/AuthenticationSessionProviderDefault.java
@@ -29,6 +29,6 @@ public class AuthenticationSessionProviderDefault implements AuthenticationSessi
@Programmatic
@Override
public AuthenticationSession getAuthenticationSession() {
- return IsisContext.getAuthenticationSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
}
}
[02/50] [abbrv] isis git commit: ISIS-1427: use DeploymentCategory
rather than DeploymentType throughout (except in very initial bootstrapping).
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/d02540d9/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index 6f2b7aa..78f4fee 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -111,7 +111,7 @@ public abstract class FormAbstract<T> extends Form<T>
}
public DeploymentCategory getDeploymentCategory() {
- return IsisContext.getDeploymentType().getDeploymentCategory();
+ return IsisContext.getDeploymentCategory();
}
[07/50] [abbrv] isis git commit: ISIS-1428: removed
JavaReflectorInstaller,
removing the duplicated code in IsisComponentProviderDefault2. NB: removed
ability to override MetaModelValidator.
Posted by da...@apache.org.
ISIS-1428: removed JavaReflectorInstaller, removing the duplicated code in IsisComponentProviderDefault2. NB: removed ability to override MetaModelValidator.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7ac476c7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7ac476c7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7ac476c7
Branch: refs/heads/master
Commit: 7ac476c7c8f453cbb8b041f0d88bd62d28f497e1
Parents: 8d4acc5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 8 07:32:44 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 8 07:32:44 2016 +0100
----------------------------------------------------------------------
.../IsisComponentProviderDefault.java | 9 +-
.../integtestsupport/IsisSystemForTest.java | 18 +--
.../progmodels/dflt/JavaReflectorInstaller.java | 158 -------------------
.../isis/core/runtime/system/IsisSystem.java | 2 +-
.../IsisComponentProvider.java | 54 ++++++-
.../IsisComponentProviderDefault2.java | 62 +-------
6 files changed, 57 insertions(+), 246 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7ac476c7/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java
index 494b0f6..a99835d 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisComponentProviderDefault.java
@@ -24,21 +24,16 @@ import java.util.List;
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.fixtures.InstallableFixture;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
-import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.systemusinginstallers.IsisComponentProviderDefault2;
public class IsisComponentProviderDefault extends IsisComponentProviderDefault2 {
public IsisComponentProviderDefault(
- final DeploymentType deploymentType,
final AppManifest appManifestIfAny,
final List<Object> servicesOverride,
final List<InstallableFixture> fixturesOverride,
- final IsisConfiguration configurationOverride,
- final MetaModelValidator metaModelValidatorOverride) {
- super(appManifestIfAny, servicesOverride, fixturesOverride, configurationOverride,
- metaModelValidatorOverride);
+ final IsisConfiguration configurationOverride) {
+ super(appManifestIfAny, servicesOverride, fixturesOverride, configurationOverride);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/7ac476c7/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 15b61f9..43ed591 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
@@ -47,7 +47,6 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
import org.apache.isis.core.runtime.fixtures.FixturesInstaller;
@@ -56,7 +55,6 @@ import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
import org.apache.isis.core.runtime.services.ServicesInstaller;
import org.apache.isis.core.runtime.services.ServicesInstallerFromAnnotation;
import org.apache.isis.core.runtime.services.ServicesInstallerFromConfigurationAndAnnotation;
-import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
@@ -164,8 +162,6 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
private AppManifest appManifestIfAny;
- private MetaModelValidator metaModelValidatorOverride;
-
private final List<Object> services = Lists.newArrayList();
private final List<InstallableFixture> fixtures = Lists.newArrayList();
@@ -178,11 +174,6 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
return this;
}
- public Builder with(MetaModelValidator metaModelValidator) {
- this.metaModelValidatorOverride = metaModelValidator;
- return this;
- }
-
public Builder with(AuthenticationRequest authenticationRequest) {
this.authenticationRequest = authenticationRequest;
return this;
@@ -248,7 +239,6 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
appManifestIfAny,
configuration,
services, fixtures,
- metaModelValidatorOverride,
authenticationRequest,
listeners);
if(level != null) {
@@ -303,8 +293,6 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
private final IsisConfiguration configurationOverride;
private final List<Object> servicesIfAny;
private final List<InstallableFixture> fixturesIfAny;
- private final MetaModelValidator metaModelValidatorOverride;
-
private final AuthenticationRequest authenticationRequestIfAny;
private AuthenticationSession authenticationSession;
@@ -315,14 +303,12 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
final IsisConfiguration configurationOverride,
final List<Object> servicesIfAny,
final List<InstallableFixture> fixturesIfAny,
- final MetaModelValidator metaModelValidatorOverride,
final AuthenticationRequest authenticationRequestIfAny,
final List<Listener> listeners) {
this.appManifestIfAny = appManifestIfAny;
this.configurationOverride = configurationOverride;
this.servicesIfAny = servicesIfAny;
this.fixturesIfAny = fixturesIfAny;
- this.metaModelValidatorOverride = metaModelValidatorOverride;
this.authenticationRequestIfAny = authenticationRequestIfAny;
this.listeners = listeners;
}
@@ -380,12 +366,10 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
isisLoggingConfigurer.configureLogging(".", new String[] {});
componentProvider = new IsisComponentProviderDefault(
- DeploymentType.UNIT_TESTING,
appManifestIfAny,
servicesIfAny,
fixturesIfAny,
- configurationOverride,
- metaModelValidatorOverride
+ configurationOverride
);
isisSystem = new IsisSystem(componentProvider, DeploymentCategory.PRODUCTION);
http://git-wip-us.apache.org/repos/asf/isis/blob/7ac476c7/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
deleted file mode 100644
index 3a87262..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstaller.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * 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.progmodels.dflt;
-
-import java.util.Collection;
-import java.util.List;
-
-import com.google.common.collect.Lists;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
-import org.apache.isis.core.commons.factory.InstanceUtil;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
-import org.apache.isis.core.metamodel.facets.FacetFactory;
-import org.apache.isis.core.metamodel.layoutmetadata.LayoutMetadataReader;
-import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.ReflectorConstants;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
-
-public class JavaReflectorInstaller {
-
- private static final Logger LOG = LoggerFactory.getLogger(JavaReflectorInstaller.class);
-
- //region > createReflector, doCreateReflector
-
- public SpecificationLoader createReflector(
- final DeploymentCategory deploymentCategory,
- final IsisConfigurationDefault configuration,
- final Collection<MetaModelRefiner> metaModelRefiners,
- final ServicesInjector servicesInjector) {
-
- final ProgrammingModel programmingModel = createProgrammingModel(configuration);
- final MetaModelValidator mmv = createMetaModelValidator(configuration);
- final List<LayoutMetadataReader> layoutMetadataReaders = createLayoutMetadataReaders(configuration);
-
- return JavaReflectorHelper.createObjectReflector(
- deploymentCategory, configuration, programmingModel, metaModelRefiners,
- layoutMetadataReaders, mmv,
- servicesInjector);
- }
-
- //endregion
-
- //region > createProgrammingModel
-
- /**
- * Hook method to allow subclasses to specify a different implementations
- * (that is, sets of {@link ProgrammingModel} .
- *
- * <p>
- * By default, looks up implementation from provided
- * {@link IsisConfiguration} using
- * {@link ReflectorConstants#PROGRAMMING_MODEL_FACETS_CLASS_NAME}. If not
- * specified, then defaults to
- * {@link ReflectorConstants#PROGRAMMING_MODEL_FACETS_CLASS_NAME_DEFAULT}.
- *
- * <p>
- * The list of facets can be adjusted using
- * {@link ReflectorConstants#FACET_FACTORY_INCLUDE_CLASS_NAME_LIST} to
- * specify additional {@link FacetFactory factories} to include, and
- * {@link ReflectorConstants#FACET_FACTORY_EXCLUDE_CLASS_NAME_LIST} to
- * exclude.
- */
- protected ProgrammingModel createProgrammingModel(final IsisConfiguration configuration) {
- final ProgrammingModel programmingModel = new ProgrammingModelFacetsJava5(configuration);
- includeAndExcludeFacetFactories(configuration, programmingModel);
- return programmingModel;
- }
-
- private void includeAndExcludeFacetFactories(
- final IsisConfiguration configuration, final ProgrammingModel programmingModel) {
- includeFacetFactories(configuration, programmingModel);
- excludeFacetFactories(configuration, programmingModel);
- }
-
- //endregion
-
- //region > includeFacetFactories, excludeFacetFactories
-
- /**
- * Factored out of {@link #createProgrammingModel(IsisConfiguration)}
- * so that subclasses that choose to override can still support
- * customization of their {@link ProgrammingModel} in a similar way.
- */
- protected void includeFacetFactories(final IsisConfiguration configuration, final ProgrammingModel programmingModel) {
- ProgrammingModel.Util.includeFacetFactories(configuration, programmingModel);
- }
-
- /**
- * Factored out of {@link #createProgrammingModel(IsisConfiguration)}
- * so that subclasses that choose to override can still support
- * customization of their {@link ProgrammingModel} in a similar way.
- */
- protected void excludeFacetFactories(final IsisConfiguration configuration, final ProgrammingModel programmingModel) {
- ProgrammingModel.Util.excludeFacetFactories(configuration, programmingModel);
- }
-
- //endregion
-
- //region > createMetaModelValidator
-
- /**
- * Hook method to allow subclasses to specify a different implementation of
- * {@link MetaModelValidator}.
- *
- * <p>
- * By default, looks up implementation from provided
- * {@link IsisConfiguration} using
- * {@link ReflectorConstants#META_MODEL_VALIDATOR_CLASS_NAME}.
- */
- protected MetaModelValidator createMetaModelValidator(final IsisConfiguration configuration) {
- final String metaModelValidatorClassName = configuration.getString(ReflectorConstants.META_MODEL_VALIDATOR_CLASS_NAME, ReflectorConstants.META_MODEL_VALIDATOR_CLASS_NAME_DEFAULT);
- return InstanceUtil.createInstance(metaModelValidatorClassName, MetaModelValidator.class);
- }
-
- //endregion
-
- //region > createLayoutMetadataReaders
-
- protected List<LayoutMetadataReader> createLayoutMetadataReaders(final IsisConfiguration configuration) {
- final List<LayoutMetadataReader> layoutMetadataReaders = Lists.newArrayList();
- final String[] layoutMetadataReaderClassNames = configuration.getList(ReflectorConstants.LAYOUT_METADATA_READER_LIST, ReflectorConstants.LAYOUT_METADATA_READER_LIST_DEFAULT);
- if (layoutMetadataReaderClassNames != null) {
- for (final String layoutMetadataReaderClassName : layoutMetadataReaderClassNames) {
- final LayoutMetadataReader layoutMetadataReader = InstanceUtil.createInstance(layoutMetadataReaderClassName, LayoutMetadataReader.class);
- layoutMetadataReaders.add(layoutMetadataReader);
- }
- }
- return layoutMetadataReaders;
- }
-
- //endregion
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/7ac476c7/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 0276e0e..d3d872d 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
@@ -86,7 +86,7 @@ public class IsisSystem implements ApplicationScopedComponent {
public IsisSystem(final AppManifest manifest) {
this(new IsisComponentProviderDefault2(
- manifest, null, null, null, null), DeploymentCategory.PRODUCTION);
+ manifest, null, null, null), DeploymentCategory.PRODUCTION);
}
public IsisSystem(final IsisComponentProvider componentProvider, final DeploymentCategory deploymentCategory) {
http://git-wip-us.apache.org/repos/asf/isis/blob/7ac476c7/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
index 673dbe1..8bceef1 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProvider.java
@@ -46,11 +46,16 @@ import org.apache.isis.applib.fixturescripts.FixtureScript;
import org.apache.isis.applib.services.classdiscovery.ClassDiscoveryServiceUsingReflections;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
+import org.apache.isis.core.commons.factory.InstanceUtil;
import org.apache.isis.core.commons.lang.ClassUtil;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
+import org.apache.isis.core.metamodel.layoutmetadata.LayoutMetadataReader;
+import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.specloader.ReflectorConstants;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.fixtures.FixturesInstaller;
@@ -60,7 +65,8 @@ import org.apache.isis.core.runtime.services.ServicesInstallerFromConfiguration;
import org.apache.isis.core.runtime.system.IsisSystemException;
import org.apache.isis.core.runtime.system.SystemConstants;
import org.apache.isis.objectstore.jdo.service.RegisterEntities;
-import org.apache.isis.progmodels.dflt.JavaReflectorInstaller;
+import org.apache.isis.progmodels.dflt.JavaReflectorHelper;
+import org.apache.isis.progmodels.dflt.ProgrammingModelFacetsJava5;
import static org.apache.isis.core.commons.ensure.Ensure.ensureThatState;
import static org.hamcrest.CoreMatchers.is;
@@ -216,7 +222,6 @@ public abstract class IsisComponentProvider {
//endregion
-
//region > services, configuration, authenticationManager, authorizationManager (populated by subclass)
/**
@@ -267,11 +272,52 @@ public abstract class IsisComponentProvider {
final ServicesInjector servicesInjector,
final Collection<MetaModelRefiner> metaModelRefiners) throws IsisSystemException {
- final JavaReflectorInstaller reflectorInstaller = new JavaReflectorInstaller();
+ final ProgrammingModel programmingModel = createProgrammingModel();
+
+ final MetaModelValidator mmv = createMetaModelValidator();
- return reflectorInstaller.createReflector(deploymentCategory, getConfiguration(), metaModelRefiners, servicesInjector);
+ final List<LayoutMetadataReader> layoutMetadataReaders = createLayoutMetadataReaders();
+
+ return JavaReflectorHelper.createObjectReflector(
+ deploymentCategory, configuration, programmingModel, metaModelRefiners,
+ layoutMetadataReaders, mmv,
+ servicesInjector);
}
+ protected MetaModelValidator createMetaModelValidator() {
+ final String metaModelValidatorClassName =
+ configuration.getString(
+ ReflectorConstants.META_MODEL_VALIDATOR_CLASS_NAME,
+ ReflectorConstants.META_MODEL_VALIDATOR_CLASS_NAME_DEFAULT);
+ return InstanceUtil.createInstance(metaModelValidatorClassName, MetaModelValidator.class);
+ }
+
+ protected ProgrammingModel createProgrammingModel() {
+
+ final ProgrammingModel programmingModel = new ProgrammingModelFacetsJava5(configuration);
+ ProgrammingModel.Util.includeFacetFactories(configuration, programmingModel);
+ ProgrammingModel.Util.excludeFacetFactories(configuration, programmingModel);
+ return programmingModel;
+ }
+
+ protected List<LayoutMetadataReader> createLayoutMetadataReaders() {
+ final List<LayoutMetadataReader> layoutMetadataReaders = Lists.newArrayList();
+ final String[] layoutMetadataReaderClassNames =
+ configuration.getList(
+ ReflectorConstants.LAYOUT_METADATA_READER_LIST,
+ ReflectorConstants.LAYOUT_METADATA_READER_LIST_DEFAULT);
+
+ if (layoutMetadataReaderClassNames != null) {
+ for (final String layoutMetadataReaderClassName : layoutMetadataReaderClassNames) {
+ final LayoutMetadataReader layoutMetadataReader =
+ InstanceUtil.createInstance(layoutMetadataReaderClassName, LayoutMetadataReader.class);
+ layoutMetadataReaders.add(layoutMetadataReader);
+ }
+ }
+ return layoutMetadataReaders;
+ }
+
+
//endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/7ac476c7/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
index 6a5dbd1..11970e8 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisComponentProviderDefault2.java
@@ -19,25 +19,13 @@
package org.apache.isis.core.runtime.systemusinginstallers;
-import java.util.Collection;
import java.util.List;
-import com.google.common.collect.Lists;
-
import org.apache.isis.applib.AppManifest;
import org.apache.isis.applib.fixtures.InstallableFixture;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
-import org.apache.isis.core.metamodel.layoutmetadata.LayoutMetadataReader;
-import org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson;
-import org.apache.isis.core.metamodel.metamodelvalidator.dflt.MetaModelValidatorDefault;
-import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandard;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
@@ -45,21 +33,17 @@ import org.apache.isis.core.runtime.authorization.standard.AuthorizationManagerS
import org.apache.isis.core.runtime.fixtures.FixturesInstallerFromConfiguration;
import org.apache.isis.core.runtime.services.ServicesInstallerFromConfiguration;
import org.apache.isis.core.runtime.services.ServicesInstallerFromConfigurationAndAnnotation;
-import org.apache.isis.core.runtime.system.IsisSystemException;
-import org.apache.isis.progmodels.dflt.JavaReflectorHelper;
-import org.apache.isis.progmodels.dflt.ProgrammingModelFacetsJava5;
public class IsisComponentProviderDefault2 extends IsisComponentProvider {
- private final ProgrammingModel programmingModel;
- private final MetaModelValidator metaModelValidator;
+
+
public IsisComponentProviderDefault2(
final AppManifest appManifestIfAny,
final List<Object> servicesOverride,
final List<InstallableFixture> fixturesOverride,
- final IsisConfiguration configurationOverride,
- final MetaModelValidator metaModelValidatorOverride) {
+ final IsisConfiguration configurationOverride) {
super(appManifestIfAny, elseDefault(configurationOverride));
this.services = appManifestIfAny != null
@@ -77,9 +61,6 @@ public class IsisComponentProviderDefault2 extends IsisComponentProvider {
this.authenticationManager = createAuthenticationManager();
this.authorizationManager = createAuthorizationManager();
- this.programmingModel = createDefaultProgrammingModel();
- this.metaModelValidator = elseDefault(metaModelValidatorOverride);
-
}
/**
@@ -92,25 +73,6 @@ public class IsisComponentProviderDefault2 extends IsisComponentProvider {
: new IsisConfigurationDefault(ResourceStreamSourceContextLoaderClassPath.create("config"));
}
- // TODO: this is duplicating logic in JavaReflectorInstaller; need to unify.
- private ProgrammingModel createDefaultProgrammingModel() {
-
-
- final IsisConfigurationDefault configuration = getConfiguration();
-
- final ProgrammingModelFacetsJava5 programmingModel = new ProgrammingModelFacetsJava5(configuration);
- ProgrammingModel.Util.includeFacetFactories(configuration, programmingModel);
- ProgrammingModel.Util.excludeFacetFactories(configuration, programmingModel);
-
- return programmingModel;
- }
-
- private static MetaModelValidator elseDefault(final MetaModelValidator metaModelValidator) {
- return metaModelValidator != null
- ? metaModelValidator
- : new MetaModelValidatorDefault();
- }
-
/**
* The standard authentication manager, configured with the 'bypass' authenticator (allows all requests through).
*/
@@ -126,22 +88,4 @@ public class IsisComponentProviderDefault2 extends IsisComponentProvider {
}
- @Override
- public SpecificationLoader provideSpecificationLoader(
- final DeploymentCategory deploymentCategory,
- final ServicesInjector servicesInjector,
- final Collection<MetaModelRefiner> metaModelRefiners) throws IsisSystemException {
-
- final List<LayoutMetadataReader> layoutMetadataReaders =
- Lists.<LayoutMetadataReader>newArrayList(new LayoutMetadataReaderFromJson());
-
- return JavaReflectorHelper
- .createObjectReflector(
- deploymentCategory, getConfiguration(), programmingModel,
- metaModelRefiners,
- layoutMetadataReaders,
- metaModelValidator,
- servicesInjector);
- }
-
}
[24/50] [abbrv] isis git commit: ISIS-1427: consolidating to only
necessary calls to IsisContext#getIsisSessionFactory;
also fully qualify @Inject (as either javax or com.google) throughout.
Posted by da...@apache.org.
ISIS-1427: consolidating to only necessary calls to IsisContext#getIsisSessionFactory; also fully qualify @Inject (as either javax or com.google) throughout.
The rationale is to use dependency injection where possible, and where have all code that requires components to do so through IsisContext#getIsisSessionFactory (and nowhere else).
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/69b4859f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/69b4859f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/69b4859f
Branch: refs/heads/master
Commit: 69b4859f27ce857e9af75b7d1ef0ae7b42e5cc2c
Parents: 1032ada
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jun 10 14:52:08 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jun 10 14:52:08 2016 +0100
----------------------------------------------------------------------
.../isis/applib/AbstractContainedObject.java | 2 +-
.../config/ConfigurationServiceMenu.java | 2 +-
.../applib/services/dto/Dto_downloadXml.java | 2 +-
.../applib/services/dto/Dto_downloadXsd.java | 4 +-
.../services/eventbus/EventBusService.java | 4 +-
.../exceprecog/ExceptionRecognizerAbstract.java | 2 +-
.../ExceptionRecognizerComposite.java | 4 +-
.../fixturespec/FixtureScriptsDefault.java | 2 +-
.../isis/applib/services/iactn/Interaction.java | 4 +-
.../isis/applib/services/jaxb/JaxbService.java | 2 +-
.../services/layout/LayoutServiceMenu.java | 2 +-
.../layout/Object_downloadLayoutXml.java | 4 +-
.../layout/Object_rebuildMetamodel.java | 2 +-
.../metamodel/MetaModelServicesMenu.java | 2 +-
.../publish/PublisherServiceLogging.java | 4 +-
.../services/routing/RoutingServiceDefault.java | 2 +-
.../services/swagger/SwaggerServiceMenu.java | 2 +-
.../services/jaxb/JaxbServiceDefault.java | 2 +-
.../jaxbadapters/PersistentEntityAdapter.java | 2 +-
.../commons/components/InstallerAbstract.java | 15 +--
.../metamodel/services/ServicesInjector.java | 23 +++--
.../appfeat/ApplicationFeatureFactory.java | 2 +-
.../ApplicationFeatureRepositoryDefault.java | 10 +-
.../config/ConfigurationServiceDefault.java | 2 +-
.../container/DomainObjectContainerDefault.java | 20 ++--
.../factory/FactoryServiceInternalDefault.java | 4 +-
.../services/grid/GridLoaderServiceDefault.java | 8 +-
.../services/grid/GridServiceDefault.java | 4 +-
.../grid/GridSystemServiceAbstract.java | 12 +--
.../Persistable_downloadJdoMetadata.java | 2 +-
.../services/layout/LayoutServiceDefault.java | 6 +-
.../metamodel/MetaModelServiceDefault.java | 4 +-
.../services/swagger/SwaggerServiceDefault.java | 2 +-
.../services/title/TitleServiceDefault.java | 2 +-
.../services/user/UserServiceDefault.java | 2 +-
.../standard/AuthenticationManagerStandard.java | 39 ++-----
...icationManagerStandardInstallerAbstract.java | 4 +-
...ServicesInjectorDefaultTest_usingFields.java | 8 +-
...enticationManagerStandardForDfltRuntime.java | 19 ++--
...StandardInstallerAbstractForDfltRuntime.java | 1 +
.../ObjectFixtureFilePersistor.java | 4 +-
.../ObjectFixtureService.java | 6 +-
.../runtime/fixtures/SwitchUserServiceImpl.java | 6 +-
.../apache/isis/core/runtime/memento/Data.java | 16 ++-
.../core/runtime/memento/StandaloneData.java | 7 +-
.../transaction/PersistenceCommandAbstract.java | 7 --
.../query/PersistenceQueryAbstract.java | 51 +++++----
.../query/PersistenceQueryBuiltInAbstract.java | 17 ++-
.../query/PersistenceQueryFindAllInstances.java | 9 +-
.../query/PersistenceQueryFindByPattern.java | 9 +-
.../query/PersistenceQueryFindByTitle.java | 9 +-
...istenceQueryFindUsingApplibQueryDefault.java | 20 +++-
...ceQueryFindUsingApplibQuerySerializable.java | 18 ++--
.../core/runtime/runner/IsisInjectModule.java | 5 +-
.../auditing/AuditingServiceInternal.java | 14 +--
.../background/BackgroundServiceDefault.java | 4 +-
.../CommandDtoServiceInternalDefault.java | 20 ++--
.../services/command/CommandServiceDefault.java | 2 +-
.../services/email/EmailServiceDefault.java | 19 ++--
.../HomePageProviderServiceDefault.java | 2 +-
.../services/i18n/po/TranslationServicePo.java | 6 +-
.../i18n/po/TranslationServicePoMenu.java | 2 +-
.../InteractionDtoServiceInternalDefault.java | 8 +-
.../services/memento/MementoServiceDefault.java | 2 +-
.../services/metrics/MetricsServiceDefault.java | 2 +-
...ersistenceSessionServiceInternalDefault.java | 15 ++-
.../PublishingServiceInternalDefault.java | 29 +++---
.../SessionManagementServiceDefault.java | 2 +-
.../services/sudo/SudoServiceDefault.java | 2 +-
...TransactionStateProviderInternalDefault.java | 2 +-
.../EmailNotificationServiceDefault.java | 2 +-
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 4 +-
.../runtime/snapshot/XmlSnapshotBuilder.java | 12 +--
.../isis/core/runtime/system/IsisSystem.java | 13 ++-
.../persistence/PersistenceQueryFactory.java | 11 +-
.../persistence/PersistenceSessionFactory.java | 9 +-
.../system/session/IsisSessionFactory.java | 28 +++--
.../isis/core/webapp/IsisSessionFilter.java | 4 +-
.../AuthenticationSessionStrategyAbstract.java | 7 ++
.../jdo/datanucleus/JDOStateManagerForIsis.java | 7 +-
.../service/support/IsisJdoSupportImpl.java | 2 +-
.../service/support/TimestampService.java | 6 +-
.../jdo/service/RegisterEntities.java | 9 +-
.../domainobjects/DomainObjectReprRenderer.java | 8 --
.../RepresentationServiceContentNegotiator.java | 2 +-
.../ContentNegotiationServiceAbstract.java | 2 +-
...ontentNegotiationServiceOrgApacheIsisV1.java | 2 +-
.../ContentNegotiationServiceXRoDomainType.java | 4 +-
.../conneg/IsisPrettyPrintingProcessor.java | 11 +-
.../server/RuntimeExceptionMapper.java | 8 +-
.../AuthenticationSessionStrategyTrusted.java | 4 +-
.../conneg/RestfulObjectsJaxbWriterForXml.java | 18 ++--
.../server/resources/ResourceAbstract.java | 21 ++--
.../server/resources/SwaggerSpecResource.java | 14 ++-
.../wicket/viewer/IsisWicketApplication.java | 8 +-
.../wicket/AuthenticatedWebSessionForIsis.java | 18 +++-
.../wicket/ConverterForObjectAdapter.java | 12 +--
.../ConverterForObjectAdapterMemento.java | 13 ++-
.../integration/wicket/LocalizerForIsis.java | 18 ++--
.../wicket/WebRequestCycleForIsis.java | 23 +++--
.../ComponentFactoryRegistryDefault.java | 2 +-
.../pages/PageClassRegistryDefault.java | 2 +-
.../pages/PageNavigationServiceDefault.java | 5 +-
.../viewer/services/DeepLinkServiceWicket.java | 2 +-
.../viewer/services/Object_clearHints.java | 4 +-
.../settings/WicketViewerSettingsDefault.java | 7 +-
.../model/mementos/CollectionMemento.java | 18 ++--
.../model/mementos/ObjectAdapterMemento.java | 35 +++----
.../wicket/model/mementos/PropertyMemento.java | 39 ++++---
.../wicket/model/models/BookmarkTreeNode.java | 30 ++----
.../models/BookmarkTreeNodeComparator.java | 23 ++---
.../model/models/BookmarkedPagesModel.java | 3 +-
.../model/models/EntityCollectionModel.java | 53 ++++------
.../viewer/wicket/model/models/EntityModel.java | 26 ++---
.../wicket/model/models/ModelAbstract.java | 21 +++-
.../viewer/wicket/model/models/ScalarModel.java | 2 +-
.../wicket/model/util/MementoFunctions.java | 103 -------------------
.../ActionResultResponseHandlingStrategy.java | 28 +++--
.../ActionResultResponseType.java | 19 ++--
.../wicket/ui/components/about/AboutPanel.java | 5 +-
.../entityactions/EntityActionLinkFactory.java | 18 +---
.../actionmenu/serviceactions/CssMenuItem.java | 7 +-
.../serviceactions/TertiaryActionsPanel.java | 3 +-
.../ui/components/actions/ActionPanel.java | 10 +-
.../bookmarkedpages/BookmarkedPagesPanel.java | 39 +++----
.../collection/bulk/BulkActionsHelper.java | 25 ++---
.../collection/bulk/BulkActionsLinkFactory.java | 10 +-
.../CollectionContentsAsAjaxTablePanel.java | 3 +-
.../CollectionContentsSortableDataProvider.java | 13 +--
.../columns/ObjectAdapterPropertyColumn.java | 6 +-
.../entity/fieldset/PropertyGroup.java | 2 +-
.../icontitle/EntityIconAndTitlePanel.java | 8 +-
.../ui/components/header/HeaderPanel.java | 8 +-
.../components/property/PropertyEditPanel.java | 5 +-
.../datepicker/TextFieldWithDateTimePicker.java | 13 ++-
.../scalars/reference/ReferencePanel.java | 4 +-
.../StandaloneCollectionPanel.java | 4 +-
.../ui/components/welcome/WelcomePanel.java | 5 +-
.../ObjectAdapterMementoProviderAbstract.java | 2 +-
.../widgets/breadcrumbs/BreadcrumbModel.java | 15 +--
.../ui/components/widgets/favicon/Favicon.java | 6 +-
.../ui/components/widgets/navbar/BrandName.java | 4 +-
.../widgets/themepicker/ThemeChooser.java | 7 +-
.../valuechoices/ValueChoicesSelect2Panel.java | 8 +-
.../wicket/ui/errors/JGrowlBehaviour.java | 10 +-
.../viewer/wicket/ui/pages/PageAbstract.java | 10 +-
.../accmngt/AccountManagementPageAbstract.java | 7 +-
.../pages/accmngt/EmailAvailableValidator.java | 13 ++-
.../EmailVerificationUrlServiceDefault.java | 5 +-
.../accmngt/UsernameAvailableValidator.java | 18 +++-
.../password_reset/PasswordResetEmailPanel.java | 34 +++---
.../password_reset/PasswordResetPage.java | 11 +-
.../password_reset/PasswordResetPanel.java | 10 +-
.../ui/pages/accmngt/register/RegisterPage.java | 13 ++-
.../pages/accmngt/register/RegisterPanel.java | 13 ++-
.../accmngt/signup/RegistrationFormPage.java | 4 +-
.../accmngt/signup/RegistrationFormPanel.java | 31 +++---
.../wicket/ui/pages/entity/EntityPage.java | 4 +-
.../wicket/ui/pages/login/IsisSignInPanel.java | 12 +--
.../wicket/ui/pages/login/WicketSignInPage.java | 13 ++-
.../wicket/ui/pages/mmverror/MmvErrorPage.java | 5 +-
.../viewer/wicket/ui/panels/FormAbstract.java | 16 +--
.../viewer/wicket/ui/panels/PanelAbstract.java | 38 ++++---
.../core/wrapper/WrapperFactoryDefault.java | 25 +++--
.../AbstractCollectionInvocationHandler.java | 8 +-
.../handlers/CollectionInvocationHandler.java | 6 +-
.../DelegatingInvocationHandlerDefault.java | 20 +++-
.../handlers/DomainObjectInvocationHandler.java | 29 +++---
.../wrapper/handlers/ProxyContextHandler.java | 20 +---
.../core/wrapper/WrapperFactoryDefaultTest.java | 3 +-
...WrapperFactoryDefaultTest_wrappedObject.java | 6 +-
...toryDefaultTest_wrappedObject_transient.java | 5 +-
172 files changed, 953 insertions(+), 942 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java b/core/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java
index 0e89af0..ca6b121 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/AbstractContainedObject.java
@@ -704,7 +704,7 @@ public abstract class AbstractContainedObject {
// //////////////////////////////////////
- @Inject
+ @javax.inject.Inject
private DomainObjectContainer container;
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationServiceMenu.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationServiceMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationServiceMenu.java
index ed850e1..ba9f75d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationServiceMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/config/ConfigurationServiceMenu.java
@@ -60,7 +60,7 @@ public class ConfigurationServiceMenu {
return configurationService.allProperties();
}
- @Inject
+ @javax.inject.Inject
private ConfigurationService configurationService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXml.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXml.java b/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXml.java
index 7fec121..ed00bec 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXml.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXml.java
@@ -61,7 +61,7 @@ public class Dto_downloadXml {
}
- @Inject
+ @javax.inject.Inject
JaxbService jaxbService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXsd.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXsd.java b/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXsd.java
index a50744e..a273d90 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXsd.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/dto/Dto_downloadXsd.java
@@ -118,10 +118,10 @@ public class Dto_downloadXsd {
}
- @Inject
+ @javax.inject.Inject
DomainObjectContainer container;
- @Inject
+ @javax.inject.Inject
JaxbService jaxbService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java
index ef84d36..3b83cbb 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/eventbus/EventBusService.java
@@ -119,8 +119,8 @@ public abstract class EventBusService {
* @RequestScoped @DomainService
* public class SomeSubscribingService {
*
- * @Inject private EventBusService ebs;
- * @Inject private SomeSubscribingService proxy;
+ * @javax.inject.Inject private EventBusService ebs;
+ * @javax.inject.Inject private SomeSubscribingService proxy;
*
* @PostConstruct
* public void startRequest() {
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
index a7c49d9..34006db 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
@@ -156,7 +156,7 @@ public abstract class ExceptionRecognizerAbstract implements ExceptionRecognizer
return Recognition.of(category, recognize(ex));
}
- @Inject
+ @javax.inject.Inject
protected TranslationService translationService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
index 9d245f6..3a0ec7d 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
@@ -165,9 +165,9 @@ public class ExceptionRecognizerComposite implements ExceptionRecognizer2 {
// //////////////////////////////////////
- @Inject
+ @javax.inject.Inject
DomainObjectContainer container;
- @Inject
+ @javax.inject.Inject
TranslationService translationService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java b/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
index d807723..6401aab 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
@@ -215,7 +215,7 @@ public class FixtureScriptsDefault extends FixtureScripts {
//endregion
//region > injected services
- @Inject
+ @javax.inject.Inject
private FixtureScriptsSpecificationProvider fixtureScriptsSpecificationProvider;
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
index 64d8df5..92ca09c 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
@@ -675,10 +675,10 @@ public class Interaction implements HasTransactionId {
}
- @Inject
+ @javax.inject.Inject
MetricsService metricsService;
- @Inject
+ @javax.inject.Inject
ClockService clockService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
index ab44123..d44e140 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
@@ -231,7 +231,7 @@ public interface JaxbService {
}
- @Inject
+ @javax.inject.Inject
DomainObjectContainer container;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
index 8a995cd..da5d637 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
@@ -83,7 +83,7 @@ public class LayoutServiceMenu {
// //////////////////////////////////////
- @Inject
+ @javax.inject.Inject
LayoutService layoutService;
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_downloadLayoutXml.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_downloadLayoutXml.java b/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_downloadLayoutXml.java
index 0bea504..22261f9 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_downloadLayoutXml.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_downloadLayoutXml.java
@@ -65,10 +65,10 @@ public class Object_downloadLayoutXml {
return LayoutService.Style.NORMALIZED;
}
- @Inject
+ @javax.inject.Inject
LayoutService layoutService;
- @Inject
+ @javax.inject.Inject
JaxbService jaxbService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_rebuildMetamodel.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_rebuildMetamodel.java b/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_rebuildMetamodel.java
index 2b7e9f3..bc4d27f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_rebuildMetamodel.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/layout/Object_rebuildMetamodel.java
@@ -51,7 +51,7 @@ public class Object_rebuildMetamodel {
metaModelService.rebuild(object.getClass());
}
- @Inject
+ @javax.inject.Inject
MetaModelService metaModelService;
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
index 998fe6e..dd6ec05 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
@@ -140,7 +140,7 @@ public class MetaModelServicesMenu {
}
- @Inject
+ @javax.inject.Inject
MetaModelService metaModelService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java b/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
index b928d37..519cfc0 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/publish/PublisherServiceLogging.java
@@ -71,10 +71,10 @@ public class PublisherServiceLogging implements PublisherService {
}
- @Inject
+ @javax.inject.Inject
private CommandContext commandContext;
- @Inject
+ @javax.inject.Inject
private UserService userService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingServiceDefault.java b/core/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingServiceDefault.java
index d351e90..3707c27 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingServiceDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/routing/RoutingServiceDefault.java
@@ -52,7 +52,7 @@ public class RoutingServiceDefault implements RoutingService {
return original != null? original: homePageProviderService.homePage();
}
- @Inject
+ @javax.inject.Inject
HomePageProviderService homePageProviderService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerServiceMenu.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerServiceMenu.java b/core/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerServiceMenu.java
index 1be0de8..73f766f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerServiceMenu.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/swagger/SwaggerServiceMenu.java
@@ -75,6 +75,6 @@ public class SwaggerServiceMenu {
return SwaggerService.Format.YAML;
}
- @Inject
+ @javax.inject.Inject
SwaggerService swaggerService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/schema/services/jaxb/JaxbServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/schema/services/jaxb/JaxbServiceDefault.java b/core/applib/src/main/java/org/apache/isis/schema/services/jaxb/JaxbServiceDefault.java
index 3679fdb..ca021a8 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/services/jaxb/JaxbServiceDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/services/jaxb/JaxbServiceDefault.java
@@ -43,7 +43,7 @@ public class JaxbServiceDefault extends JaxbService.Simple {
marshaller.setAdapter(PersistentEntityAdapter.class, adapter);
}
- @Inject
+ @javax.inject.Inject
DomainObjectContainer container;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntityAdapter.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntityAdapter.java b/core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntityAdapter.java
index dfcefc3..1b6a271 100644
--- a/core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntityAdapter.java
+++ b/core/applib/src/main/java/org/apache/isis/schema/utils/jaxbadapters/PersistentEntityAdapter.java
@@ -52,6 +52,6 @@ public class PersistentEntityAdapter extends XmlAdapter<OidDto, Object> {
return bookmarkService;
}
- @Inject
+ @javax.inject.Inject
BookmarkService2 bookmarkService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java
index f1b0815..e730cce 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/components/InstallerAbstract.java
@@ -24,14 +24,14 @@ import java.util.List;
import com.google.common.collect.Lists;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
+import org.apache.isis.core.commons.config.IsisConfiguration;
public abstract class InstallerAbstract implements Installer {
//region > constructor, fields
private final String name;
- private final IsisConfigurationDefault isisConfiguration;
+ private final IsisConfiguration isisConfiguration;
/**
* Subclasses should pass in the type defined as a constant in the
@@ -45,25 +45,18 @@ public abstract class InstallerAbstract implements Installer {
*/
public InstallerAbstract(
final String name,
- final IsisConfigurationDefault isisConfiguration) {
+ final IsisConfiguration isisConfiguration) {
this.name = name;
this.isisConfiguration = isisConfiguration;
}
- //endregion
-
- //region > name
@Override
public String getName() {
return name;
}
- //endregion
-
- //region > configuration (injected)
-
- public IsisConfigurationDefault getConfiguration() {
+ public IsisConfiguration getConfiguration() {
return isisConfiguration;
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/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 dce4cbe..f83ec4e 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
@@ -131,8 +131,6 @@ public class ServicesInjector implements ApplicationScopedComponent {
this.autowireSetters = configuration.getBoolean(KEY_SET_PREFIX, true);
this.autowireInject = configuration.getBoolean(KEY_INJECT_PREFIX, false);
-
- autowireServicesAndContainer();
}
//endregion
@@ -160,8 +158,7 @@ public class ServicesInjector implements ApplicationScopedComponent {
// invalidate
servicesAssignableToType.clear();
serviceByConcreteType.clear();
-
- autowireServicesAndContainer();
+ autowire();
}
public boolean isRegisteredService(final Class<?> cls) {
@@ -258,7 +255,8 @@ public class ServicesInjector implements ApplicationScopedComponent {
*/
public void injectServicesInto(final List<Object> objects) {
for (final Object object : objects) {
- injectServicesInto(object);
+ injectInto(object); // if implements ServiceInjectorAware
+ injectServicesInto(object); // via @javax.inject.Inject or setXxx(...)
}
}
@@ -427,13 +425,23 @@ public class ServicesInjector implements ApplicationScopedComponent {
}
}
- private void autowireServicesAndContainer() {
+
+
+
+ //endregion
+
+
+
+ //region > autoWire
+
+ @Programmatic
+ public void autowire() {
injectServicesInto(this.services);
}
-
//endregion
+
//region > lookupService, lookupServices
/**
@@ -607,6 +615,7 @@ public class ServicesInjector implements ApplicationScopedComponent {
return getDeploymentCategoryProvider().getDeploymentCategory();
}
+
//endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java
index d3d0e3c..004dcef 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureFactory.java
@@ -33,7 +33,7 @@ public class ApplicationFeatureFactory {
return factoryService.instantiate(ApplicationFeature.class);
}
- @Inject
+ @javax.inject.Inject
FactoryService factoryService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index 7a586b0..e9db043 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -558,19 +558,19 @@ public class ApplicationFeatureRepositoryDefault implements ApplicationFeatureRe
//region > services (injected)
- @Inject
+ @javax.inject.Inject
ServiceRegistry2 serviceRegistry;
- @Inject
+ @javax.inject.Inject
DomainObjectContainer container;
- @Inject
+ @javax.inject.Inject
ConfigurationService configurationService;
- @Inject
+ @javax.inject.Inject
SpecificationLoader specificationLoader;
- @Inject
+ @javax.inject.Inject
ApplicationFeatureFactory applicationFeatureFactory;
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
index 6348fb5..3afd3c2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/config/ConfigurationServiceDefault.java
@@ -85,7 +85,7 @@ public class ConfigurationServiceDefault implements ConfigurationService {
- @Inject
+ @javax.inject.Inject
ConfigurationServiceInternal configurationServiceInternal;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
index bfa2120..7a343d3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/container/DomainObjectContainerDefault.java
@@ -647,34 +647,34 @@ public class DomainObjectContainerDefault
//region > service dependencies
- @Inject
+ @javax.inject.Inject
SpecificationLoader specificationLoader;
- @Inject
+ @javax.inject.Inject
org.apache.isis.applib.services.config.ConfigurationService configurationService;
- @Inject
+ @javax.inject.Inject
FactoryService factoryService;
- @Inject
+ @javax.inject.Inject
MessageService messageService;
- @Inject
+ @javax.inject.Inject
RepositoryService repositoryService;
- @Inject
+ @javax.inject.Inject
ServiceRegistry serviceRegistry;
- @Inject
+ @javax.inject.Inject
TransactionService transactionService;
- @Inject
+ @javax.inject.Inject
TitleService titleService;
- @Inject
+ @javax.inject.Inject
UserService userService;
- @Inject
+ @javax.inject.Inject
WrapperFactory wrapperFactory;
@javax.inject.Inject
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java
index 9198525..8d028ee 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/factory/FactoryServiceInternalDefault.java
@@ -89,10 +89,10 @@ public class FactoryServiceInternalDefault implements FactoryService {
"Failed to locate constructor in %s to instantiate using %s", mixinClass.getName(), mixedIn));
}
- @Inject
+ @javax.inject.Inject
SpecificationLoader specificationLoader;
- @Inject
+ @javax.inject.Inject
ServiceRegistry serviceRegistry;
@javax.inject.Inject
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
index e24b021..51b49f9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridLoaderServiceDefault.java
@@ -186,16 +186,16 @@ public class GridLoaderServiceDefault implements GridLoaderService {
//region > injected dependencies
- @Inject
+ @javax.inject.Inject
DeploymentCategoryProvider deploymentCategoryProvider;
- @Inject
+ @javax.inject.Inject
DomainObjectContainer container;
- @Inject
+ @javax.inject.Inject
JaxbService jaxbService;
- @Inject
+ @javax.inject.Inject
List<GridSystemService> gridSystemServices;
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
index 9cdde9e..990a2fc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridServiceDefault.java
@@ -194,10 +194,10 @@ public class GridServiceDefault implements GridService {
- @Inject
+ @javax.inject.Inject
GridLoaderService gridLoaderService;
- @Inject
+ @javax.inject.Inject
List<GridSystemService> gridSystemServices;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
index 8ffb99a..5a93517 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/GridSystemServiceAbstract.java
@@ -678,22 +678,22 @@ public abstract class GridSystemServiceAbstract<G extends Grid> implements GridS
// //////////////////////////////////////
- @Inject
+ @javax.inject.Inject
protected SpecificationLoader specificationLoader;
- @Inject
+ @javax.inject.Inject
protected TranslationService translationService;
- @Inject
+ @javax.inject.Inject
protected JaxbService jaxbService;
- @Inject
+ @javax.inject.Inject
protected DomainObjectContainer container;
- @Inject
+ @javax.inject.Inject
protected MessageService messageService;
- @Inject
+ @javax.inject.Inject
DeploymentCategoryProvider deploymentCategoryProvider;
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/jdosupport/Persistable_downloadJdoMetadata.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/jdosupport/Persistable_downloadJdoMetadata.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/jdosupport/Persistable_downloadJdoMetadata.java
index 09244f4..38a0f2f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/jdosupport/Persistable_downloadJdoMetadata.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/jdosupport/Persistable_downloadJdoMetadata.java
@@ -79,7 +79,7 @@ public class Persistable_downloadJdoMetadata {
return jdoSupport.getJdoPersistenceManager().getPersistenceManagerFactory();
}
- @Inject
+ @javax.inject.Inject
IsisJdoSupport jdoSupport;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
index c7ba107..491adac 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/layout/LayoutServiceDefault.java
@@ -139,13 +139,13 @@ public class LayoutServiceDefault implements LayoutService {
- @Inject
+ @javax.inject.Inject
SpecificationLoader specificationLoader;
- @Inject
+ @javax.inject.Inject
JaxbService jaxbService;
- @Inject
+ @javax.inject.Inject
GridService gridService;
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index 6c1a23e..6c4ab5e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -200,10 +200,10 @@ public class MetaModelServiceDefault implements MetaModelService2 {
- @Inject
+ @javax.inject.Inject
SpecificationLoader specificationLookup;
- @Inject
+ @javax.inject.Inject
GridService gridService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java
index 2bde668..bad3c7d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/SwaggerServiceDefault.java
@@ -71,7 +71,7 @@ public class SwaggerServiceDefault implements SwaggerService {
}
- @Inject
+ @javax.inject.Inject
SpecificationLoader specificationLoader;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
index e80abd3..e41939b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitleServiceDefault.java
@@ -64,7 +64,7 @@ public class TitleServiceDefault implements TitleService {
// //////////////////////////////////////
- @Inject
+ @javax.inject.Inject
PersistenceSessionServiceInternal adapterManager;
@javax.inject.Inject
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
index 5174814..1cf57b4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
@@ -125,7 +125,7 @@ public class UserServiceDefault implements UserService {
}
- @Inject
+ @javax.inject.Inject
AuthenticationSessionProvider authenticationSessionProvider;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
index 9caf0ac..d64fba5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandard.java
@@ -50,10 +50,6 @@ public class AuthenticationManagerStandard implements AuthenticationManager {
private RandomCodeGenerator randomCodeGenerator;
private final IsisConfiguration configuration;
- // //////////////////////////////////////////////////////////
- // constructor
- // //////////////////////////////////////////////////////////
-
public AuthenticationManagerStandard(final IsisConfiguration configuration) {
this.configuration = configuration;
}
@@ -65,9 +61,9 @@ public class AuthenticationManagerStandard implements AuthenticationManager {
/**
* Will default the {@link #setRandomCodeGenerator(RandomCodeGenerator)
* RandomCodeGenerator}, but {@link Authenticator}(s) must have been
- * {@link #addAuthenticator(Authenticator) added} or
- * {@link #setAuthenticators(List) injected}.
+ * {@link #addAuthenticator(Authenticator) added}.
*/
+ @Programmatic
public final void init() {
defaultRandomCodeGeneratorIfNecessary();
addDefaultAuthenticators();
@@ -91,6 +87,7 @@ public class AuthenticationManagerStandard implements AuthenticationManager {
protected void addDefaultAuthenticators() {
}
+ @Programmatic
public void shutdown() {
for (final Authenticator authenticator : authenticators) {
authenticator.shutdown();
@@ -101,6 +98,7 @@ public class AuthenticationManagerStandard implements AuthenticationManager {
// Session Management (including authenticate)
// //////////////////////////////////////////////////////////
+ @Programmatic
@Override
public synchronized final AuthenticationSession authenticate(final AuthenticationRequest request) {
if (request == null) {
@@ -130,12 +128,14 @@ public class AuthenticationManagerStandard implements AuthenticationManager {
return code;
}
+ @Programmatic
@Override
public final boolean isSessionValid(final AuthenticationSession session) {
final String userName = userByValidationCode.get(session.getValidationCode());
return session.hasUserNameOf(userName);
}
+ @Programmatic
@Override
public void closeSession(final AuthenticationSession session) {
userByValidationCode.remove(session.getValidationCode());
@@ -145,46 +145,22 @@ public class AuthenticationManagerStandard implements AuthenticationManager {
// Authenticators
// //////////////////////////////////////////////////////////
- /**
- * Adds an {@link Authenticator}.
- *
- * <p>
- * Use either this or alternatively {@link #setAuthenticators(List) inject}
- * the full list of {@link Authenticator}s.
- */
@Programmatic
public final void addAuthenticator(final Authenticator authenticator) {
authenticators.add(authenticator);
}
- /**
- * Adds an {@link Authenticator} to the start of the list (not API).
- */
protected void addAuthenticatorToStart(final Authenticator authenticator) {
authenticators.add(0, authenticator);
}
- /**
- * Provide direct injection.
- *
- * <p>
- * Use either this or programmatically
- * {@link #addAuthenticator(Authenticator)}.
- */
- @Programmatic
- public void setAuthenticators(final List<Authenticator> authenticators) {
- this.authenticators = authenticators;
- }
-
@Programmatic
public List<Authenticator> getAuthenticators() {
return Collections.unmodifiableList(authenticators);
}
- // //////////////////////////////////////////////////////////
- // register
- // //////////////////////////////////////////////////////////
+ @Programmatic
@Override
public boolean register(final RegistrationDetails registrationDetails) {
for (final Registrar registrar : getRegistrars()) {
@@ -195,6 +171,7 @@ public class AuthenticationManagerStandard implements AuthenticationManager {
return false;
}
+ @Programmatic
@Override
public boolean supportsRegistration(final Class<? extends RegistrationDetails> registrationDetailsClass) {
for (final Registrar registrar : getRegistrars()) {
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
index a347048..ed47d28 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/authentication/standard/AuthenticationManagerStandardInstallerAbstract.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.authentication.standard;
import java.util.List;
import org.apache.isis.core.commons.components.InstallerAbstract;
-import org.apache.isis.core.commons.config.IsisConfigurationDefault;
+import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
@@ -30,7 +30,7 @@ public abstract class AuthenticationManagerStandardInstallerAbstract extends Ins
public AuthenticationManagerStandardInstallerAbstract(
final String name,
- final IsisConfigurationDefault isisConfiguration) {
+ final IsisConfiguration isisConfiguration) {
super(name, isisConfiguration);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefaultTest_usingFields.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefaultTest_usingFields.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefaultTest_usingFields.java
index 8aa8201..7be4655 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefaultTest_usingFields.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefaultTest_usingFields.java
@@ -53,26 +53,26 @@ public class ServicesInjectorDefaultTest_usingFields {
static class SomeDomainService3 { }
static class SomeDomainService1 {
- @Inject
+ @javax.inject.Inject
private DomainObjectContainer container;
DomainObjectContainer getContainer() {
return container;
}
- @Inject
+ @javax.inject.Inject
private SomeDomainService2Abstract someDomainService2;
SomeDomainService2Abstract getSomeDomainService2() {
return someDomainService2;
}
}
static abstract class SomeDomainService2Abstract {
- @Inject
+ @javax.inject.Inject
private SomeDomainService1 someDomainService1;
SomeDomainService1 getSomeDomainService1() {
return someDomainService1;
}
}
static class SomeDomainService2 extends SomeDomainService2Abstract {
- @Inject
+ @javax.inject.Inject
private SomeDomainService3 someDomainService3;
SomeDomainService3 getSomeDomainService3() {
return someDomainService3;
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
index 822a496..04fe4eb 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardForDfltRuntime.java
@@ -19,6 +19,9 @@
package org.apache.isis.core.runtime.authentication;
+import javax.inject.Inject;
+
+import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.fixtures.LogonFixture;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -27,7 +30,7 @@ import org.apache.isis.core.runtime.authentication.exploration.ExplorationSessio
import org.apache.isis.core.runtime.authentication.fixture.LogonFixtureAuthenticator;
import org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandard;
import org.apache.isis.core.runtime.system.DeploymentType;
-import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
/**
* A refinement of the {@link AuthenticationManagerStandard}, which adds support
@@ -53,10 +56,8 @@ public class AuthenticationManagerStandardForDfltRuntime extends AuthenticationM
super(configuration);
}
- // //////////////////////////////////////////////////////////
- // init
- // //////////////////////////////////////////////////////////
+ @Programmatic
@Override
protected void addDefaultAuthenticators() {
// we add to start to ensure that these special case authenticators
@@ -65,14 +66,14 @@ public class AuthenticationManagerStandardForDfltRuntime extends AuthenticationM
addAuthenticatorToStart(new LogonFixtureAuthenticator(getConfiguration()));
}
- // //////////////////////////////////////////////////////////
- // Session Management (including authenticate)
- // //////////////////////////////////////////////////////////
-
+ @Programmatic
@Override
public void closeSession(final AuthenticationSession session) {
super.closeSession(session);
- IsisContext.getSessionFactory().closeSession();
+ isisSessionFactory.closeSession();
}
+ @javax.inject.Inject
+ IsisSessionFactory isisSessionFactory;
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java
index 7c899c6..8840218 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/AuthenticationManagerStandardInstallerAbstractForDfltRuntime.java
@@ -25,6 +25,7 @@ import org.apache.isis.core.runtime.authentication.standard.AuthenticationManage
public abstract class AuthenticationManagerStandardInstallerAbstractForDfltRuntime extends AuthenticationManagerStandardInstallerAbstract {
+
public AuthenticationManagerStandardInstallerAbstractForDfltRuntime(
final String name,
final IsisConfigurationDefault isisConfiguration) {
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
index efd7419..8c5780a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
@@ -180,14 +180,14 @@ public class ObjectFixtureFilePersistor {
}
- @Inject
+ @javax.inject.Inject
IsisSessionFactory isisSessionFactory;
protected PersistenceSession getPersistenceSession() {
return isisSessionFactory.getCurrentSession().getPersistenceSession();
}
- @Inject
+ @javax.inject.Inject
SpecificationLoader specificationLoader;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
index c7ae44b..4e8b7a6a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
@@ -252,17 +252,17 @@ public class ObjectFixtureService {
}
// }}
- @Inject
+ @javax.inject.Inject
IsisSessionFactory isisSessionFactory;
protected PersistenceSession getPersistenceSession() {
return isisSessionFactory.getCurrentSession().getPersistenceSession();
}
- @Inject
+ @javax.inject.Inject
IsisConfiguration configuration;
- @Inject
+ @javax.inject.Inject
ServiceRegistry2 serviceRegistry;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/SwitchUserServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/SwitchUserServiceImpl.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/SwitchUserServiceImpl.java
index 79ddadb..058b145 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/SwitchUserServiceImpl.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/SwitchUserServiceImpl.java
@@ -79,13 +79,13 @@ public class SwitchUserServiceImpl implements SwitchUserService {
}
}
- @Inject
+ @javax.inject.Inject
AuthenticationManager authenticationManager;
- @Inject
+ @javax.inject.Inject
IsisSessionFactory isisSessionFactory;
- @Inject
+ @javax.inject.Inject
PersistenceSessionServiceInternal persistenceSessionServiceInternal;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Data.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Data.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Data.java
index 6ef79e3..3d01bad 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Data.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Data.java
@@ -26,6 +26,9 @@ import org.apache.isis.core.commons.encoding.DataInputExtended;
import org.apache.isis.core.commons.encoding.DataOutputExtended;
import org.apache.isis.core.commons.encoding.Encodable;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
+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;
public class Data implements Encodable, Serializable {
@@ -56,9 +59,6 @@ public class Data implements Encodable, Serializable {
// nothing to do
}
- // ///////////////////////////////////////////////////////
- //
- // ///////////////////////////////////////////////////////
/**
* Note: could be <tt>null</tt> if represents a value (standalone adapter).
@@ -76,4 +76,14 @@ public class Data implements Encodable, Serializable {
return className + "/" + oid;
}
+
+
+ protected PersistenceSession getPersistenceSession() {
+ return getSessionFactory().getCurrentSession().getPersistenceSession();
+ }
+
+ protected IsisSessionFactory getSessionFactory() {
+ return IsisContext.getSessionFactory();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
index a7fb36f..cd7e0b9 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
@@ -31,6 +31,7 @@ import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
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;
public class StandaloneData extends Data {
@@ -121,14 +122,10 @@ public class StandaloneData extends Data {
if (objectAsSerializable != null) {
return getPersistenceSession().adapterFor(objectAsSerializable);
} else {
- final ObjectSpecification spec = IsisContext.getSessionFactory().getSpecificationLoader().loadSpecification(getClassName());
+ final ObjectSpecification spec = getSessionFactory().getSpecificationLoader().loadSpecification(getClassName());
final EncodableFacet encodeableFacet = spec.getFacet(EncodableFacet.class);
return encodeableFacet.fromEncodedString(objectAsEncodedString);
}
}
- protected PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
- }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java
index d35647d..2a6b4a0 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java
@@ -37,12 +37,5 @@ public abstract class PersistenceCommandAbstract implements PersistenceCommand {
return adapter;
}
- // /////////////////////////////////////////////////////////////////////
- // Dependencies (from context)
- // /////////////////////////////////////////////////////////////////////
-
- protected static AuthenticationSession getAuthenticationSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
index 01e6af4..fbf6591 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
@@ -26,42 +26,51 @@ import org.apache.isis.core.commons.encoding.DataOutputExtended;
import org.apache.isis.core.commons.encoding.Encodable;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceQuery;
public abstract class PersistenceQueryAbstract implements PersistenceQuery, Encodable {
+ //region > constructor, fields
+
protected final long start;
protected final long count;
private final ObjectSpecification specification;
+ private final SpecificationLoader specificationLoader;
- public PersistenceQueryAbstract(final ObjectSpecification specification, final long ... range) {
+ public PersistenceQueryAbstract(
+ final ObjectSpecification specification,
+ final SpecificationLoader specificationLoader,
+ final long... range) {
+ this.specificationLoader = specificationLoader;
this.start = range.length > 0 ? range[0]:0;
this.count = range.length > 1 ? range[1]:0;
- this.specification = specification;
- initialized();
+ this.specification = specification;
+ // nothing to do
}
- protected PersistenceQueryAbstract(final DataInputExtended input, final long ... range) throws IOException {
+ protected PersistenceQueryAbstract(
+ final DataInputExtended input,
+ final SpecificationLoader specificationLoader,
+ final long... range) throws IOException {
+
+ this.specificationLoader = specificationLoader;
final String specName = input.readUTF();
this.start = range.length > 0 ? range[0]:0;
this.count = range.length > 1 ? range[1]:0;
- specification = getSpecificationLoader().loadSpecification(specName);
- initialized();
+ specification = specificationLoader.loadSpecification(specName);
+ // nothing to do
}
+ //endregion
+
@Override
public void encode(final DataOutputExtended output) throws IOException {
output.writeUTF(specification.getFullIdentifier());
}
- private void initialized() {
- // nothing to do
- }
-
/**
* The start index into the set table
* @return
@@ -72,27 +81,19 @@ public abstract class PersistenceQueryAbstract implements PersistenceQuery, Enco
/**
- * The number of items to return, starting at {@link QueryFindAllPaged#getStart()}
- * @return
+ * The number of items to return, starting at {@link #getStart()}
*/
public long getCount() {
return count;
}
- // ///////////////////////////////////////////////////////
- //
- // ///////////////////////////////////////////////////////
-
@Override
public ObjectSpecification getSpecification() {
return specification;
}
- // ///////////////////////////////////////////////////////
- // equals, hashCode
- // ///////////////////////////////////////////////////////
-
+ //region > equals, hashCode
@Override
public boolean equals(final Object obj) {
if (this == obj) {
@@ -124,12 +125,6 @@ public abstract class PersistenceQueryAbstract implements PersistenceQuery, Enco
return result;
}
- // ///////////////////////////////////////////////////////
- // Dependencies (from context)
- // ///////////////////////////////////////////////////////
-
- protected static SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSessionFactory().getSpecificationLoader();
- }
+ //endregion
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java
index 500c7c5..7a09599 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java
@@ -25,6 +25,7 @@ import org.apache.isis.applib.query.Query;
import org.apache.isis.applib.query.QueryBuiltInAbstract;
import org.apache.isis.core.commons.encoding.DataInputExtended;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.persistence.PersistenceQuery;
/**
@@ -39,16 +40,22 @@ public abstract class PersistenceQueryBuiltInAbstract extends PersistenceQueryAb
protected long index;
protected long countedSoFar;
- public PersistenceQueryBuiltInAbstract(final ObjectSpecification specification, final long ... range) {
- super(specification, range);
+ public PersistenceQueryBuiltInAbstract(
+ final ObjectSpecification specification,
+ final SpecificationLoader specificationLoader,
+ final long... range) {
+ super(specification, specificationLoader, range);
}
- public PersistenceQueryBuiltInAbstract(final DataInputExtended input, final long ... range) throws IOException {
- super(input, range);
+ public PersistenceQueryBuiltInAbstract(
+ final DataInputExtended input,
+ final SpecificationLoader specificationLoader,
+ final long... range) throws IOException {
+ super(input, specificationLoader, range);
}
protected boolean matchesRange(final boolean ifMatches) {
- if (ifMatches == false){
+ if (!ifMatches){
return false;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindAllInstances.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindAllInstances.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindAllInstances.java
index aac7081..e65cd1c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindAllInstances.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindAllInstances.java
@@ -23,13 +23,18 @@ import org.apache.isis.applib.query.QueryFindAllInstances;
import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
/**
* Corresponds to {@link QueryFindAllInstances}
*/
public class PersistenceQueryFindAllInstances extends PersistenceQueryBuiltInAbstract {
- public PersistenceQueryFindAllInstances(final ObjectSpecification specification, final long ... range) {
- super(specification, range);
+
+ public PersistenceQueryFindAllInstances(
+ final ObjectSpecification specification,
+ final SpecificationLoader specificationLoader,
+ final long... range) {
+ super(specification, specificationLoader, range);
index=0;
countedSoFar=0;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByPattern.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByPattern.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByPattern.java
index 3bad9dd..f3c1aef 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByPattern.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByPattern.java
@@ -27,6 +27,7 @@ import org.apache.isis.core.metamodel.services.container.query.QueryFindByPatter
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.ObjectAssociation;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
/**
* Corresponds to {@link QueryFindByPattern}.
@@ -38,8 +39,12 @@ public class PersistenceQueryFindByPattern extends PersistenceQueryBuiltInAbstra
return pattern;
}
- public PersistenceQueryFindByPattern(final ObjectSpecification specification, final ObjectAdapter pattern, final long ... range) {
- super(specification, range);
+ public PersistenceQueryFindByPattern(
+ final ObjectSpecification specification,
+ final ObjectAdapter pattern,
+ final SpecificationLoader specificationLoader,
+ final long... range) {
+ super(specification, specificationLoader, range);
this.pattern = pattern;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByTitle.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByTitle.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByTitle.java
index 98a68e4..6da48e9 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByTitle.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindByTitle.java
@@ -23,6 +23,7 @@ import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.services.container.query.QueryFindByTitle;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
/**
* Corresponds to {@link QueryFindByTitle}.
@@ -30,8 +31,12 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public class PersistenceQueryFindByTitle extends PersistenceQueryBuiltInAbstract {
private final String title;
- public PersistenceQueryFindByTitle(final ObjectSpecification specification, final String title, final long ... range) {
- super(specification, range);
+ public PersistenceQueryFindByTitle(
+ final ObjectSpecification specification,
+ final String title,
+ final SpecificationLoader specificationLoader,
+ final long... range) {
+ super(specification, specificationLoader, range);
this.title = title == null ? "" : title.toLowerCase();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
index e66307b..bf54735 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
@@ -31,6 +31,7 @@ import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
/**
* Corresponds to an object-store specific implementation of {@link Query}.
@@ -41,20 +42,29 @@ public class PersistenceQueryFindUsingApplibQueryDefault extends PersistenceQuer
private final QueryCardinality cardinality;
private final Map<String, ObjectAdapter> argumentsAdaptersByParameterName;
- public PersistenceQueryFindUsingApplibQueryDefault(final ObjectSpecification specification, final String queryName, final Map<String, ObjectAdapter> argumentsAdaptersByParameterName, final QueryCardinality cardinality, final long ... range) {
- super(specification, range);
+ public PersistenceQueryFindUsingApplibQueryDefault(
+ final ObjectSpecification specification,
+ final String queryName,
+ final Map<String, ObjectAdapter> argumentsAdaptersByParameterName,
+ final QueryCardinality cardinality,
+ final SpecificationLoader specificationLoader,
+ final long... range) {
+ super(specification, specificationLoader, range);
this.queryName = queryName;
this.cardinality = cardinality;
this.argumentsAdaptersByParameterName = argumentsAdaptersByParameterName;
initialized();
}
- public PersistenceQueryFindUsingApplibQueryDefault(final DataInputExtended input, final long ... range) throws IOException {
- super(input, range);
+ public PersistenceQueryFindUsingApplibQueryDefault(
+ final DataInputExtended input,
+ final SpecificationLoader specificationLoader,
+ final long... range) throws IOException {
+ super(input, specificationLoader, range);
this.queryName = input.readUTF();
this.cardinality = QueryCardinality.valueOf(input.readUTF());
// TODO: need to read from input
- this.argumentsAdaptersByParameterName = new HashMap<String, ObjectAdapter>();
+ this.argumentsAdaptersByParameterName = new HashMap<>();
initialized();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java
index 240d759..4037df7 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java
@@ -27,6 +27,7 @@ import org.apache.isis.core.commons.encoding.DataOutputExtended;
import org.apache.isis.core.commons.util.ToString;
import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
/**
* Corresponds to an object-store specific implementation of {@link Query}.
@@ -36,15 +37,22 @@ public class PersistenceQueryFindUsingApplibQuerySerializable extends Persistenc
private final Query<?> query;
private final QueryCardinality cardinality;
- public PersistenceQueryFindUsingApplibQuerySerializable(final ObjectSpecification specification, final Query<?> query, final QueryCardinality cardinality) {
- super(specification, query.getStart(), query.getCount());
+ public PersistenceQueryFindUsingApplibQuerySerializable(
+ final ObjectSpecification specification,
+ final Query<?> query,
+ final QueryCardinality cardinality,
+ final SpecificationLoader specificationLoader) {
+ super(specification, specificationLoader, query.getStart(), query.getCount());
this.query = query;
this.cardinality = cardinality;
initialized();
}
- public PersistenceQueryFindUsingApplibQuerySerializable(final DataInputExtended input, final long ... range) throws IOException {
- super(input, range);
+ public PersistenceQueryFindUsingApplibQuerySerializable(
+ final DataInputExtended input,
+ final SpecificationLoader specificationLoader,
+ final long... range) throws IOException {
+ super(input, specificationLoader, range);
this.query = input.readSerializable(Query.class);
this.cardinality = QueryCardinality.valueOf(input.readUTF());
initialized();
@@ -62,8 +70,6 @@ public class PersistenceQueryFindUsingApplibQuerySerializable extends Persistenc
}
// ///////////////////////////////////////////////////////
- //
- // ///////////////////////////////////////////////////////
public Query getApplibQuery() {
return query;
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/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 b2aaa6b..b1420a6 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
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Map;
import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
import com.google.inject.Provides;
import com.google.inject.Singleton;
@@ -103,7 +102,7 @@ public class IsisInjectModule extends AbstractModule {
}
@Provides
- @Inject
+ @com.google.inject.Inject
@Singleton
protected IsisSessionFactory provideIsisSessionFactory(final AppManifest appManifestIfAny) {
@@ -122,7 +121,7 @@ public class IsisInjectModule extends AbstractModule {
}
@Provides
- @Inject
+ @com.google.inject.Inject
@Singleton
protected ServicesInjector provideServicesInjector(final IsisSessionFactory isisSessionFactory) {
return isisSessionFactory.getServicesInjector();
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java
index 7bb61fa..59be442 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/auditing/AuditingServiceInternal.java
@@ -129,25 +129,25 @@ public class AuditingServiceInternal {
/**
* could be null if none has been registered.
*/
- @Inject
+ @javax.inject.Inject
private AuditingService3 auditingServiceIfAny;
- @Inject
+ @javax.inject.Inject
private List<AuditerService> auditerServices;
- @Inject
+ @javax.inject.Inject
private ChangedObjectsServiceInternal changedObjectsServiceInternal;
- @Inject
+ @javax.inject.Inject
UserService userService;
- @Inject
+ @javax.inject.Inject
ClockService clockService;
- @Inject
+ @javax.inject.Inject
InteractionContext interactionContext;
- @Inject
+ @javax.inject.Inject
TransactionService transactionService;
}
[39/50] [abbrv] isis git commit: ISIS-1437: uses a ThreadPool to
initialize Wicket viewer components in parallel.
Posted by da...@apache.org.
ISIS-1437: uses a ThreadPool to initialize Wicket viewer components in parallel.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9eb35d3e
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9eb35d3e
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9eb35d3e
Branch: refs/heads/master
Commit: 9eb35d3eac51173a9a04e3835bb67f02356f580b
Parents: 512d2d2
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jun 15 12:10:28 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jun 15 12:10:28 2016 +0100
----------------------------------------------------------------------
.../runtime/threadpool/ThreadPoolSupport.java | 102 +++++++++++++++++++
.../wicket/viewer/IsisWicketApplication.java | 39 ++++++-
.../src/main/webapp/WEB-INF/logging.properties | 4 +
3 files changed, 142 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9eb35d3e/core/metamodel/src/main/java/org/apache/isis/core/runtime/threadpool/ThreadPoolSupport.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/threadpool/ThreadPoolSupport.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/threadpool/ThreadPoolSupport.java
new file mode 100644
index 0000000..0aee0fd
--- /dev/null
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/threadpool/ThreadPoolSupport.java
@@ -0,0 +1,102 @@
+/*
+ * 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.threadpool;
+
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import com.google.common.collect.Lists;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public final class ThreadPoolSupport {
+
+ private static final Logger LOG = LoggerFactory.getLogger(ThreadPoolSupport.class);
+
+ public static ThreadGroup group;
+
+ public static ThreadPoolExecutor executor ;
+
+ static {
+ group = new ThreadGroup(ThreadPoolSupport.class.getName());
+
+ final int corePoolSize = Runtime.getRuntime().availableProcessors();
+ final int maximumPoolSize = Runtime.getRuntime().availableProcessors();
+ final int keepAliveTimeSecs = 5;
+
+ final int queueCapacity = 25;
+ final BlockingQueue<Runnable> workQueue = new LinkedBlockingQueue<>(queueCapacity);
+
+ executor = new ThreadPoolExecutor(
+ corePoolSize,
+ maximumPoolSize,
+ keepAliveTimeSecs, TimeUnit.SECONDS,
+ workQueue,
+ new ThreadFactory() {
+ @Override
+ public Thread newThread(final Runnable r) {
+ return new Thread(group, r);
+ }
+ });
+ }
+
+ public static List<Object> join(final List<Future<Object>> futures) {
+ if (futures == null) {
+ return null;
+ }
+
+ final long t0 = System.currentTimeMillis();
+ try{
+ final List<Object> returnValues = Lists.newArrayList();
+ for (Future<Object> future : futures) {
+ returnValues.add(join(future));
+ }
+ return returnValues;
+ } finally {
+ final long t1 = System.currentTimeMillis();
+ LOG.info("join'ing {} tasks: waited {} milliseconds ", futures.size(), (t1-t0));
+ }
+ }
+
+ public static Object join(final Future<Object> future) {
+ try {
+ return future.get();
+ } catch (InterruptedException | ExecutionException e) {
+ // ignore
+ }
+ return null;
+ }
+
+ public static List<Future<Object>> invokeAll(final List<Callable<Object>> callables) {
+ try {
+ return executor.invokeAll(callables);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/9eb35d3e/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index 46ed84d..7efc13a 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -24,6 +24,8 @@ import java.util.List;
import java.util.ServiceLoader;
import java.util.Set;
import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
import com.google.common.base.Function;
import com.google.common.collect.Lists;
@@ -71,8 +73,12 @@ import org.apache.isis.core.runtime.runner.IsisInjectModule;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.threadpool.ThreadPoolSupport;
import org.apache.isis.core.webapp.IsisWebAppBootstrapper;
import org.apache.isis.core.webapp.WebAppConstants;
+import org.apache.isis.schema.utils.ChangesDtoUtils;
+import org.apache.isis.schema.utils.CommandDtoUtils;
+import org.apache.isis.schema.utils.InteractionDtoUtils;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
@@ -237,12 +243,11 @@ public class IsisWicketApplication
*/
@Override
protected void init() {
+ List<Future<Object>> futures = null;
try {
super.init();
- configureWebJars();
- configureWicketBootstrap();
- configureWicketSelect2();
+ futures = startBackgroundInitializationThreads();
String isisConfigDir = getServletContext().getInitParameter("isis.config.dir");
@@ -315,9 +320,37 @@ public class IsisWicketApplication
// because Wicket's handling in its WicketFilter (that calls this method) does not log the exception.
LOG.error("Failed to initialize", ex);
throw ex;
+ } finally {
+ ThreadPoolSupport.join(futures);
}
}
+ protected List<Future<Object>> startBackgroundInitializationThreads() {
+ return ThreadPoolSupport.invokeAll(Lists.newArrayList(
+ new Callable<Object>() {
+ @Override
+ public Object call() throws Exception {
+ configureWebJars();
+ return null;
+ }
+ },
+ new Callable<Object>() {
+ @Override
+ public Object call() throws Exception {
+ configureWicketBootstrap();
+ return null;
+ }
+ },
+ new Callable<Object>() {
+ @Override
+ public Object call() throws Exception {
+ configureWicketSelect2();
+ return null;
+ }
+ }
+ ));
+ }
+
/**
* protected visibility to allow ad-hoc overriding of some other authentication strategy.
*/
http://git-wip-us.apache.org/repos/asf/isis/blob/9eb35d3e/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
index ca7a641..7cbfcc6 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/logging.properties
@@ -207,6 +207,10 @@ log4j.additivity.org.apache.isis.core.commons.config.IsisConfigurationDefault=fa
log4j.logger.org.apache.isis.core.runtime.installers.InstallerLookupDefault=WARN,Console
log4j.additivity.org.apache.isis.core.runtime.installers.InstallerLookupDefault=false
+log4j.logger.org.apache.isis.core.runtime.threadpool.ThreadPoolSupport=INFO,Console
+log4j.additivity.org.apache.isis.core.runtime.threadpool.ThreadPoolSupport=false
+
+
# quieten Shiro
log4j.logger.org.apache.shiro.realm.AuthorizingRealm=WARN,Console
[22/50] [abbrv] isis git commit: ISIS-1427: consolidating to only
necessary calls to IsisContext#getIsisSessionFactory;
also fully qualify @Inject (as either javax or com.google) throughout.
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
index ab45158..5ce1f9e 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
@@ -19,13 +19,14 @@
package org.apache.isis.viewer.wicket.viewer.registries.pages;
-import com.google.inject.Inject;
import com.google.inject.Singleton;
+
import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
@@ -40,7 +41,7 @@ public class PageNavigationServiceDefault implements PageNavigationService {
private final PageClassRegistry pageClassRegistry;
- @Inject
+ @com.google.inject.Inject
public PageNavigationServiceDefault(final PageClassRegistry pageClassRegistry) {
this.pageClassRegistry = pageClassRegistry;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
index 6720f08..7c8bbac 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
@@ -75,6 +75,6 @@ public class DeepLinkServiceWicket implements DeepLinkService {
return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
- @Inject
+ @javax.inject.Inject
private GuiceBeanProvider guiceBeanProvider;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java
index a6d1436..c97f8a6 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/services/Object_clearHints.java
@@ -71,10 +71,10 @@ public class Object_clearHints {
: null;
}
- @Inject
+ @javax.inject.Inject
HintStore hintStore;
- @Inject
+ @javax.inject.Inject
BookmarkService bookmarkService;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
index 33ef03e..0771dde 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
@@ -23,6 +23,7 @@ import com.google.inject.Singleton;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
@Singleton
@@ -31,7 +32,11 @@ public class WicketViewerSettingsDefault implements WicketViewerSettings {
private static final long serialVersionUID = 1L;
IsisConfiguration getConfiguration() {
- return IsisContext.getSessionFactory().getConfiguration();
+ return getIsisSessionFactory().getConfiguration();
+ }
+
+ IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
index c4a7803..13d3334 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/CollectionMemento.java
@@ -24,7 +24,8 @@ import java.io.Serializable;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
/**
* {@link Serializable} representation of a {@link OneToManyAssociation} (a
@@ -34,8 +35,11 @@ public class CollectionMemento implements Serializable {
private static final long serialVersionUID = 1L;
- private static ObjectSpecification owningSpecFor(final OneToManyAssociation association) {
- return IsisContext.getSessionFactory().getSpecificationLoader().loadSpecification(association.getIdentifier().toClassIdentityString());
+ private static ObjectSpecification owningSpecFor(
+ final OneToManyAssociation association,
+ final IsisSessionFactory isisSessionFactory) {
+ final SpecificationLoader specificationLoader = isisSessionFactory.getSpecificationLoader();
+ return specificationLoader.loadSpecification(association.getIdentifier().toClassIdentityString());
}
private final ObjectSpecId owningType;
@@ -43,12 +47,14 @@ public class CollectionMemento implements Serializable {
private transient OneToManyAssociation collection;
- public CollectionMemento(final ObjectSpecId owningType, final String id) {
+ public CollectionMemento(
+ final ObjectSpecId owningType,
+ final String id) {
this(owningType, id, collectionFor(owningType, id));
}
- public CollectionMemento(final OneToManyAssociation collection) {
- this(owningSpecFor(collection).getSpecId(), collection.getIdentifier().toNameIdentityString(), collection);
+ public CollectionMemento(final OneToManyAssociation collection, final IsisSessionFactory isisSessionFactory) {
+ this(owningSpecFor(collection, isisSessionFactory).getSpecId(), collection.getIdentifier().toNameIdentityString(), collection);
}
private CollectionMemento(final ObjectSpecId owningType, final String id, final OneToManyAssociation collection) {
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
index a9747dc..0de17f1 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java
@@ -42,10 +42,12 @@ import org.apache.isis.core.runtime.memento.Memento;
import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
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;
public class ObjectAdapterMemento implements Serializable {
private static final long serialVersionUID = 1L;
+ public static final OidMarshaller OID_MARSHALLER = new OidMarshaller();
/**
* Factory method
@@ -109,7 +111,7 @@ public class ObjectAdapterMemento implements Serializable {
PERSISTENT {
@Override
ObjectAdapter recreateAdapter(final ObjectAdapterMemento oam, ConcurrencyChecking concurrencyChecking) {
- RootOid oid = getOidMarshaller().unmarshal(oam.persistentOidStr, RootOid.class);
+ RootOid oid = OID_MARSHALLER.unmarshal(oam.persistentOidStr, RootOid.class);
try {
final ObjectAdapter adapter = getPersistenceSession().adapterFor(oid, concurrencyChecking);
return adapter;
@@ -119,8 +121,8 @@ public class ObjectAdapterMemento implements Serializable {
// with the correct version, even when there is a concurrency exception
// we copy this updated oid string into our memento so that, if we retry,
// we will succeed second time around
-
- oam.persistentOidStr = oid.enString(getOidMarshaller());
+
+ oam.persistentOidStr = oid.enString(OID_MARSHALLER);
}
}
@@ -129,7 +131,7 @@ public class ObjectAdapterMemento implements Serializable {
// REVIEW: this may be redundant because recreateAdapter also guarantees the version will be reset.
final ObjectAdapter adapter = recreateAdapter(oam, ConcurrencyChecking.NO_CHECK);
Oid oid = adapter.getOid();
- oam.persistentOidStr = oid.enString(getOidMarshaller());
+ oam.persistentOidStr = oid.enString(OID_MARSHALLER);
}
@Override
@@ -236,7 +238,7 @@ public class ObjectAdapterMemento implements Serializable {
assert !rootOid.isTransient();
- this.persistentOidStr = rootOid.enString(getOidMarshaller());
+ this.persistentOidStr = rootOid.enString(OID_MARSHALLER);
this.bookmark = rootOid.asBookmark();
this.objectSpecId = rootOid.getObjectSpecId();
this.type = Type.PERSISTENT;
@@ -268,9 +270,9 @@ public class ObjectAdapterMemento implements Serializable {
transientMemento = new Memento(adapter);
type = Type.TRANSIENT;
return;
- }
-
- persistentOidStr = oid.enString(getOidMarshaller());
+ }
+
+ persistentOidStr = oid.enString(OID_MARSHALLER);
bookmark = oid.asBookmark();
type = Type.PERSISTENT;
}
@@ -372,20 +374,22 @@ public class ObjectAdapterMemento implements Serializable {
};
}
- public static Function<OneToOneAssociation, PropertyMemento> fromProperty() {
+ public static Function<OneToOneAssociation, PropertyMemento> fromProperty(
+ final IsisSessionFactory isisSessionFactory) {
return new Function<OneToOneAssociation, PropertyMemento>() {
@Override
public PropertyMemento apply(final OneToOneAssociation from) {
- return new PropertyMemento(from);
+ return new PropertyMemento(from, isisSessionFactory);
}
};
}
- public static Function<OneToManyAssociation, CollectionMemento> fromCollection() {
+ public static Function<OneToManyAssociation, CollectionMemento> fromCollection(
+ final IsisSessionFactory isisSessionFactory) {
return new Function<OneToManyAssociation, CollectionMemento>() {
@Override
public CollectionMemento apply(final OneToManyAssociation from) {
- return new CollectionMemento(from);
+ return new CollectionMemento(from, isisSessionFactory);
}
};
}
@@ -465,11 +469,4 @@ public class ObjectAdapterMemento implements Serializable {
return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
- public static OidMarshaller getOidMarshaller() {
- return IsisContext.getSessionFactory().getOidMarshaller();
- }
-
-
-
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
index 3f734bc..6a4f951 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PropertyMemento.java
@@ -24,40 +24,41 @@ import java.io.Serializable;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
public class PropertyMemento implements Serializable {
private static final long serialVersionUID = 1L;
- private static ObjectSpecification owningSpecFor(final OneToOneAssociation association) {
- return IsisContext.getSessionFactory().getSpecificationLoader().loadSpecification(association.getIdentifier().toClassIdentityString());
+ private static ObjectSpecification owningSpecFor(
+ final OneToOneAssociation property,
+ final IsisSessionFactory isisSessionFactory) {
+ final SpecificationLoader specificationLoader = isisSessionFactory.getSpecificationLoader();
+ return specificationLoader.loadSpecification(property.getIdentifier().toClassIdentityString());
}
private final ObjectSpecId owningSpecId;
private final String identifier;
private final ObjectSpecId specId;
-// private transient OneToOneAssociation property;
-
- public PropertyMemento(final ObjectSpecId owningType, final String identifier) {
- this(owningType, identifier, null);
- }
-
- public PropertyMemento(final ObjectSpecId owningType, final String identifier, final ObjectSpecId type) {
- this(owningType, identifier, type, propertyFor(owningType, identifier));
- }
-
- public PropertyMemento(final OneToOneAssociation property) {
- this(owningSpecFor(property).getSpecId(), property.getIdentifier().toNameIdentityString(), property.getSpecification().getSpecId(), property);
+ public PropertyMemento(
+ final OneToOneAssociation property, final IsisSessionFactory isisSessionFactory) {
+ this(
+ owningSpecFor(property, isisSessionFactory).getSpecId(),
+ property.getIdentifier().toNameIdentityString(),
+ property.getSpecification().getSpecId()
+ );
}
- private PropertyMemento(final ObjectSpecId owningSpecId, final String name, final ObjectSpecId specId, final OneToOneAssociation property) {
+ private PropertyMemento(
+ final ObjectSpecId owningSpecId,
+ final String name,
+ final ObjectSpecId specId) {
this.owningSpecId = owningSpecId;
this.identifier = name;
this.specId = specId;
-// this.property = property;
}
public ObjectSpecId getOwningType() {
@@ -73,10 +74,6 @@ public class PropertyMemento implements Serializable {
}
public OneToOneAssociation getProperty() {
-// if (property == null) {
-// property = propertyFor(owningSpecId, identifier);
-// }
-// return property;
return propertyFor(owningSpecId, identifier);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
index 2f788c4..14c05d7 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNode.java
@@ -26,6 +26,7 @@ import com.google.common.base.Objects;
import com.google.common.collect.Lists;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
@@ -33,13 +34,14 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
public class BookmarkTreeNode implements Serializable {
-
+
private static final long serialVersionUID = 1L;
-
+
+ private static final OidMarshaller OID_MARSHALLER = new OidMarshaller();
+
private final List<BookmarkTreeNode> children = Lists.newArrayList();
private final int depth;
@@ -60,8 +62,8 @@ public class BookmarkTreeNode implements Serializable {
final int depth) {
pageParameters = bookmarkableModel.getPageParameters();
RootOid oid = oidFrom(pageParameters);
- this.oidNoVerStr = getOidMarshaller().marshalNoVersion(oid);
- this.oidNoVer = getOidMarshaller().unmarshal(oidNoVerStr, RootOid.class);
+ this.oidNoVerStr = OID_MARSHALLER.marshalNoVersion(oid);
+ this.oidNoVer = OID_MARSHALLER.unmarshal(oidNoVerStr, RootOid.class);
// replace oid with the noVer equivalent.
PageParameterNames.OBJECT_OID.removeFrom(pageParameters);
@@ -209,8 +211,8 @@ public class BookmarkTreeNode implements Serializable {
final Oid possibleParentOid = possibleParentAdapter.getOid();
if(possibleParentOid == null) {
continue;
- }
- final String possibleParentOidStr = possibleParentOid.enStringNoVersion(getOidMarshaller());
+ }
+ final String possibleParentOidStr = possibleParentOid.enStringNoVersion(OID_MARSHALLER);
if(Objects.equal(this.oidNoVerStr, possibleParentOidStr)) {
this.addChild(candidateBookmarkableModel);
whetherAdded = true;
@@ -246,7 +248,7 @@ public class BookmarkTreeNode implements Serializable {
return null;
}
try {
- return getOidMarshaller().unmarshal(oidStr, RootOid.class);
+ return OID_MARSHALLER.unmarshal(oidStr, RootOid.class);
} catch(Exception ex) {
return null;
}
@@ -254,17 +256,7 @@ public class BookmarkTreeNode implements Serializable {
public static String oidStrFrom(BookmarkableModel<?> candidateBookmarkableModel) {
final RootOid oid = oidFrom(candidateBookmarkableModel.getPageParameters());
- return oid != null? getOidMarshaller().marshalNoVersion(oid): null;
+ return oid != null? OID_MARSHALLER.marshalNoVersion(oid): null;
}
-
- // //////////////////////////////////////
-
- protected static OidMarshaller getOidMarshaller() {
- return IsisContext.getSessionFactory().getOidMarshaller();
- }
-
-
-
-
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
index 6b51ebc..6cb0305 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkTreeNodeComparator.java
@@ -21,17 +21,14 @@ package org.apache.isis.viewer.wicket.model.models;
import java.util.Comparator;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
final class BookmarkTreeNodeComparator implements Comparator<BookmarkTreeNode> {
-
+
@Override
public int compare(BookmarkTreeNode o1, BookmarkTreeNode o2) {
@@ -66,21 +63,17 @@ final class BookmarkTreeNodeComparator implements Comparator<BookmarkTreeNode> {
return getSpecificationLoader().lookupBySpecId(objectSpecId).getIdentifier().getClassName();
}
- private RootOid oidOf(PageParameters pp) {
- String oidStr = PageParameterNames.OBJECT_OID.getStringFrom(pp);
- return getOidMarshaller().unmarshal(oidStr, RootOid.class);
- }
-
+
//////////////////////////////////////////////////
// Dependencies (from context)
//////////////////////////////////////////////////
- protected OidMarshaller getOidMarshaller() {
- return IsisContext.getSessionFactory().getOidMarshaller();
- }
-
protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSessionFactory().getSpecificationLoader();
+ return getSessionFactory().getSpecificationLoader();
+ }
+
+ IsisSessionFactory getSessionFactory() {
+ return IsisContext.getSessionFactory();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
index dfe947a..77874ef 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
@@ -143,9 +143,8 @@ public class BookmarkedPagesModel extends ModelAbstract<List<? extends BookmarkT
protected IsisConfiguration getConfiguration() {
- return IsisContext.getSessionFactory().getConfiguration();
+ return getIsisSessionFactory().getConfiguration();
}
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index 5a9e142..f46d7ef 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -37,20 +37,16 @@ import org.apache.isis.core.commons.lang.ClassUtil;
import org.apache.isis.core.commons.lang.Closure;
import org.apache.isis.core.commons.lang.IterableExtensions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.collections.sortedby.SortedByFacet;
import org.apache.isis.core.metamodel.facets.object.paged.PagedFacet;
import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
-import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-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;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.links.LinksProvider;
@@ -129,11 +125,11 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
if(sortedBy != null) {
@SuppressWarnings("unchecked")
final Comparator<Object> comparator = (Comparator<Object>) InstanceUtil.createInstance(sortedBy);
- getServicesInjector().injectServicesInto(comparator);
+ entityCollectionModel.getIsisSessionFactory().getServicesInjector().injectServicesInto(comparator);
Collections.sort(objectList, comparator);
}
- final Iterable<ObjectAdapter> adapterIterable = Iterables.transform(objectList, ObjectAdapter.Functions.adapterForUsing(getAdapterManagerStatic()));
+ final Iterable<ObjectAdapter> adapterIterable = Iterables.transform(objectList, ObjectAdapter.Functions.adapterForUsing( entityCollectionModel.getPersistenceSession()));
final List<ObjectAdapter> adapterList = Lists.newArrayList(adapterIterable);
return adapterList;
@@ -194,11 +190,14 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
/**
* Factory.
*/
- public static EntityCollectionModel createStandalone(final ObjectAdapter collectionAsAdapter) {
+ public static EntityCollectionModel createStandalone(
+ final ObjectAdapter collectionAsAdapter,
+ final IsisSessionFactory sessionFactory) {
final Iterable<Object> pojos = EntityCollectionModel.asIterable(collectionAsAdapter);
-
- final List<ObjectAdapterMemento> mementoList =
- Lists.newArrayList(Iterables.transform(pojos, ObjectAdapterMemento.Functions.fromPojo(getAdapterManagerStatic())));
+
+ final List<ObjectAdapterMemento> mementoList =
+ Lists.newArrayList(Iterables.transform(pojos, ObjectAdapterMemento.Functions.fromPojo(
+ sessionFactory.getCurrentSession().getPersistenceSession())));
final ObjectSpecification elementSpec;
if(!Iterables.isEmpty(pojos)) {
@@ -213,7 +212,7 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
}
};
IterableExtensions.fold(Iterables.transform(pojos, function), closure);
- elementSpec = getSpecificationLoaderStatic().loadSpecification(closure.getLowestCommonSuperclass());
+ elementSpec = sessionFactory.getSpecificationLoader().loadSpecification(closure.getLowestCommonSuperclass());
} else {
elementSpec = collectionAsAdapter.getElementSpecification();
}
@@ -315,21 +314,22 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
final OneToManyAssociation collection = collectionFor(entityModel.getObjectAdapterMemento(), getLayoutData());
this.type = Type.PARENTED;
this.typeOf = forName(collection.getSpecification());
- this.collectionMemento = new CollectionMemento(collection);
+ this.collectionMemento = new CollectionMemento(collection, entityModel.getIsisSessionFactory());
this.pageSize = pageSize(collection.getFacet(PagedFacet.class), PAGE_SIZE_DEFAULT_FOR_PARENTED);
final SortedByFacet sortedByFacet = collection.getFacet(SortedByFacet.class);
this.sortedBy = sortedByFacet != null ? sortedByFacet.value(): null;
}
- private static OneToManyAssociation collectionFor(
- final ObjectAdapterMemento parentObjectAdapterMemento, final CollectionLayoutData collectionLayoutData) {
+ private OneToManyAssociation collectionFor(
+ final ObjectAdapterMemento parentObjectAdapterMemento,
+ final CollectionLayoutData collectionLayoutData) {
if(collectionLayoutData == null) {
throw new IllegalArgumentException("EntityModel must have a CollectionLayoutMetadata");
}
final String collectionId = collectionLayoutData.getId();
final ObjectSpecId objectSpecId = parentObjectAdapterMemento.getObjectSpecId();
- final ObjectSpecification objectSpec = getSpecificationLoaderStatic().lookupBySpecId(objectSpecId);
+ final ObjectSpecification objectSpec = getIsisSessionFactory().getSpecificationLoader().lookupBySpecId(objectSpecId);
final OneToManyAssociation otma = (OneToManyAssociation) objectSpec.getAssociation(collectionId);
return otma;
}
@@ -388,7 +388,7 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
public ObjectSpecification getTypeOfSpecification() {
if (typeOfSpec == null) {
- typeOfSpec = getSpecificationLoaderStatic().loadSpecification(typeOf);
+ typeOfSpec = getSpecificationLoader().loadSpecification(typeOf);
}
return typeOfSpec;
}
@@ -405,7 +405,7 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
public void setObjectList(ObjectAdapter resultAdapter) {
final Iterable<Object> pojos = EntityCollectionModel.asIterable(resultAdapter);
this.mementoList = Lists.newArrayList(
- Iterables.transform(pojos, ObjectAdapterMemento.Functions.fromPojo(getAdapterManagerStatic())));
+ Iterables.transform(pojos, ObjectAdapterMemento.Functions.fromPojo(getPersistenceSession())));
}
/**
@@ -504,22 +504,5 @@ public class EntityCollectionModel extends ModelAbstract<List<ObjectAdapter>> im
}
- // //////////////////////////////////////
-
- private static AdapterManager getAdapterManagerStatic() {
- return getPersistenceSessionStatic();
- }
-
- private static ServicesInjector getServicesInjector() {
- return getPersistenceSessionStatic().getServicesInjector();
- }
-
- private static PersistenceSession getPersistenceSessionStatic() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
- }
-
- private static SpecificationLoader getSpecificationLoaderStatic() {
- return IsisContext.getSessionFactory().getSpecificationLoader();
- }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
index 7015de0..0497744 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
@@ -43,8 +43,6 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
@@ -63,6 +61,8 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> implements UiH
private static final long serialVersionUID = 1L;
+ private static OidMarshaller oidMarshaller = new OidMarshaller();
+
// //////////////////////////////////////////////////////////
// factory methods for PageParameters
// //////////////////////////////////////////////////////////
@@ -78,7 +78,7 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> implements UiH
final Boolean persistent = adapter != null && adapter.representsPersistent();
if (persistent) {
- final String oidStr = adapter.getOid().enStringNoVersion(getOidMarshaller());
+ final String oidStr = adapter.getOid().enStringNoVersion(oidMarshaller);
PageParameterNames.OBJECT_OID.addStringTo(pageParameters, oidStr);
} else {
// don't do anything; instead the page should be redirected back to
@@ -175,7 +175,7 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> implements UiH
}
private static RootOid rootOidFrom(final PageParameters pageParameters) {
- return getOidMarshaller().unmarshal(oidStr(pageParameters), RootOid.class);
+ return oidMarshaller.unmarshal(oidStr(pageParameters), RootOid.class);
}
@@ -195,7 +195,7 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> implements UiH
return createPageParameters(getObject());
}
- static class HintPageParameterSerializer implements Serializable {
+ class HintPageParameterSerializer implements Serializable {
private static final long serialVersionUID = 1L;
private static final String PREFIX = "hint-";
@@ -237,10 +237,8 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> implements UiH
}
protected HintStore getHintStore() {
- return IsisContext.getSessionFactory().getServicesInjector().lookupService(HintStore.class);
+ return getIsisSessionFactory().getServicesInjector().lookupService(HintStore.class);
}
-
-
}
// //////////////////////////////////////////////////////////
@@ -627,17 +625,5 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> implements UiH
}
- // //////////////////////////////////////////////////////////
- // Dependencies (from context)
- // //////////////////////////////////////////////////////////
-
- protected static OidMarshaller getOidMarshaller() {
- return IsisContext.getSessionFactory().getOidMarshaller();
- }
-
- protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSessionFactory().getSpecificationLoader();
- }
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
index afd0c2b..924b444 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
@@ -22,9 +22,11 @@ package org.apache.isis.viewer.wicket.model.models;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
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.IsisSession;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
/**
* Adapter for {@link LoadableDetachableModel}s, providing access to some of the
@@ -47,15 +49,24 @@ public abstract class ModelAbstract<T> extends LoadableDetachableModel<T> {
// //////////////////////////////////////////////////////////////
protected AuthenticationSession getAuthenticationSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
+ return getCurrentSession().getAuthenticationSession();
}
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
+ return getCurrentSession().getPersistenceSession();
}
- protected AdapterManager getAdapterManager() {
- return getPersistenceSession();
+ protected IsisSession getCurrentSession() {
+ return getIsisSessionFactory().getCurrentSession();
}
+ public IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
+ }
+
+ public SpecificationLoader getSpecificationLoader() {
+ return getIsisSessionFactory().getSpecificationLoader();
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 249119d..f96919c 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -815,7 +815,7 @@ public class ScalarModel extends EntityModel implements LinksProvider {
final boolean cloneable = recreatableObjectFacet.isCloneable(viewModel);
if(cloneable) {
final Object newViewModel = recreatableObjectFacet.clone(viewModel);
- adapter = getAdapterManager().adapterFor(newViewModel);
+ adapter = getPersistenceSession().adapterFor(newViewModel);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/MementoFunctions.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/MementoFunctions.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/MementoFunctions.java
deleted file mode 100644
index 1187f8d..0000000
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/util/MementoFunctions.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.viewer.wicket.model.util;
-
-import com.google.common.base.Function;
-
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
-import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.viewer.wicket.model.mementos.ActionMemento;
-import org.apache.isis.viewer.wicket.model.mementos.ActionParameterMemento;
-import org.apache.isis.viewer.wicket.model.mementos.CollectionMemento;
-import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.viewer.wicket.model.mementos.PropertyMemento;
-
-/**
- * @deprecated - use {@link ObjectAdapterMemento.Functions}
- */
-@Deprecated
-public final class MementoFunctions {
-
- private MementoFunctions() {
- }
-
- /**
- * @deprecated - use {@link ObjectAdapterMemento.Functions}
- */
- @Deprecated
- public static Function<ObjectSpecification, ObjectSpecId> fromSpec() {
- return ObjectAdapterMemento.Functions.fromSpec();
- }
-
- /**
- * @deprecated - use {@link ObjectAdapterMemento.Functions}
- */
- @Deprecated
- public static Function<OneToOneAssociation, PropertyMemento> fromProperty() {
- return ObjectAdapterMemento.Functions.fromProperty();
- }
-
- /**
- * @deprecated - use {@link ObjectAdapterMemento.Functions}
- */
- @Deprecated
- public static Function<OneToManyAssociation, CollectionMemento> fromCollection() {
- return ObjectAdapterMemento.Functions.fromCollection();
- }
-
- /**
- * @deprecated - use {@link ObjectAdapterMemento.Functions}
- */
- @Deprecated
- public static Function<ObjectAction, ActionMemento> fromAction() {
- return ObjectAdapterMemento.Functions.fromAction();
- }
-
- /**
- * @deprecated - use {@link ObjectAdapterMemento.Functions}
- */
- @Deprecated
- public static Function<ObjectActionParameter, ActionParameterMemento> fromActionParameter() {
- return ObjectAdapterMemento.Functions.fromActionParameter();
- }
-
- /**
- * @deprecated - use {@link ObjectAdapterMemento.Functions}
- */
- @Deprecated
- public static Function<Object, ObjectAdapterMemento> fromPojo(final AdapterManager adapterManager) {
- return ObjectAdapterMemento.Functions.fromPojo(adapterManager);
- }
-
- /**
- * @deprecated - use {@link ObjectAdapterMemento.Functions}
- */
- @Deprecated
- public static Function<ObjectAdapter, ObjectAdapterMemento> fromAdapter() {
- return ObjectAdapterMemento.Functions.fromAdapter();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
index 591873f..71211fc 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
@@ -29,23 +29,30 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.time.Duration;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.models.VoidModel;
import org.apache.isis.viewer.wicket.ui.pages.voidreturn.VoidReturnPage;
public enum ActionResultResponseHandlingStrategy {
REDIRECT_TO_VOID {
@Override
- public void handleResults(Component component, ActionResultResponse resultResponse) {
+ public void handleResults(
+ Component component,
+ ActionResultResponse resultResponse,
+ final IsisSessionFactory isisSessionFactory) {
component.setResponsePage(new VoidReturnPage(new VoidModel()));
}
},
REDIRECT_TO_PAGE {
@Override
- public void handleResults(final Component component, final ActionResultResponse resultResponse) {
+ public void handleResults(
+ final Component component,
+ final ActionResultResponse resultResponse,
+ final IsisSessionFactory isisSessionFactory) {
// force any changes in state etc to happen now prior to the redirect;
// in the case of an object being returned, this should cause our page mementos
// (eg EntityModel) to hold the correct state. I hope.
- IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager().flushTransaction();
+ isisSessionFactory.getCurrentSession().getPersistenceSession().getTransactionManager().flushTransaction();
// "redirect-after-post"
component.setResponsePage(resultResponse.getToPage());
@@ -53,7 +60,10 @@ public enum ActionResultResponseHandlingStrategy {
},
SCHEDULE_HANDLER {
@Override
- public void handleResults(final Component component, final ActionResultResponse resultResponse) {
+ public void handleResults(
+ final Component component,
+ final ActionResultResponse resultResponse,
+ final IsisSessionFactory isisSessionFactory) {
RequestCycle requestCycle = component.getRequestCycle();
AjaxRequestTarget target = requestCycle.find(AjaxRequestTarget.class);
@@ -75,7 +85,10 @@ public enum ActionResultResponseHandlingStrategy {
},
OPEN_URL_IN_BROWSER {
@Override
- public void handleResults(final Component component, final ActionResultResponse resultResponse) {
+ public void handleResults(
+ final Component component,
+ final ActionResultResponse resultResponse,
+ final IsisSessionFactory isisSessionFactory) {
final AjaxRequestTarget target = resultResponse.getTarget();
final URL url = resultResponse.getUrl();
@@ -87,7 +100,10 @@ public enum ActionResultResponseHandlingStrategy {
};
- public abstract void handleResults(Component component, ActionResultResponse resultResponse);
+ public abstract void handleResults(
+ Component component,
+ ActionResultResponse resultResponse,
+ final IsisSessionFactory isisSessionFactory);
/**
* @see #expanded(String)
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
index 136b961..80b962f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.model.models.ValueModel;
@@ -45,7 +45,7 @@ public enum ActionResultResponseType {
OBJECT {
@Override
public ActionResultResponse interpretResult(final ActionModel model, final AjaxRequestTarget target, final ObjectAdapter resultAdapter) {
- final ObjectAdapter actualAdapter = determineActualAdapter(resultAdapter);
+ final ObjectAdapter actualAdapter = determineActualAdapter(resultAdapter, model.getIsisSessionFactory());
return toEntityPage(model, actualAdapter, null);
}
@@ -57,7 +57,7 @@ public enum ActionResultResponseType {
COLLECTION {
@Override
public ActionResultResponse interpretResult(final ActionModel actionModel, final AjaxRequestTarget target, final ObjectAdapter resultAdapter) {
- final EntityCollectionModel collectionModel = EntityCollectionModel.createStandalone(resultAdapter);
+ final EntityCollectionModel collectionModel = EntityCollectionModel.createStandalone(resultAdapter, actionModel.getIsisSessionFactory());
// take a copy of the actionModel, because the original can get mutated (specifically: its arguments cleared)
final ActionModel actionModelCopy = actionModel.copy();
collectionModel.setActionHint(actionModelCopy);
@@ -125,18 +125,23 @@ public enum ActionResultResponseType {
throw new UnsupportedOperationException("Cannot render concurrency exception for any result type other than OBJECT");
}
- private static ObjectAdapter determineActualAdapter(final ObjectAdapter resultAdapter) {
+ private static ObjectAdapter determineActualAdapter(
+ final ObjectAdapter resultAdapter,
+ final IsisSessionFactory isisSessionFactory) {
if (resultAdapter.getSpecification().isNotCollection()) {
return resultAdapter;
} else {
// will only be a single element
final List<Object> pojoList = asList(resultAdapter);
final Object pojo = pojoList.get(0);
- return adapterFor(pojo);
+ return adapterFor(pojo, isisSessionFactory);
}
}
- private static ObjectAdapter adapterFor(final Object pojo) {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().adapterFor(pojo);
+
+ private static ObjectAdapter adapterFor(
+ final Object pojo,
+ final IsisSessionFactory isisSessionFactory) {
+ return isisSessionFactory.getCurrentSession().getPersistenceSession().adapterFor(pojo);
}
private static ActionResultResponse toEntityPage(final ActionModel model, final ObjectAdapter actualAdapter, final ConcurrencyException exIfAny) {
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java
index 68f16fa..b806787 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/AboutPanel.java
@@ -21,7 +21,6 @@ package org.apache.isis.viewer.wicket.ui.components.about;
import java.io.InputStream;
-import com.google.inject.Inject;
import com.google.inject.name.Named;
import org.apache.isis.viewer.wicket.model.models.AboutModel;
@@ -38,7 +37,7 @@ public class AboutPanel extends PanelAbstract<AboutModel> {
private static final String ID_MANIFEST_ATTRIBUTES = "manifestAttributes";
- @Inject
+ @com.google.inject.Inject
@Named("aboutMessage")
private String aboutMessage;
@@ -49,7 +48,7 @@ public class AboutPanel extends PanelAbstract<AboutModel> {
* Is <code>transient</code> because
* </p>
*/
- @Inject
+ @com.google.inject.Inject
@Named("metaInfManifest")
private transient InputStream metaInfManifestIs;
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
index 6fc405c..e947e29 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
@@ -22,17 +22,14 @@ package org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.viewer.wicket.model.models.*;
+import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.linkandlabel.ActionLinkFactoryAbstract;
public final class EntityActionLinkFactory extends ActionLinkFactoryAbstract {
@@ -86,18 +83,5 @@ public final class EntityActionLinkFactory extends ActionLinkFactoryAbstract {
return newLinkAndLabel(objectAdapter, action, link, disabledReasonIfAny);
}
-
-
- // ///////////////////////////////////////////////////////////////////
- // Dependencies (from IsisContext)
- // ///////////////////////////////////////////////////////////////////
-
- protected PersistenceSession getPersistenceSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
- }
-
- protected AuthenticationSession getAuthenticationSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
index 3f31d1d..d4e52b4 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
@@ -42,6 +42,7 @@ import org.apache.isis.core.metamodel.facets.all.describedas.DescribedAsFacet;
import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaPosition;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
@@ -446,7 +447,11 @@ class CssMenuItem implements Serializable {
// //////////////////////////////////////////////////////////////
protected AuthenticationSession getAuthenticationSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
+ return getIsisSessionFactory().getCurrentSession().getAuthenticationSession();
+ }
+
+ protected IsisSessionFactory getIsisSessionFactory() {
+ return IsisContext.getSessionFactory();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
index c6f112c..88d2090 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
@@ -21,7 +21,6 @@ package org.apache.isis.viewer.wicket.ui.components.actionmenu.serviceactions;
import java.util.List;
import com.google.common.collect.Lists;
-import com.google.inject.Inject;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
@@ -115,7 +114,7 @@ public class TertiaryActionsPanel extends Panel {
/**
* {@link com.google.inject.Inject}ed when {@link #init() initialized}.
*/
- @Inject
+ @com.google.inject.Inject
private PageClassRegistry pageClassRegistry;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
index 48858e8..d4c4b57 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
@@ -139,7 +139,7 @@ public class ActionPanel extends PanelAbstract<ActionModel> implements Executing
// forward onto the target page with the concurrency exception
ActionResultResponse resultResponse = ActionResultResponseType.OBJECT.interpretResult(this.getActionModel(), targetAdapter, ex);
- resultResponse.getHandlingStrategy().handleResults(this, resultResponse);
+ resultResponse.getHandlingStrategy().handleResults(this, resultResponse, getIsisSessionFactory());
getMessageBroker().addWarning(ex.getMessage());
}
@@ -173,7 +173,7 @@ public class ActionPanel extends PanelAbstract<ActionModel> implements Executing
final ObjectAdapter targetAdapter = actionModel.getTargetAdapter();
ActionResultResponse resultResponse = ActionResultResponseType.OBJECT.interpretResult(this.getActionModel(), targetAdapter, null);
- resultResponse.getHandlingStrategy().handleResults(this, resultResponse);
+ resultResponse.getHandlingStrategy().handleResults(this, resultResponse, getIsisSessionFactory());
}
}
@@ -214,7 +214,7 @@ public class ActionPanel extends PanelAbstract<ActionModel> implements Executing
// forward onto the target page with the concurrency exception
ActionResultResponse resultResponse = ActionResultResponseType.OBJECT.interpretResult(this.getActionModel(), targetAdapter, ex);
- resultResponse.getHandlingStrategy().handleResults(this, resultResponse);
+ resultResponse.getHandlingStrategy().handleResults(this, resultResponse, getIsisSessionFactory());
getMessageBroker().addWarning(ex.getMessage());
return false;
@@ -260,7 +260,7 @@ public class ActionPanel extends PanelAbstract<ActionModel> implements Executing
getTransactionManager().flushTransaction();
ActionResultResponse resultResponse = ActionResultResponseType.determineAndInterpretResult(this.getActionModel(), target, resultAdapter);
- resultResponse.getHandlingStrategy().handleResults(this, resultResponse);
+ resultResponse.getHandlingStrategy().handleResults(this, resultResponse, getIsisSessionFactory());
if (actionModel.isBookmarkable()) {
bookmarkPage(actionModel);
@@ -285,7 +285,7 @@ public class ActionPanel extends PanelAbstract<ActionModel> implements Executing
// forward on instead to void page
// (otherwise, we'll have rendered an action parameters page
// and so we'll be staying on that page)
- ActionResultResponseHandlingStrategy.REDIRECT_TO_VOID.handleResults(this, null);
+ ActionResultResponseHandlingStrategy.REDIRECT_TO_VOID.handleResults(this, null, getIsisSessionFactory());
}
return false;
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
index 0fc3988..b699b41 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
@@ -19,20 +19,6 @@
package org.apache.isis.viewer.wicket.ui.components.bookmarkedpages;
-import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
-import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.viewer.wicket.model.models.BookmarkTreeNode;
-import org.apache.isis.viewer.wicket.model.models.BookmarkedPagesModel;
-import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
-import org.apache.isis.viewer.wicket.model.models.PageType;
-import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
-import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-import org.apache.isis.viewer.wicket.ui.util.Links;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -55,7 +41,19 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.string.Strings;
-import com.google.inject.Inject;
+import org.apache.isis.core.metamodel.adapter.oid.RootOid;
+import org.apache.isis.core.metamodel.spec.ObjectSpecId;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
+import org.apache.isis.viewer.wicket.model.models.BookmarkTreeNode;
+import org.apache.isis.viewer.wicket.model.models.BookmarkedPagesModel;
+import org.apache.isis.viewer.wicket.model.models.ImageResourceCache;
+import org.apache.isis.viewer.wicket.model.models.PageType;
+import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
+import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
+import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
+import org.apache.isis.viewer.wicket.ui.util.Links;
public class BookmarkedPagesPanel extends PanelAbstract<BookmarkedPagesModel> {
@@ -75,7 +73,7 @@ public class BookmarkedPagesPanel extends PanelAbstract<BookmarkedPagesModel> {
private static final JavaScriptResourceReference SLIDE_PANEL_JS = new JavaScriptResourceReference(BookmarkedPagesPanel.class, "slide-panel.js");
- @Inject
+ @com.google.inject.Inject
private PageClassRegistry pageClassRegistry;
public BookmarkedPagesPanel(final String id, final BookmarkedPagesModel bookmarkedPagesModel) {
@@ -224,16 +222,11 @@ public class BookmarkedPagesPanel extends PanelAbstract<BookmarkedPagesModel> {
// Dependency Injection
// ///////////////////////////////////////////////
- @Inject
+ @com.google.inject.Inject
private ImageResourceCache imageCache;
- protected ImageResourceCache getImageCache() {
- return imageCache;
- }
-
-
protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSessionFactory().getSpecificationLoader();
+ return getIsisSessionFactory().getSpecificationLoader();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
index c12a9e0..3ecb97d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
@@ -21,15 +21,18 @@ package org.apache.isis.viewer.wicket.ui.components.collection.bulk;
import java.io.Serializable;
import java.util.Collections;
import java.util.List;
+
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
+
import org.apache.isis.applib.filter.Filters;
+import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.metamodel.spec.ActionType;
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.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
public class BulkActionsHelper implements Serializable {
@@ -46,7 +49,7 @@ public class BulkActionsHelper implements Serializable {
return model;
}
- public List<ObjectAction> getBulkActions() {
+ public List<ObjectAction> getBulkActions(final IsisSessionFactory isisSessionFactory) {
final EntityCollectionModel model = getModel();
if(model.isParented()) {
@@ -57,7 +60,8 @@ public class BulkActionsHelper implements Serializable {
List<ObjectAction> objectActions = typeSpec.getObjectActions(ActionType.USER, Contributed.INCLUDED, Filters.<ObjectAction>any());
- if ( isExploring() || isPrototyping()) {
+ final DeploymentCategory deploymentCategory = isisSessionFactory.getDeploymentCategory();
+ if ( !deploymentCategory.isProduction()) {
List<ObjectAction> explorationActions = typeSpec.getObjectActions(ActionType.EXPLORATION, Contributed.INCLUDED, Filters.<ObjectAction>any());
List<ObjectAction> prototypeActions = typeSpec.getObjectActions(ActionType.PROTOTYPE, Contributed.INCLUDED, Filters.<ObjectAction>any());
objectActions.addAll(explorationActions);
@@ -77,26 +81,11 @@ public class BulkActionsHelper implements Serializable {
@SuppressWarnings("deprecation")
private static final Predicate<ObjectAction> BULK = Filters.asPredicate(ObjectAction.Filters.bulk());
-
- //region > from context
-
- public boolean isExploring() {
- return IsisContext.getSessionFactory().getDeploymentCategory().isExploring();
- }
- public boolean isPrototyping() {
- return IsisContext.getSessionFactory().getDeploymentCategory().isPrototyping();
- }
-
/**
* Protected so can be overridden in testing if required.
*/
protected boolean isDebugMode() {
- // TODO: need to figure out how to switch into debug mode;
- // probably call a Debug toggle page, and stuff into
- // Session.getMetaData()
return true;
}
- //endregion
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
index 916dfff..340e202 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
@@ -45,7 +45,7 @@ import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.services.ServicesInjector;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.mementos.ActionMemento;
import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
@@ -158,7 +158,7 @@ public final class BulkActionsLinkFactory implements ActionLinkFactory {
if(lastReturnedAdapter != null) {
final ActionResultResponse resultResponse =
ActionResultResponseType.determineAndInterpretResult(actionModel, null, lastReturnedAdapter);
- resultResponse.getHandlingStrategy().handleResults(this, resultResponse);
+ resultResponse.getHandlingStrategy().handleResults(this, resultResponse, model.getIsisSessionFactory());
}
} catch(final ConcurrencyException ex) {
@@ -240,7 +240,11 @@ public final class BulkActionsLinkFactory implements ActionLinkFactory {
}
protected ServicesInjector getServicesInjector() {
- return IsisContext.getSessionFactory().getServicesInjector();
+ return getIsisSessionFactory().getServicesInjector();
+ }
+
+ private IsisSessionFactory getIsisSessionFactory() {
+ return model.getIsisSessionFactory();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index 836fe87..62a0e1d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -22,7 +22,6 @@ package org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable
import java.util.List;
import com.google.common.collect.Lists;
-import com.google.inject.Inject;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -236,7 +235,7 @@ public class CollectionContentsAsAjaxTablePanel
//region > dependencies
- @Inject
+ @com.google.inject.Inject
private WicketViewerSettings settings;
protected WicketViewerSettings getSettings() {
return settings;
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
index 7f59d6b..a41acd0 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
@@ -21,16 +21,18 @@ package org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable
import java.util.Iterator;
import java.util.List;
+
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Ordering;
+
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackDefaultDataTable;
import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.model.IModel;
+
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.consent.InteractionResult;
@@ -184,15 +186,6 @@ public class CollectionContentsSortableDataProvider extends SortableDataProvider
}
};
- // //////////////////////////////////////
-
- protected AuthenticationSession getAuthenticationSession() {
- return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
- }
-
- protected DeploymentCategory getDeploymentCategory() {
- return IsisContext.getSessionFactory().getDeploymentCategory();
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
index 61ec066..b078f20 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
@@ -84,10 +84,10 @@ public final class ObjectAdapterPropertyColumn extends ColumnAbstract<ObjectAdap
private Component createComponent(final String id, final IModel<ObjectAdapter> rowModel) {
final ObjectAdapter adapter = rowModel.getObject();
- final EntityModel model = new EntityModel(adapter);
+ final EntityModel entityModel = new EntityModel(adapter);
final OneToOneAssociation property = (OneToOneAssociation) adapter.getSpecification().getAssociation(propertyExpression);
- final PropertyMemento pm = new PropertyMemento(property);
- final ScalarModel scalarModel = model.getPropertyModel(pm);
+ final PropertyMemento pm = new PropertyMemento(property, entityModel.getIsisSessionFactory());
+ final ScalarModel scalarModel = entityModel.getPropertyModel(pm);
scalarModel.setRenderingHint(RenderingHint.PROPERTY_COLUMN);
scalarModel.toViewMode();
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
index e77dfab..67e4388 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/fieldset/PropertyGroup.java
@@ -152,7 +152,7 @@ public class PropertyGroup extends PanelAbstract<EntityModel> implements HasDyna
final OneToOneAssociation otoa,
final WebMarkupContainer container,
final List<LinkAndLabel> entityActions) {
- final PropertyMemento pm = new PropertyMemento(otoa);
+ final PropertyMemento pm = new PropertyMemento(otoa, entityModel.getIsisSessionFactory());
final ScalarModel scalarModel = entityModel.getPropertyModel(pm);
getComponentFactoryRegistry()
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
index 54f64f4..9816a42 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
@@ -19,7 +19,6 @@
package org.apache.isis.viewer.wicket.ui.components.entity.icontitle;
-import com.google.inject.Inject;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -28,6 +27,7 @@ import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.ResourceReference;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
@@ -202,13 +202,13 @@ public class EntityIconAndTitlePanel extends PanelAbstract<EntityModel> {
// Dependency Injection
// ///////////////////////////////////////////////
- @Inject
+ @com.google.inject.Inject
private ImageResourceCache imageCache;
protected ImageResourceCache getImageCache() {
return imageCache;
}
-
- @Inject
+
+ @com.google.inject.Inject
private WicketViewerSettings settings;
protected WicketViewerSettings getSettings() {
return settings;
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
index 17a98fb..6ad110c 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/header/HeaderPanel.java
@@ -19,8 +19,9 @@
package org.apache.isis.viewer.wicket.ui.components.header;
import java.util.Locale;
-import com.google.inject.Inject;
+
import com.google.inject.name.Named;
+
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
@@ -29,6 +30,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.services.userprof.UserProfileService;
import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
@@ -52,11 +54,11 @@ public class HeaderPanel extends PanelAbstract<Model<String>> {
private static final String ID_SECONDARY_MENU_BAR = "secondaryMenuBar";
private static final String ID_TERTIARY_MENU_BAR = "tertiaryMenuBar";
- @Inject
+ @com.google.inject.Inject
@Named("applicationName")
private String applicationName;
- @Inject(optional = true)
+ @com.google.inject.Inject(optional = true)
@Named("brandLogo")
private String brandLogo;
http://git-wip-us.apache.org/repos/asf/isis/blob/69b4859f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
index e392271..b7a320d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
@@ -40,7 +40,6 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.ExecutingPanel;
@@ -253,7 +252,7 @@ public class PropertyEditPanel extends PanelAbstract<ScalarModel>
// forward on instead to void page
// (otherwise, we'll have rendered an action parameters page
// and so we'll be staying on that page)
- ActionResultResponseHandlingStrategy.REDIRECT_TO_VOID.handleResults(this, null);
+ ActionResultResponseHandlingStrategy.REDIRECT_TO_VOID.handleResults(this, null, getIsisSessionFactory());
}
return false;
@@ -306,7 +305,7 @@ public class PropertyEditPanel extends PanelAbstract<ScalarModel>
///////////////////////////////////////////////////////
protected IsisTransactionManager getTransactionManager() {
- return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager();
+ return getPersistenceSession().getTransactionManager();
}
protected MessageBroker getMessageBroker() {
[47/50] [abbrv] isis git commit: ISIS-1442: adds @Value to some of
the applib classes,
so that these don't get mixins added to them within the metamodel.
Posted by da...@apache.org.
ISIS-1442: adds @Value to some of the applib classes, so that these don't get mixins added to them within the metamodel.
There is no functional effect to doing this; we never interact with these classes via the metamodel.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bff240ee
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bff240ee
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bff240ee
Branch: refs/heads/master
Commit: bff240eef05f4d5353cc33a4b70b3ea20893f593
Parents: 25149b0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jun 16 10:03:53 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jun 16 10:26:16 2016 +0100
----------------------------------------------------------------------
.../services/i18n/TranslatableString.java | 2 ++
.../isis/applib/services/iactn/Interaction.java | 2 ++
.../services/appfeat/ApplicationFeature.java | 28 --------------------
.../services/appfeat/ApplicationFeatureId.java | 2 ++
4 files changed, 6 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/bff240ee/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java b/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
index 515a2b7..8cf6762 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
@@ -25,7 +25,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.google.common.collect.Lists;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.Value;
+@Value
public final class TranslatableString {
//region > tr, trn (factory methods); constructor
http://git-wip-us.apache.org/repos/asf/isis/blob/bff240ee/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
index 25a1e45..d665088 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
@@ -31,6 +31,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.services.HasTransactionId;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.command.Command;
@@ -77,6 +78,7 @@ import org.apache.isis.schema.utils.jaxbadapters.JavaSqlTimestampXmlGregorianCal
* </p>
*
*/
+@Value
public class Interaction implements HasTransactionId {
//region > transactionId (property)
http://git-wip-us.apache.org/repos/asf/isis/blob/bff240ee/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java
index 53a92ed..1eb2466 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java
@@ -49,8 +49,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
public static abstract class ActionDomainEvent extends IsisApplibModule.ActionDomainEvent<ApplicationFeature> {}
- // //////////////////////////////////////
-
//region > constants
// using same value for all to neaten up rendering
@@ -59,8 +57,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
public static final int TYPICAL_LENGTH_MEMBER_NAME = 50;
//endregion
- // //////////////////////////////////////
-
//region > constructors
public ApplicationFeature() {
this(null);
@@ -70,8 +66,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > featureId
private ApplicationFeatureId featureId;
@@ -85,8 +79,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > memberType
private ApplicationMemberType memberType;
@@ -103,8 +95,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > returnTypeName (for: properties, collections, actions)
private String returnTypeName;
@@ -121,8 +111,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > contributed (for: properties, collections, actions)
private boolean contributed;
@@ -136,8 +124,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > derived (properties and collections)
private Boolean derived;
@@ -154,8 +140,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > propertyMaxLength (properties only)
private Integer propertyMaxLength;
@@ -172,8 +156,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > propertyTypicalLength (properties only)
private Integer propertyTypicalLength;
@@ -190,8 +172,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > actionSemantics (actions only)
private SemanticsOf actionSemantics;
@@ -208,8 +188,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > packages: Contents
private final SortedSet<ApplicationFeatureId> contents = Sets.newTreeSet();
@@ -227,8 +205,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > classes: Properties, Collections, Actions
private final SortedSet<ApplicationFeatureId> properties = Sets.newTreeSet();
@@ -277,8 +253,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
//endregion
- // //////////////////////////////////////
-
//region > Functions
public static class Functions {
@@ -320,8 +294,6 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
//endregion
- // //////////////////////////////////////
-
//region > equals, hashCode, compareTo, toString
private final static String propertyNames = "featureId";
http://git-wip-us.apache.org/repos/asf/isis/blob/bff240ee/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java
index cae36e6..5e9abde 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java
@@ -33,6 +33,7 @@ import com.google.common.collect.Lists;
import com.google.common.io.BaseEncoding;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.services.appfeat.ApplicationMemberType;
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.TitleBuffer;
@@ -45,6 +46,7 @@ import org.apache.isis.applib.util.TitleBuffer;
* {@link #getPackageName() package name}, {@link #getClassName() class name} and {@link #getMemberName() member name}.
* </p>
*/
+@Value
public class ApplicationFeatureId implements Comparable<ApplicationFeatureId>, Serializable {
[17/50] [abbrv] isis git commit: ISIS-1414: ensures that
getChangedObjectProperties() is called
Posted by da...@apache.org.
ISIS-1414: ensures that getChangedObjectProperties() is called
for the MetricsService, even if not called for auditing (ie were no audited objects changed in the xactn)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5d918528
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5d918528
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5d918528
Branch: refs/heads/master
Commit: 5d9185285b6f5268fad7807f25fa624a4bfb0c27
Parents: eb6d4a8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jun 9 19:21:32 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jun 9 19:21:32 2016 +0100
----------------------------------------------------------------------
.../services/changes/ChangedObjectsServiceInternal.java | 6 ++----
.../isis/core/runtime/system/ObjectMemberAbstractTest.java | 5 ++++-
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/5d918528/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
index 572bdcc..9aa6d63 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/changes/ChangedObjectsServiceInternal.java
@@ -269,13 +269,11 @@ public class ChangedObjectsServiceInternal implements WithTransactionScope {
return changeKindByEnlistedAdapter.size();
}
- /**
- * Must be called only after {@link #getChangedObjectProperties()} has been called at least once.
- */
@Programmatic
public int numberObjectPropertiesModified() {
if(changedObjectProperties == null) {
- throw new IllegalStateException("getChangedObjectProperties() has not yet been called");
+ // normally done during auditing, but in case none of the objects in this xactn are audited...
+ getChangedObjectProperties();
}
return changedObjectProperties.size();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/5d918528/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
index 16b0f1e..cc5bdc2 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
@@ -51,6 +51,7 @@ import org.apache.isis.core.metamodel.interactions.PropertyVisibilityContext;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.metamodel.services.persistsession.PersistenceSessionServiceInternal;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
@@ -82,6 +83,8 @@ public class ObjectMemberAbstractTest {
@Mock
private AuthenticationSessionProvider mockAuthenticationSessionProvider;
@Mock
+ private PersistenceSessionServiceInternal mockPersistenceSessionServiceInternal;
+ @Mock
private AuthenticationSession mockAuthenticationSession;
@Mock
private SpecificationLoader mockSpecificationLoader;
@@ -101,7 +104,7 @@ public class ObjectMemberAbstractTest {
stubConfiguration = new IsisConfigurationDefault();
stubServicesInjector = new ServicesInjector(Lists.<Object>newArrayList(
- mockSpecificationLoader, mockSpecificationLoader), stubConfiguration);
+ mockSpecificationLoader, mockSpecificationLoader, mockPersistenceSessionServiceInternal), stubConfiguration);
context.checking(new Expectations() {{
allowing(mockAuthenticationSessionProvider).getAuthenticationSession();
[10/50] [abbrv] isis git commit: ISIS-1427: simplifying IsisContext
and minimizing calls to it; also removed Localization (unused)
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
index 040d681..3f31d1d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
@@ -446,7 +446,7 @@ class CssMenuItem implements Serializable {
// //////////////////////////////////////////////////////////////
protected AuthenticationSession getAuthenticationSession() {
- return IsisContext.getAuthenticationSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
index 8014142..48858e8 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
@@ -315,7 +315,7 @@ public class ActionPanel extends PanelAbstract<ActionModel> implements Executing
// recognized
raiseWarning(target, feedbackForm, recognizedErrorIfAny);
- getTransactionManager().getTransaction().clearAbortCause();
+ getTransactionManager().getCurrentTransaction().clearAbortCause();
// there's no need to abort the transaction, it will have already been done
// (in IsisTransactionManager#executeWithinTransaction(...)).
@@ -338,7 +338,7 @@ public class ActionPanel extends PanelAbstract<ActionModel> implements Executing
///////////////////////////////////////////////////////
protected IsisTransactionManager getTransactionManager() {
- return IsisContext.getTransactionManager();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager();
}
protected MessageBroker getMessageBroker() {
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
index 5110b73..0fc3988 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/BookmarkedPagesPanel.java
@@ -233,7 +233,7 @@ public class BookmarkedPagesPanel extends PanelAbstract<BookmarkedPagesModel> {
protected SpecificationLoader getSpecificationLoader() {
- return IsisContext.getSpecificationLoader();
+ return IsisContext.getSessionFactory().getSpecificationLoader();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
index db9888a..c12a9e0 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsHelper.java
@@ -81,10 +81,10 @@ public class BulkActionsHelper implements Serializable {
//region > from context
public boolean isExploring() {
- return IsisContext.getDeploymentCategory().isExploring();
+ return IsisContext.getSessionFactory().getDeploymentCategory().isExploring();
}
public boolean isPrototyping() {
- return IsisContext.getDeploymentCategory().isPrototyping();
+ return IsisContext.getSessionFactory().getDeploymentCategory().isPrototyping();
}
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
index eada635..916dfff 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/bulk/BulkActionsLinkFactory.java
@@ -240,7 +240,7 @@ public final class BulkActionsLinkFactory implements ActionLinkFactory {
}
protected ServicesInjector getServicesInjector() {
- return IsisContext.getPersistenceSession().getServicesInjector();
+ return IsisContext.getSessionFactory().getServicesInjector();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
index 5fdad19..7f59d6b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsSortableDataProvider.java
@@ -187,11 +187,11 @@ public class CollectionContentsSortableDataProvider extends SortableDataProvider
// //////////////////////////////////////
protected AuthenticationSession getAuthenticationSession() {
- return IsisContext.getAuthenticationSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
}
protected DeploymentCategory getDeploymentCategory() {
- return IsisContext.getDeploymentCategory();
+ return IsisContext.getSessionFactory().getDeploymentCategory();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
index ab4ec32..e392271 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
@@ -283,7 +283,7 @@ public class PropertyEditPanel extends PanelAbstract<ScalarModel>
// recognized
raiseWarning(target, feedbackForm, recognizedErrorIfAny);
- getTransactionManager().getTransaction().clearAbortCause();
+ getTransactionManager().getCurrentTransaction().clearAbortCause();
// there's no need to abort the transaction, it will have already been done
// (in IsisTransactionManager#executeWithinTransaction(...)).
@@ -306,7 +306,7 @@ public class PropertyEditPanel extends PanelAbstract<ScalarModel>
///////////////////////////////////////////////////////
protected IsisTransactionManager getTransactionManager() {
- return IsisContext.getTransactionManager();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager();
}
protected MessageBroker getMessageBroker() {
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
index fef3e39..45c3c1b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
@@ -21,10 +21,6 @@ package org.apache.isis.viewer.wicket.ui.components.scalars;
import java.io.Serializable;
-import com.google.inject.Inject;
-
-import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
@@ -139,7 +135,7 @@ public abstract class ScalarPanelTextFieldDatePickerAbstract<T extends Serializa
}
- @Inject
+ @com.google.inject.Inject
private WicketViewerSettings settings;
protected WicketViewerSettings getSettings() {
return settings;
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
index d00f735..4aa083f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
@@ -157,7 +157,7 @@ public class TextFieldWithDateTimePicker<T> extends TextField<T> implements ICon
}
IsisConfiguration getConfiguration() {
- return IsisContext.getConfiguration();
+ return IsisContext.getSessionFactory().getConfiguration();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index fea7da6..65c80e6 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -24,9 +24,6 @@ import java.util.List;
import javax.inject.Inject;
import com.google.common.collect.Lists;
-import org.wicketstuff.select2.ChoiceProvider;
-import org.wicketstuff.select2.Select2Choice;
-import org.wicketstuff.select2.Settings;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
@@ -39,6 +36,9 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
+import org.wicketstuff.select2.ChoiceProvider;
+import org.wicketstuff.select2.Select2Choice;
+import org.wicketstuff.select2.Settings;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -525,13 +525,15 @@ public class ReferencePanel extends ScalarPanelAbstract {
return autoCompleteFacet != null;
}
-
@Inject
private WicketViewerSettings wicketViewerSettings;
+ // REVIEW: can't inject because IsisConfiguration not serializable.
IsisConfiguration getConfiguration() {
- return IsisContext.getConfiguration();
+ return IsisContext.getSessionFactory().getConfiguration();
}
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
index b3e5e94..4416c82 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
@@ -150,7 +150,7 @@ public class BreadcrumbModel implements Serializable {
protected OidMarshaller getOidMarshaller() {
- return IsisContext.getOidMarshaller();
+ return IsisContext.getSessionFactory().getOidMarshaller();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
index 8b65cfc..3025ad5 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
@@ -33,7 +33,6 @@ import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
-import org.apache.isis.viewer.wicket.model.isis.PersistenceSessionProvider;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
@@ -44,8 +43,7 @@ import org.apache.isis.viewer.wicket.ui.util.Components;
* Wicket {@link FormComponentPanel}, providing the ability to build up the
* panel using other {@link ComponentType}s.
*/
-public abstract class FormComponentPanelAbstract<T> extends FormComponentPanel<T>
- implements PersistenceSessionProvider {
+public abstract class FormComponentPanelAbstract<T> extends FormComponentPanel<T> {
private static final long serialVersionUID = 1L;
@@ -134,20 +132,19 @@ public abstract class FormComponentPanelAbstract<T> extends FormComponentPanel<T
* @return
*/
public AuthenticationSession getAuthenticationSession() {
- return IsisContext.getAuthenticationSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
}
public DeploymentCategory getDeploymentCategory() {
- return IsisContext.getDeploymentCategory();
+ return IsisContext.getSessionFactory().getDeploymentCategory();
}
// ///////////////////////////////////////////////////////////////////
// Dependencies (from IsisContext)
// ///////////////////////////////////////////////////////////////////
- @Override
public PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
protected List<ObjectAdapter> getServices() {
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
index 1a556f4..e22639f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
@@ -234,6 +234,6 @@ public class ThemeChooser extends Panel {
}
private IsisConfiguration getConfiguration() {
- return IsisContext.getConfiguration();
+ return IsisContext.getSessionFactory().getConfiguration();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
index 45965f6..0620b0d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
@@ -75,7 +75,7 @@ public class JGrowlBehaviour extends AbstractDefaultAjaxBehavior {
protected MessageBroker getMessageBroker() {
- return IsisContext.getAuthenticationSession().getMessageBroker();
+ return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession().getMessageBroker();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 1de0f9c..8e19bb8 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -24,7 +24,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import com.google.inject.Inject;
import com.google.inject.name.Named;
import org.apache.wicket.Component;
@@ -58,11 +57,11 @@ import org.slf4j.LoggerFactory;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
-import org.apache.isis.core.commons.authentication.MessageBroker;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.services.ServicesInjector;
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;
import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
import org.apache.isis.viewer.wicket.model.hints.IsisEnvelopeEvent;
import org.apache.isis.viewer.wicket.model.hints.IsisEventLetterAbstract;
@@ -129,32 +128,33 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
private final List<ComponentType> childComponentIds;
/**
- * {@link Inject}ed when {@link #init() initialized}.
+ * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
*/
- @Inject
+ @com.google.inject.Inject
@Named("applicationName")
private String applicationName;
/**
- * {@link Inject}ed when {@link #init() initialized}.
+ * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
*/
- @Inject(optional = true)
+ @com.google.inject.Inject(optional = true)
@Named("applicationCss")
private String applicationCss;
/**
- * {@link Inject}ed when {@link #init() initialized}.
+ * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
*///
- @Inject(optional = true)
+ @com.google.inject.Inject(optional = true)
@Named("applicationJs")
private String applicationJs;
/**
- * {@link Inject}ed when {@link #init() initialized}.
+ * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
*/
- @Inject
+ @com.google.inject.Inject
private PageClassRegistry pageClassRegistry;
+
/**
* Top-level <div> to which all content is added.
*
@@ -417,37 +417,43 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
}
- // ///////////////////////////////////////////////////////////////////
- // Convenience
- // ///////////////////////////////////////////////////////////////////
+ //region > getComponentFactoryRegistry (Convenience)
protected ComponentFactoryRegistry getComponentFactoryRegistry() {
final ComponentFactoryRegistryAccessor cfra = (ComponentFactoryRegistryAccessor) getApplication();
return cfra.getComponentFactoryRegistry();
}
+ //endregion
+
- protected <T> T lookupService(final Class<T> serviceClass) {
- return getServicesInjector().lookupService(serviceClass);
+ //region > injected (application-scope)
+
+ // REVIEW: can't inject because not serializable.
+ private IsisSessionFactory getSessionFactory() {
+ return IsisContext.getSessionFactory();
}
- // ///////////////////////////////////////////////////
- // System components
- // ///////////////////////////////////////////////////
+ protected IsisConfiguration getConfiguration() {
+ return getSessionFactory().getConfiguration();
+ }
protected ServicesInjector getServicesInjector() {
- return getPersistenceSession().getServicesInjector();
+ return getSessionFactory().getServicesInjector();
}
+ //endregion
+
+ //region > derived from injected components (session-scope)
+
protected PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return getSessionFactory().getCurrentSession().getPersistenceSession();
}
protected AuthenticationSession getAuthenticationSession() {
- return IsisContext.getAuthenticationSession();
- }
-
- protected IsisConfiguration getConfiguration() {
- return IsisContext.getConfiguration();
+ return getSessionFactory().getCurrentSession().getAuthenticationSession();
}
+ //endregion
+
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
index 73bbe80..ccad2b9 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
@@ -19,7 +19,6 @@
package org.apache.isis.viewer.wicket.ui.pages.accmngt;
-import com.google.inject.Inject;
import com.google.inject.name.Named;
import org.apache.wicket.Application;
@@ -72,21 +71,20 @@ public class AccountManagementPageAbstract extends WebPage {
/**
* {@link com.google.inject.Inject}ed when {@link #init() initialized}.
*/
- @Inject
- @Named("applicationName")
+ @com.google.inject.Inject
private String applicationName;
/**
* {@link com.google.inject.Inject}ed when {@link #init() initialized}.
*/
- @Inject
+ @com.google.inject.Inject
@Named("applicationCss")
private String applicationCss;
/**
* {@link com.google.inject.Inject}ed when {@link #init() initialized}.
*/
- @Inject
+ @com.google.inject.Inject
@Named("applicationJs")
private String applicationJs;
@@ -154,7 +152,7 @@ public class AccountManagementPageAbstract extends WebPage {
// ///////////////////////////////////////////////////
protected IsisConfiguration getConfiguration() {
- return IsisContext.getConfiguration();
+ return IsisContext.getSessionFactory().getConfiguration();
}
@javax.inject.Inject
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
index f1e51e3..566471b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
@@ -42,10 +42,11 @@ public class EmailAvailableValidator implements IValidator<String> {
@Override
public void validate(final IValidatable<String> validatable) {
- IsisContext.doInSession(new Runnable() {
+ IsisContext.getSessionFactory().doInSession(new Runnable() {
@Override
public void run() {
- UserRegistrationService userRegistrationService = IsisContext.getPersistenceSession().getServicesInjector().lookupService(UserRegistrationService.class);
+ UserRegistrationService userRegistrationService = IsisContext.getSessionFactory().getCurrentSession()
+ .getPersistenceSession().getServicesInjector().lookupService(UserRegistrationService.class);
String email = validatable.getValue();
boolean emailExists1 = userRegistrationService.emailExists(email);
if (emailExists1 != emailExists) {
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
index 35c1312..17e9313 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
@@ -36,10 +36,11 @@ public class UsernameAvailableValidator implements IValidator<String> {
@Override
public void validate(final IValidatable<String> validatable) {
- IsisContext.doInSession(new Runnable() {
+ IsisContext.getSessionFactory().doInSession(new Runnable() {
@Override
public void run() {
- UserRegistrationService userRegistrationService = IsisContext.getPersistenceSession().getServicesInjector().lookupService(UserRegistrationService.class);
+ UserRegistrationService userRegistrationService = IsisContext.getSessionFactory().getCurrentSession()
+ .getPersistenceSession().getServicesInjector().lookupServiceElseFail(UserRegistrationService.class);
String username = validatable.getValue();
boolean usernameExists = userRegistrationService.usernameExists(username);
if (usernameExists) {
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
index ff5b913..2b04a3b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
@@ -73,10 +73,12 @@ public class PasswordResetPage extends AccountManagementPageAbstract {
error(getString("passwordResetExpiredOrInvalidToken"));
addOrReplace(addPasswordResetEmailPanel(ID_CONTENT_PANEL));
} else {
- Boolean emailExists = IsisContext.doInSession(new Callable<Boolean>() {
+ Boolean emailExists = IsisContext.getSessionFactory().doInSession(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
- UserRegistrationService userRegistrationService = IsisContext.getPersistenceSession().getServicesInjector().lookupService(UserRegistrationService.class);
+ UserRegistrationService userRegistrationService = IsisContext.getSessionFactory()
+ .getCurrentSession().getPersistenceSession().getServicesInjector()
+ .lookupService(UserRegistrationService.class);
return userRegistrationService.emailExists(email);
}
});
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
index 8001c1e..47f64b3 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPanel.java
@@ -76,12 +76,14 @@ public class PasswordResetPanel extends Panel {
final AccountConfirmationMap accountConfirmationMap = getApplication().getMetaData(AccountConfirmationMap.KEY);
- Boolean passwordUpdated = IsisContext.doInSession(new Callable<Boolean>() {
+ Boolean passwordUpdated = IsisContext.getSessionFactory().doInSession(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
String email = accountConfirmationMap.get(uuid);
- UserRegistrationService userRegistrationService = IsisContext.getPersistenceSession().getServicesInjector().lookupService(UserRegistrationService.class);
+ UserRegistrationService userRegistrationService = IsisContext.getSessionFactory()
+ .getCurrentSession().getPersistenceSession().getServicesInjector()
+ .lookupService(UserRegistrationService.class);
return userRegistrationService.updatePasswordByEmail(email, password);
}
});
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
index b565537..09e3425 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
@@ -123,20 +123,22 @@ public abstract class RegisterPanel extends GenericPanel<UserDetails> {
{
final UserDetails userDetails = getModelObject();
- IsisContext.doInSession(new Runnable() {
- @Override
- public void run() {
- final UserRegistrationService userRegistrationService = IsisContext.getPersistenceSession().getServicesInjector().lookupService(UserRegistrationService.class);
-
- IsisContext.getTransactionManager().executeWithinTransaction(new TransactionalClosure() {
- @Override
- public void execute() {
- userRegistrationService.registerUser(userDetails);
- removeAccountConfirmation();
- }
- });
- }
- });
+ IsisContext.getSessionFactory().doInSession(new Runnable() {
+ @Override
+ public void run() {
+ final UserRegistrationService userRegistrationService = IsisContext.getSessionFactory()
+ .getCurrentSession().getPersistenceSession().getServicesInjector().lookupService(UserRegistrationService.class);
+
+ IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager()
+ .executeWithinTransaction(new TransactionalClosure() {
+ @Override
+ public void execute() {
+ userRegistrationService.registerUser(userDetails);
+ removeAccountConfirmation();
+ }
+ });
+ }
+ });
signIn(userDetails.getUsername(), userDetails.getPassword());
setResponsePage(getApplication().getHomePage());
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
index d011c5c..97edf5c 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
@@ -196,7 +196,7 @@ public class EntityPage extends PageAbstract {
}
protected DeploymentCategory getDeploymentCategory() {
- return IsisContext.getDeploymentCategory();
+ return IsisContext.getSessionFactory().getDeploymentCategory();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
index 9583424..01f7f9e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
@@ -19,21 +19,24 @@
package org.apache.isis.viewer.wicket.ui.pages.login;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-
import javax.inject.Inject;
+
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
import org.apache.wicket.authroles.authentication.panel.SignInPanel;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+
import org.apache.isis.applib.services.email.EmailService;
import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
-import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.core.metamodel.services.ServicesInjector;
+import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+
/**
* An extension of Wicket's default SignInPanel that provides
* custom markup, based on Bootstrap, and uses
@@ -113,12 +116,14 @@ public class IsisSignInPanel extends SignInPanel {
}
private void setVisibilityAllowedBasedOnAvailableServices(final Component... components) {
- IsisContext.doInSession(new Runnable() {
+ isisSessionFactory.doInSession(new Runnable() {
@Override
public void run() {
- final UserRegistrationService userRegistrationService = lookupService(UserRegistrationService.class);
- final EmailNotificationService emailNotificationService = lookupService(EmailNotificationService.class);
- final boolean visibilityAllowed = userRegistrationService != null && emailNotificationService.isConfigured();
+ final UserRegistrationService userRegistrationService =
+ servicesInjector.lookupService(UserRegistrationService.class);
+ final EmailNotificationService emailNotificationService1 =
+ servicesInjector.lookupService(EmailNotificationService.class);
+ final boolean visibilityAllowed = userRegistrationService != null && emailNotificationService1.isConfigured();
for (final Component component: components) {
if(component.isVisibilityAllowed()) {
component.setVisibilityAllowed(visibilityAllowed);
@@ -152,9 +157,11 @@ public class IsisSignInPanel extends SignInPanel {
// //////////////////////////////////////
- private <T> T lookupService(final Class<T> serviceClass) {
- return IsisContext.getPersistenceSession().getServicesInjector().lookupService(serviceClass);
- }
+ @Inject
+ IsisSessionFactory isisSessionFactory;
+
+ @Inject
+ ServicesInjector servicesInjector;
@Inject
private PageClassRegistry pageClassRegistry;
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
index b65e72d..3b31581 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
@@ -21,7 +21,6 @@ package org.apache.isis.viewer.wicket.ui.pages.mmverror;
import java.util.List;
-import com.google.inject.Inject;
import com.google.inject.name.Named;
import org.apache.wicket.Application;
@@ -53,23 +52,23 @@ public class MmvErrorPage extends WebPage {
private static final String ID_APPLICATION_NAME = "applicationName";
/**
- * {@link Inject}ed when {@link #init() initialized}.
+ * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
*/
- @Inject
+ @com.google.inject.Inject
@Named("applicationName")
private String applicationName;
/**
- * {@link Inject}ed when {@link #init() initialized}.
+ * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
*/
- @Inject
+ @com.google.inject.Inject
@Named("applicationCss")
private String applicationCss;
/**
- * {@link Inject}ed when {@link #init() initialized}.
+ * {@link com.google.inject.Inject Inject}ed when {@link #init() initialized}.
*/
- @Inject
+ @com.google.inject.Inject
@Named("applicationJs")
private String applicationJs;
@@ -131,7 +130,7 @@ public class MmvErrorPage extends WebPage {
// ///////////////////////////////////////////////////
protected IsisConfiguration getConfiguration() {
- return IsisContext.getConfiguration();
+ return IsisContext.getSessionFactory().getConfiguration();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index 78f4fee..18aef4b 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -29,15 +29,13 @@ import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChec
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.viewer.wicket.model.isis.PersistenceSessionProvider;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
public abstract class FormAbstract<T> extends Form<T>
- implements IHeaderContributor, ComponentFactoryRegistryAccessor, PageClassRegistryAccessor,
- PersistenceSessionProvider {
+ implements IHeaderContributor, ComponentFactoryRegistryAccessor, PageClassRegistryAccessor {
private static final long serialVersionUID = 1L;
@@ -101,17 +99,16 @@ public abstract class FormAbstract<T> extends Form<T>
// Dependencies (from IsisContext)
// ///////////////////////////////////////////////////////////////////
- @Override
public PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
public AuthenticationSession getAuthenticationSession() {
- return IsisContext.getAuthenticationSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getAuthenticationSession();
}
public DeploymentCategory getDeploymentCategory() {
- return IsisContext.getDeploymentCategory();
+ return IsisContext.getSessionFactory().getDeploymentCategory();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index d88c50a..2b660d8 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@ -33,7 +33,6 @@ import org.apache.isis.core.runtime.system.IsisSystem;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
-import org.apache.isis.viewer.wicket.model.isis.PersistenceSessionProvider;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
@@ -48,7 +47,7 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.Confi
*/
// TODO mgrigorov: extend GenericPanel and make T the type of the model object, not the model
public abstract class PanelAbstract<T extends IModel<?>> extends Panel
- implements IHeaderContributor, PersistenceSessionProvider {
+ implements IHeaderContributor {
private static final long serialVersionUID = 1L;
@@ -145,13 +144,12 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel
// Dependencies (from IsisContext)
// ///////////////////////////////////////////////////////////////////
- @Override
public PersistenceSession getPersistenceSession() {
- return IsisContext.getPersistenceSession();
+ return IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession();
}
protected ServicesInjector getServicesInjector() {
- return getPersistenceSession().getServicesInjector();
+ return IsisContext.getSessionFactory().getServicesInjector();
}
// /////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
----------------------------------------------------------------------
diff --git a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
index fa014be..4279253 100644
--- a/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
+++ b/core/wrapper/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
@@ -75,7 +75,7 @@ public class DelegatingInvocationHandlerDefault<T> implements DelegatingInvocati
protected void resolveIfRequired(final Object domainObject) {
if (resolveObjectChangedEnabled) {
- IsisContext.getPersistenceSession().resolve(domainObject);
+ IsisContext.getSessionFactory().getCurrentSession().getPersistenceSession().resolve(domainObject);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/83de0dc0/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.java b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
index 6754ee1..ff780e9 100644
--- a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
+++ b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.java
@@ -22,6 +22,7 @@ import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.VersionStrategy;
import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.Auditing;
import org.apache.isis.applib.annotation.CommandReification;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.MemberOrder;
@@ -60,7 +61,8 @@ import org.apache.isis.applib.util.ObjectContracts;
})
@javax.jdo.annotations.Unique(name="SimpleObject_name_UNQ", members = {"name"})
@DomainObject(
- publishing = Publishing.ENABLED
+ publishing = Publishing.ENABLED,
+ auditing = Auditing.ENABLED
)
public class SimpleObject implements Comparable<SimpleObject> {