You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/01/09 09:51:38 UTC
[isis] 03/06: ISIS-2033: minor: renaming method
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2033-IoC
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 0689de0f4f1c0be1e0cd96cacf3ff1fc8f38b057
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 9 06:41:00 2019 +0100
ISIS-2033: minor: renaming method
Task-Url: https://issues.apache.org/jira/browse/ISIS-2033
---
.../src/main/java/org/apache/isis/config/AppConfigLocator.java | 6 +++++-
.../isis/core/integtestsupport/ExceptionRecognizerTranslate.java | 2 +-
.../components/HeadlessTransactionSupportDefault.java | 2 +-
.../java/org/apache/isis/tool/mavenplugin/IsisMojoSwagger.java | 2 +-
.../main/java/org/apache/isis/tool/mavenplugin/IsisMojoXsd.java | 2 +-
.../server/conneg/RestfulObjectsJaxbWriterForXml.java | 2 +-
.../server/conneg/RestfulObjectsJaxbWriterForXml.java | 2 +-
.../isis/applib/services/jdosupport/IsisJdoSupportDN4.java | 2 +-
.../isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java | 2 +-
.../core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java | 2 +-
.../WrapperFactoryDefaultTest_wrappedObject_transient.java | 2 +-
.../isis/applib/services/jdosupport/IsisJdoSupportDN5.java | 2 +-
.../isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java | 2 +-
.../core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java | 2 +-
.../WrapperFactoryDefaultTest_wrappedObject_transient.java | 2 +-
.../isis/core/runtime/fixtures/FixturesInstallerDelegate.java | 4 ++--
.../java/org/apache/isis/core/runtime/headless/IsisSystem.java | 2 +-
.../isis/core/runtime/system/session/IsisSessionFactory.java | 2 +-
.../core/runtime/system/session/IsisSessionFactoryDefault.java | 8 +++++---
.../wrapper/handlers/DelegatingInvocationHandlerDefault.java | 2 +-
.../apache/isis/viewer/restfulobjects/rendering/Responses.java | 2 +-
.../isis/viewer/restfulobjects/server/ResourceContext.java | 2 +-
.../viewer/restfulobjects/server/resources/ResourceAbstract.java | 2 +-
.../viewer/restfulobjects/server/ResourceContextTest_getArg.java | 2 +-
...esourceContext_ensureCompatibleAcceptHeader_ContractTest.java | 2 +-
.../viewer/TargetRespondListenerToResetQueryResultCache.java | 2 +-
.../integration/wicket/AuthenticatedWebSessionForIsis.java | 2 +-
.../wicket/viewer/integration/wicket/LocalizerForIsis.java | 2 +-
.../wicket/viewer/integration/wicket/WebRequestCycleForIsis.java | 2 +-
.../org/apache/isis/viewer/wicket/model/models/ActionModel.java | 2 +-
.../isis/viewer/wicket/model/models/EntityCollectionModel.java | 2 +-
.../viewer/wicket/model/models/HintPageParameterSerializer.java | 2 +-
.../apache/isis/viewer/wicket/model/util/ComponentHintKey.java | 2 +-
.../actionmenu/serviceactions/ServiceActionsPanelFactory.java | 2 +-
.../actionmenu/serviceactions/TertiaryMenuPanelFactory.java | 2 +-
.../wicket/ui/components/actions/ActionParametersPanel.java | 2 +-
.../ajaxtable/CollectionContentsAsAjaxTablePanel.java | 2 +-
.../wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java | 2 +-
.../scalars/ScalarPanelTextFieldDatePickerAbstract.java | 2 +-
.../ui/components/scalars/ScalarPanelTextFieldNumeric.java | 2 +-
.../org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java | 2 +-
.../wicket/ui/pages/accmngt/UsernameAvailableValidator.java | 2 +-
.../ui/pages/accmngt/password_reset/PasswordResetPanel.java | 2 +-
.../viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java | 2 +-
.../org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java | 2 +-
.../apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java | 2 +-
.../org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java | 9 +++++----
48 files changed, 61 insertions(+), 54 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java b/core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java
index 2355fde..ebb4d88 100644
--- a/core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java
+++ b/core/config/src/main/java/org/apache/isis/config/AppConfigLocator.java
@@ -98,7 +98,11 @@ public final class AppConfigLocator {
try {
appManifestClass = _Casts.uncheckedCast(_Context.loadClassAndInitialize(appManifestClassName));
} catch (ClassNotFoundException e) {
- throw new IsisException("Failed to locate the AppManifest using config properties.", e);
+ throw new IsisException(
+ String.format(
+ "Failed to locate the AppManifest using config property 'isis.appManifest=%s'.",
+ appManifestClassName),
+ e);
}
final AppManifest appManifest;
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 c4a3be9..8274d08 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
@@ -61,7 +61,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 Stream<ExceptionRecognizer> exceptionRecognizers = getIsisSessionFactory().getServicesInjector().streamServices(ExceptionRecognizer.class);
+ final Stream<ExceptionRecognizer> exceptionRecognizers = getIsisSessionFactory().getServiceInjector().streamServices(ExceptionRecognizer.class);
exceptionRecognizers.forEach(exceptionRecognizer->{
@SuppressWarnings("unused")
final String unused = exceptionRecognizer.recognize(ex);
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/components/HeadlessTransactionSupportDefault.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/components/HeadlessTransactionSupportDefault.java
index 8321a84..7c5b4e3 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/components/HeadlessTransactionSupportDefault.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/components/HeadlessTransactionSupportDefault.java
@@ -156,7 +156,7 @@ public class HeadlessTransactionSupportDefault implements HeadlessTransactionSup
// -- getService
private <C> C getService(Class<C> serviceClass) {
- final ServiceInjector servicesInjector = isisSessionFactory().getServicesInjector();
+ final ServiceInjector servicesInjector = isisSessionFactory().getServiceInjector();
return servicesInjector.lookupServiceElseFail(serviceClass);
}
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 ec82135..c69574c 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
@@ -78,7 +78,7 @@ public class IsisMojoSwagger extends IsisMojoAbstract {
final ContextForMojo context, final IsisSessionFactory isisSessionFactory)
throws MojoFailureException, IOException {
- final SwaggerService swaggerService = isisSessionFactory.getServicesInjector().lookupServiceElseFail(SwaggerService.class);
+ final SwaggerService swaggerService = isisSessionFactory.getServiceInjector().lookupServiceElseFail(SwaggerService.class);
final MavenProject mavenProject = context.getMavenProject();
final File outputDir = determineOutputDir(mavenProject, output);
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 a1e6c20..b7c7dbb 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
@@ -81,7 +81,7 @@ public class IsisMojoXsd extends IsisMojoAbstract {
final ContextForMojo context, final IsisSessionFactory isisSessionFactory)
throws MojoFailureException, IOException {
- final JaxbService jaxbService = isisSessionFactory.getServicesInjector().lookupServiceElseFail(JaxbService.class);
+ final JaxbService jaxbService = isisSessionFactory.getServiceInjector().lookupServiceElseFail(JaxbService.class);
final MavenProject mavenProject = context.getMavenProject();
final File outputDir = determineOutputDir(mavenProject);
diff --git a/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java b/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
index 41586c4..18b9a3c 100644
--- a/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
+++ b/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
@@ -65,7 +65,7 @@ public class RestfulObjectsJaxbWriterForXml extends JAXBXmlRootElementProvider {
}
ServiceInjector getServicesInjector() {
- return getIsisSessionFactory().getServicesInjector();
+ return getIsisSessionFactory().getServiceInjector();
}
IsisSessionFactory getIsisSessionFactory() {
diff --git a/core/plugins/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java b/core/plugins/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
index 41586c4..18b9a3c 100644
--- a/core/plugins/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
+++ b/core/plugins/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/server/conneg/RestfulObjectsJaxbWriterForXml.java
@@ -65,7 +65,7 @@ public class RestfulObjectsJaxbWriterForXml extends JAXBXmlRootElementProvider {
}
ServiceInjector getServicesInjector() {
- return getIsisSessionFactory().getServicesInjector();
+ return getIsisSessionFactory().getServiceInjector();
}
IsisSessionFactory getIsisSessionFactory() {
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN4.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN4.java
index c7dc020..a3b2231 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN4.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN4.java
@@ -211,7 +211,7 @@ public class IsisJdoSupportDN4 implements IsisJdoSupport_v3_1 {
}
protected ServiceInjector getServicesInjector() {
- return isisSessionFactory.getServicesInjector();
+ return isisSessionFactory.getServiceInjector();
}
@Programmatic
diff --git a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
index 56fcbc8..3149ba7 100644
--- a/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
+++ b/core/plugins/jdo-datanucleus-4/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
@@ -218,7 +218,7 @@ public class JDOStateManagerForIsis extends ReferentialStateManagerImpl {
}
protected ServiceInjector getServicesInjector() {
- return getSessionFactory().getServicesInjector();
+ return getSessionFactory().getServiceInjector();
}
IsisSessionFactory getSessionFactory() {
diff --git a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index 50edffe..8d86736 100644
--- a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -152,7 +152,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
context.checking(new Expectations() {
{
- allowing(mockIsisSessionFactory).getServicesInjector();
+ allowing(mockIsisSessionFactory).getServiceInjector();
will(returnValue(mockServicesInjector));
allowing(mockIsisSessionFactory).getSpecificationLoader();
diff --git a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index e38eedf..b63e71d 100644
--- a/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/plugins/jdo-datanucleus-4/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -132,7 +132,7 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
context.checking(new Expectations() {
{
- allowing(mockIsisSessionFactory).getServicesInjector();
+ allowing(mockIsisSessionFactory).getServiceInjector();
will(returnValue(mockServicesInjector));
allowing(mockIsisSessionFactory).getSpecificationLoader();
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN5.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN5.java
index 1be6299..a7bd972 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN5.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/applib/services/jdosupport/IsisJdoSupportDN5.java
@@ -221,7 +221,7 @@ public class IsisJdoSupportDN5 implements IsisJdoSupport_v3_2 {
}
protected ServiceInjector getServicesInjector() {
- return isisSessionFactory.getServicesInjector();
+ return isisSessionFactory.getServiceInjector();
}
@Programmatic
diff --git a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
index 56fcbc8..3149ba7 100644
--- a/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
+++ b/core/plugins/jdo-datanucleus-5/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/JDOStateManagerForIsis.java
@@ -218,7 +218,7 @@ public class JDOStateManagerForIsis extends ReferentialStateManagerImpl {
}
protected ServiceInjector getServicesInjector() {
- return getSessionFactory().getServicesInjector();
+ return getSessionFactory().getServiceInjector();
}
IsisSessionFactory getSessionFactory() {
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
index 8df9320..c4cee70 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject.java
@@ -152,7 +152,7 @@ public class WrapperFactoryDefaultTest_wrappedObject {
context.checking(new Expectations() {
{
- allowing(mockIsisSessionFactory).getServicesInjector();
+ allowing(mockIsisSessionFactory).getServiceInjector();
will(returnValue(mockServicesInjector));
allowing(mockIsisSessionFactory).getSpecificationLoader();
diff --git a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
index ff4d142..db10eac 100644
--- a/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
+++ b/core/plugins/jdo-datanucleus-5/src/test/java/org/apache/isis/core/wrapper/WrapperFactoryDefaultTest_wrappedObject_transient.java
@@ -132,7 +132,7 @@ public class WrapperFactoryDefaultTest_wrappedObject_transient {
context.checking(new Expectations() {
{
- allowing(mockIsisSessionFactory).getServicesInjector();
+ allowing(mockIsisSessionFactory).getServiceInjector();
will(returnValue(mockServicesInjector));
allowing(mockIsisSessionFactory).getSpecificationLoader();
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 93c7cfa..13c6f41 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
@@ -137,7 +137,7 @@ public class FixturesInstallerDelegate {
}
private void installFixture(final Object fixture) {
- isisSessionFactory.getServicesInjector().injectServicesInto(fixture);
+ isisSessionFactory.getServiceInjector().injectServicesInto(fixture);
if (fixture instanceof InstallableFixture) {
final InstallableFixture installableFixture = (InstallableFixture) fixture;
@@ -162,7 +162,7 @@ public class FixturesInstallerDelegate {
// -- dependencies (derived)
private ServiceInjector getServicesInjector() {
- return isisSessionFactory.getServicesInjector();
+ return isisSessionFactory.getServiceInjector();
}
private EventBusService getEventBusService() {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java
index 3872a29..eb2b30b 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/headless/IsisSystem.java
@@ -199,7 +199,7 @@ public final class IsisSystem {
// -- getService
public <C> C getService(Class<C> serviceClass) {
- final ServiceInjector servicesInjector = isisSessionFactory.getServicesInjector();
+ final ServiceInjector servicesInjector = isisSessionFactory.getServiceInjector();
return servicesInjector.lookupServiceElseFail(serviceClass);
}
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 7c1d511..a2ee3bf 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
@@ -109,7 +109,7 @@ public interface IsisSessionFactory {
* The {@link ApplicationScopedComponent application-scoped} {@link ServiceInjector}.
* @deprecated use IsisContext instead
*/
- public ServiceInjector getServicesInjector();
+ public ServiceInjector getServiceInjector();
/**
* The {@link ApplicationScopedComponent application-scoped}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java
index a4793bd..4f66f24 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryDefault.java
@@ -25,7 +25,6 @@ import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.ejb.Singleton;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
@@ -36,6 +35,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.commons.internal.base._Blackhole;
import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.ServiceInitializer;
@@ -67,7 +67,7 @@ import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
* it can be {@link Inject}'d into other domain services.
* </p>
*/
-@Singleton @ApplicationScoped
+@ApplicationScoped
public class IsisSessionFactoryDefault implements IsisSessionFactory {
//private final static Logger LOG = LoggerFactory.getLogger(IsisSessionFactory.class);
@@ -86,6 +86,8 @@ public class IsisSessionFactoryDefault implements IsisSessionFactory {
public void init() {
System.out.println("!!!!!!!!!!!!! IsisSessionFactory INIT " + hashCode());
+
+ _Exceptions.dumpStackTrace(System.out, 0, 200);
if(_Context.getIfAny(IsisSessionFactoryDefault.class)!=null) {
return;
@@ -300,7 +302,7 @@ public class IsisSessionFactoryDefault implements IsisSessionFactory {
// -- component accessors
@Override
- public ServiceInjector getServicesInjector() {
+ public ServiceInjector getServiceInjector() {
return serviceInjector;
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java b/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
index d545446..88e6e59 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/wrapper/handlers/DelegatingInvocationHandlerDefault.java
@@ -52,7 +52,7 @@ public class DelegatingInvocationHandlerDefault<T> implements DelegatingInvocati
throw new IllegalArgumentException("delegate must not be null");
}
this.delegate = delegate;
- this.wrapperFactory = isisSessionFactory.getServicesInjector().lookupServiceElseFail(WrapperFactory.class);
+ this.wrapperFactory = isisSessionFactory.getServiceInjector().lookupServiceElseFail(WrapperFactory.class);
this.executionMode = executionMode;
try {
diff --git a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Responses.java b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Responses.java
index 386fcff..f652647 100644
--- a/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Responses.java
+++ b/core/viewer-restfulobjects-rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/Responses.java
@@ -87,7 +87,7 @@ public final class Responses {
final MediaType mediaType = renderer.getMediaType();
- final Date now = IsisContext.getSessionFactory().getServicesInjector()
+ final Date now = IsisContext.getSessionFactory().getServiceInjector()
.lookupServiceElseFail(ClockService.class).nowAsDateTime().toDate();
SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
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 8737620..52ef64b 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
@@ -112,7 +112,7 @@ public class ResourceContext implements RendererContext {
final IsisSessionFactory isisSessionFactory = IsisContext.getSessionFactory();
- this.servicesInjector = isisSessionFactory.getServicesInjector();
+ this.servicesInjector = isisSessionFactory.getServiceInjector();
this.configuration = IsisContext.getConfiguration();
this.authenticationSession = isisSessionFactory.getCurrentSession().getAuthenticationSession();
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 42ab3b0..71e7797 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
@@ -167,7 +167,7 @@ public abstract class ResourceAbstract {
}
protected ServiceInjector getServicesInjector () {
- return getIsisSessionFactory().getServicesInjector();
+ return getIsisSessionFactory().getServiceInjector();
}
protected AuthenticationSession getAuthenticationSession() {
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 0859f95..91a60b1 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
@@ -85,7 +85,7 @@ public class ResourceContextTest_getArg {
// will(returnValue(mockServletContext));
// allowing(mockServletContext).getAttribute("org.apache.isis.core.webapp.isisSessionFactory");
// will(returnValue(mockIsisSessionFactory));
- allowing(mockIsisSessionFactory).getServicesInjector();
+ allowing(mockIsisSessionFactory).getServiceInjector();
will(returnValue(mockServicesInjector));
// allowing(mockIsisSessionFactory).getConfiguration();
// will(returnValue(mockConfiguration));
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index c844894..a648d0d 100644
--- a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -82,7 +82,7 @@ public abstract class ResourceContext_ensureCompatibleAcceptHeader_ContractTest
// will(returnValue(mockServletContext));
// allowing(mockServletContext).getAttribute("org.apache.isis.core.webapp.isisSessionFactory");
// will(returnValue(mockIsisSessionFactory));
- allowing(mockIsisSessionFactory).getServicesInjector();
+ allowing(mockIsisSessionFactory).getServiceInjector();
will(returnValue(mockServicesInjector));
// allowing(mockIsisSessionFactory).getConfiguration();
// will(returnValue(mockConfiguration));
diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/TargetRespondListenerToResetQueryResultCache.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/TargetRespondListenerToResetQueryResultCache.java
index b7d3a4d..10ea442 100644
--- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/TargetRespondListenerToResetQueryResultCache.java
+++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/TargetRespondListenerToResetQueryResultCache.java
@@ -45,7 +45,7 @@ class TargetRespondListenerToResetQueryResultCache implements AjaxRequestTarget.
}
private ServiceInjector getServicesInjector() {
- return getSessionFactory().getServicesInjector();
+ return getSessionFactory().getServiceInjector();
}
private IsisSessionFactory getSessionFactory() {
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 72c268f..402dea9 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
@@ -192,7 +192,7 @@ public class AuthenticatedWebSessionForIsis extends AuthenticatedWebSession impl
protected @NotNull SessionLoggingService getSessionLoggingService() {
try {
- final SessionLoggingService service = getIsisSessionFactory().getServicesInjector()
+ final SessionLoggingService service = getIsisSessionFactory().getServiceInjector()
.lookupService(SessionLoggingService.class)
.orElseGet(SessionLoggingService.Stderr::new);
return service;
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 60b2e28..fa14381 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
@@ -151,7 +151,7 @@ public class LocalizerForIsis extends Localizer {
}
protected ServiceInjector getServicesInjector() {
- return getIsisSessionFactory().getServicesInjector();
+ return getIsisSessionFactory().getServiceInjector();
}
IsisSessionFactory getIsisSessionFactory() {
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 badbe7c..6b2d230 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
@@ -357,7 +357,7 @@ public class WebRequestCycleForIsis implements IRequestCycleListener {
protected ServiceInjector getServicesInjector() {
- return getIsisSessionFactory().getServicesInjector();
+ return getIsisSessionFactory().getServiceInjector();
}
protected IsisTransactionManager getTransactionManager() {
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 fa96bf5..1c1dd1e 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
@@ -717,7 +717,7 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> implements For
ServiceInjector getServicesInjector() {
- return getIsisSessionFactory().getServicesInjector();
+ return getIsisSessionFactory().getServiceInjector();
}
}
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 0b3c2ca..f913940 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
@@ -173,7 +173,7 @@ UiHintContainer {
if(sortedBy != null) {
@SuppressWarnings("unchecked")
final Comparator<Object> comparator = (Comparator<Object>) InstanceUtil.createInstance(sortedBy);
- entityCollectionModel.getIsisSessionFactory().getServicesInjector().injectServicesInto(comparator);
+ entityCollectionModel.getIsisSessionFactory().getServiceInjector().injectServicesInto(comparator);
Collections.sort(objectList, comparator);
}
diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java
index bb12e7f..f6c9f7b 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java
@@ -83,7 +83,7 @@ class HintPageParameterSerializer implements Serializable {
}
private static HintStore getHintStore() {
- return getIsisSessionFactory().getServicesInjector().lookupService(HintStore.class).orElse(null);
+ return getIsisSessionFactory().getServiceInjector().lookupService(HintStore.class).orElse(null);
}
private static IsisSessionFactory getIsisSessionFactory() {
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 aca693f..fb10736 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
@@ -147,7 +147,7 @@ public class ComponentHintKey implements Serializable {
HintStore getHintStore() {
- return getIsisSessionFactory().getServicesInjector().lookupService(HintStore.class).orElse(null);
+ return getIsisSessionFactory().getServiceInjector().lookupService(HintStore.class).orElse(null);
}
IsisSessionFactory getIsisSessionFactory() {
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java
index 9ba0ea9..9fc7db1 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanelFactory.java
@@ -64,7 +64,7 @@ public class ServiceActionsPanelFactory extends ComponentFactoryAbstract {
final ServiceActionsModel serviceActionsModel = (ServiceActionsModel) model;
final MenuBarsService menuBarsService =
- getIsisSessionFactory().getServicesInjector().lookupServiceElseFail(MenuBarsService.class);
+ getIsisSessionFactory().getServiceInjector().lookupServiceElseFail(MenuBarsService.class);
final MenuBars menuBars = menuBarsService.menuBars();
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java
index 467b584..f0bd322 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryMenuPanelFactory.java
@@ -64,7 +64,7 @@ public class TertiaryMenuPanelFactory extends ComponentFactoryAbstract {
final ServiceActionsModel serviceActionsModel = (ServiceActionsModel) model;
final MenuBarsService menuBarsService =
- getIsisSessionFactory().getServicesInjector().lookupServiceElseFail(MenuBarsService.class);
+ getIsisSessionFactory().getServiceInjector().lookupServiceElseFail(MenuBarsService.class);
final MenuBars menuBars = menuBarsService.menuBars();
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java
index ffcbbb7..aca6d30 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersPanel.java
@@ -117,7 +117,7 @@ public class ActionParametersPanel extends PanelAbstract<ActionModel> {
ActionResultResponse resultResponse = ActionResultResponseType.OBJECT.interpretResult(this.getActionModel(), targetAdapter, ex);
resultResponse.getHandlingStrategy().handleResults(resultResponse, getIsisSessionFactory());
- final MessageService messageService = getServicesInjector().lookupServiceElseFail(MessageService.class);
+ final MessageService messageService = getServiceInjector().lookupServiceElseFail(MessageService.class);
messageService.warnUser(ex.getMessage());
}
}
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 0a6e226..6a27426 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
@@ -243,7 +243,7 @@ extends PanelAbstract<EntityCollectionModel> implements CollectionCountProvider
// optional SPI to reorder
final List<TableColumnOrderService> tableColumnOrderServices =
- getServicesInjector().streamServices(TableColumnOrderService.class)
+ getServiceInjector().streamServices(TableColumnOrderService.class)
.collect(Collectors.toList());
for (final TableColumnOrderService tableColumnOrderService : tableColumnOrderServices) {
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java
index da1d351..7e24a4f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/tabs/TabGroupPanel.java
@@ -79,7 +79,7 @@ public class TabGroupPanel extends AjaxBootstrapTabbedPanel<ITab> {
}
static TranslationService getTranslationService() {
- return IsisContext.getSessionFactory().getServicesInjector().lookupService(TranslationService.class).orElse(null);
+ return IsisContext.getSessionFactory().getServiceInjector().lookupService(TranslationService.class).orElse(null);
}
public TabGroupPanel(String id, final EntityModel entityModel, final BS3TabGroup bs3TabGroup) {
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 0e44a4f..ac579b6 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
@@ -134,7 +134,7 @@ public abstract class ScalarPanelTextFieldDatePickerAbstract<T extends Serializa
}
private LocaleProvider getLocaleProvider() {
- return IsisContext.getSessionFactory().getServicesInjector().lookupService(LocaleProvider.class).orElse(null);
+ return IsisContext.getSessionFactory().getServiceInjector().lookupService(LocaleProvider.class).orElse(null);
}
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
index f8eb682..118155e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
@@ -86,7 +86,7 @@ public abstract class ScalarPanelTextFieldNumeric<T extends Serializable> extend
}
private LocaleProvider getLocaleProvider() {
- return IsisContext.getSessionFactory().getServicesInjector()
+ return IsisContext.getSessionFactory().getServiceInjector()
.lookupService(LocaleProvider.class)
.orElse(null);
}
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 7b4ebf4..92cc8af 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
@@ -521,7 +521,7 @@ public abstract class PageAbstract extends WebPage implements ActionPromptProvid
}
protected ServiceInjector getServicesInjector() {
- return getIsisSessionFactory().getServicesInjector();
+ return getIsisSessionFactory().getServiceInjector();
}
// -- derived from injected components (session-scope)
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 54a6a8a..b360791 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
@@ -58,7 +58,7 @@ public class EmailAvailableValidator implements IValidator<String> {
});
}ServiceInjector getServicesInjector() {
- return getIsisSessionFactory().getServicesInjector();
+ return getIsisSessionFactory().getServiceInjector();
}
IsisSessionFactory getIsisSessionFactory() {
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 1bad534..6091022 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
@@ -55,7 +55,7 @@ public class UsernameAvailableValidator implements IValidator<String> {
}
ServiceInjector getServicesInjector() {
- return getIsisSessionFactory().getServicesInjector();
+ return getIsisSessionFactory().getServiceInjector();
}
IsisSessionFactory getIsisSessionFactory() {
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 a7cedae..25aef1e 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
@@ -83,7 +83,7 @@ public class PasswordResetPanel extends Panel {
public Boolean call() throws Exception {
String email = accountConfirmationMap.get(uuid);
- UserRegistrationService userRegistrationService = getIsisSessionFactory().getServicesInjector()
+ UserRegistrationService userRegistrationService = getIsisSessionFactory().getServiceInjector()
.lookupServiceElseFail(UserRegistrationService.class);
return userRegistrationService.updatePasswordByEmail(email, password);
}
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 fb3c7bb..7a692a3 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
@@ -127,7 +127,7 @@ public abstract class RegisterPanel extends GenericPanel<UserDetails> {
@Override
public void run() {
final UserRegistrationService userRegistrationService = getIsisSessionFactory()
- .getServicesInjector().lookupServiceElseFail(UserRegistrationService.class);
+ .getServiceInjector().lookupServiceElseFail(UserRegistrationService.class);
getIsisSessionFactory().getCurrentSession().getPersistenceSession().getTransactionManager()
.executeWithinTransaction(() -> {
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 9625a8a..ef3f983 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
@@ -113,7 +113,7 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor {
}
protected ServiceInjector getServicesInjector() {
- return getIsisSessionFactory().getServicesInjector();
+ return getIsisSessionFactory().getServiceInjector();
}
protected IsisSessionFactory getIsisSessionFactory() {
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
index 1d14809..b28422c 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -479,7 +479,7 @@ implements FormExecutor {
}
protected ServiceInjector getServicesInjector() {
- return getIsisSessionFactory().getServicesInjector();
+ return getIsisSessionFactory().getServiceInjector();
}
protected SpecificationLoader getSpecificationLoader() {
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 707dafd..b5ca626 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
@@ -162,18 +162,19 @@ public abstract class PanelAbstract<T extends IModel<?>> extends Panel {
// ///////////////////////////////////////////////////////////////////
public PersistenceSession getPersistenceSession() {
- return getIsisSessionFactory().getCurrentSession().getPersistenceSession();
+ return IsisContext.getPersistenceSession().orElse(null);
}
+
protected IsisConfiguration getConfiguration() {
return IsisContext.getConfiguration();
}
public SpecificationLoader getSpecificationLoader() {
- return getIsisSessionFactory().getSpecificationLoader();
+ return IsisContext.getSpecificationLoader();
}
- protected ServiceInjector getServicesInjector() {
- return getIsisSessionFactory().getServicesInjector();
+ protected ServiceInjector getServiceInjector() {
+ return IsisContext.getServiceInjector();
}
protected IsisSessionFactory getIsisSessionFactory() {