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 2018/11/18 09:06:39 UTC
[isis] branch v2 updated (99b4e84 -> 944aa70)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 99b4e84 ISIS-1991: another typo
new 71a4b84 ISIS-1991: polishing the deploymentType decision logic
new 944aa70 ISIS-1991: cleanup: use _Context.isPrototyping() everywhere (framework internal)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../isis/commons/internal/context/_Context.java | 6 ++++++
.../plugins/environment/IsisSystemEnvironment.java | 23 ++++++++++++++++++----
.../param/DeriveFacetsPostProcessor.java | 2 +-
.../services/grid/GridLoaderServiceDefault.java | 2 +-
.../services/grid/GridSystemServiceAbstract.java | 2 +-
.../core/metamodel/spec/feature/ObjectAction.java | 4 ++--
.../specimpl/ObjectSpecificationAbstract.java | 2 +-
.../fixture/LogonFixtureAuthenticator.java | 2 +-
.../conneg/IsisPrettyPrintingProcessor.java | 4 ++--
.../services/i18n/po/TranslationServicePo.java | 4 ++--
.../menubars/MenuBarsLoaderServiceDefault.java | 4 ++--
.../menubars/bootstrap3/MenuBarsServiceBS3.java | 4 ++--
.../runtime/system/session/IsisSessionFactory.java | 3 ++-
.../system/session/IsisSessionFactoryBuilder.java | 2 +-
.../isis/core/webapp/modules/WebModule_Wicket.java | 4 ++--
.../rendering/util/JsonWriterUtil.java | 7 ++++---
.../wicket/viewer/IsisWicketApplication.java | 8 ++++----
.../collection/AssociatedWithActionsHelper.java | 4 ++--
.../ajaxtable/PrototypingMessageProvider.java | 6 ++----
19 files changed, 57 insertions(+), 36 deletions(-)
[isis] 02/02: ISIS-1991: cleanup: use _Context.isPrototyping()
everywhere (framework internal)
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 944aa70c31161f590516c1486d5217bad6797a21
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Nov 18 10:06:24 2018 +0100
ISIS-1991: cleanup: use _Context.isPrototyping() everywhere (framework
internal)
this is exposed by IsisContext.getEnvironment() as part of the public
API
Task-Url: https://issues.apache.org/jira/browse/ISIS-1991
---
.../java/org/apache/isis/commons/internal/context/_Context.java | 6 ++++++
.../isis/core/plugins/environment/IsisSystemEnvironment.java | 4 ++--
.../metamodel/postprocessors/param/DeriveFacetsPostProcessor.java | 2 +-
.../core/metamodel/services/grid/GridLoaderServiceDefault.java | 2 +-
.../core/metamodel/services/grid/GridSystemServiceAbstract.java | 2 +-
.../org/apache/isis/core/metamodel/spec/feature/ObjectAction.java | 4 ++--
.../specloader/specimpl/ObjectSpecificationAbstract.java | 2 +-
.../runtime/authentication/fixture/LogonFixtureAuthenticator.java | 2 +-
.../rendering/service/conneg/IsisPrettyPrintingProcessor.java | 4 ++--
.../isis/core/runtime/services/i18n/po/TranslationServicePo.java | 4 ++--
.../runtime/services/menubars/MenuBarsLoaderServiceDefault.java | 4 ++--
.../runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java | 4 ++--
.../isis/core/runtime/system/session/IsisSessionFactory.java | 3 ++-
.../core/runtime/system/session/IsisSessionFactoryBuilder.java | 2 +-
.../org/apache/isis/core/webapp/modules/WebModule_Wicket.java | 4 ++--
.../isis/viewer/restfulobjects/rendering/util/JsonWriterUtil.java | 7 ++++---
.../apache/isis/viewer/wicket/viewer/IsisWicketApplication.java | 8 ++++----
.../ui/components/collection/AssociatedWithActionsHelper.java | 4 ++--
.../collectioncontents/ajaxtable/PrototypingMessageProvider.java | 6 ++----
19 files changed, 40 insertions(+), 34 deletions(-)
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java b/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
index 1c168f3..2add9d9 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
@@ -241,10 +241,16 @@ public final class _Context {
// -- ENVIRONMENT
+ /** framework internal, exposed by IsisContext */
public static IsisSystemEnvironment getEnvironment() {
return getOrElse(IsisSystemEnvironment.class,
IsisSystemEnvironmentPlugin.get()::getIsisSystemEnvironment);
}
+
+ /** framework internal, shortcut for convenience */
+ public static boolean isPrototyping() {
+ return getEnvironment().getDeploymentType().isPrototyping();
+ }
// -- HELPER
diff --git a/core/commons/src/main/java/org/apache/isis/core/plugins/environment/IsisSystemEnvironment.java b/core/commons/src/main/java/org/apache/isis/core/plugins/environment/IsisSystemEnvironment.java
index f5e9107..186f98f 100644
--- a/core/commons/src/main/java/org/apache/isis/core/plugins/environment/IsisSystemEnvironment.java
+++ b/core/commons/src/main/java/org/apache/isis/core/plugins/environment/IsisSystemEnvironment.java
@@ -19,8 +19,8 @@
package org.apache.isis.core.plugins.environment;
/**
- * Represents configuration, that is available in an early phase of bootstrapping
- * and should is regarded immutable during application's life-cycle.
+ * Represents configuration, that is available in an early phase of bootstrapping.
+ * It is regarded immutable for an application's life-cycle.
*
* @since 2.0.0-M2
*/
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
index f2ed5b3..f2addb9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/postprocessors/param/DeriveFacetsPostProcessor.java
@@ -482,7 +482,7 @@ public class DeriveFacetsPostProcessor implements ObjectSpecificationPostProcess
private List<ActionType> inferActionTypes() {
final List<ActionType> actionTypes = _Lists.newArrayList();
actionTypes.add(ActionType.USER);
- if (_Context.getEnvironment().getDeploymentType().isPrototyping()) {
+ if (_Context.isPrototyping()) {
actionTypes.add(ActionType.PROTOTYPE);
}
return actionTypes;
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 a05d6c9..c57f5fc 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
@@ -76,7 +76,7 @@ public class GridLoaderServiceDefault implements GridLoaderService {
@Override
public boolean supportsReloading() {
- return _Context.getEnvironment().getDeploymentType().isPrototyping();
+ return _Context.isPrototyping();
}
@Override
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 48d9bae..0681bbd 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
@@ -173,7 +173,7 @@ public abstract class GridSystemServiceAbstract<G extends org.apache.isis.applib
}
} else {
- if(_Context.getEnvironment().getDeploymentType().isPrototyping()) {
+ if(_Context.isPrototyping()) {
messageService.warnUser("Grid metadata errors for " + grid.getDomainClass().getName() + "; check the error log");
}
LOG.error("Grid metadata errors:\n\n{}\n\n", jaxbService.toXml(grid));
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 466d129..b46c5ab 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
@@ -281,7 +281,7 @@ public interface ObjectAction extends ObjectMember {
final List<ObjectAction> topLevelActions = _Lists.newArrayList();
addTopLevelActions(adapter, ActionType.USER, topLevelActions);
- if(_Context.getEnvironment().getDeploymentType().isPrototyping()) {
+ if(_Context.isPrototyping()) {
addTopLevelActions(adapter, ActionType.PROTOTYPE, topLevelActions);
}
return topLevelActions;
@@ -316,7 +316,7 @@ public interface ObjectAction extends ObjectMember {
final List<ObjectAction> associatedActions = _Lists.newArrayList();
addActions(adapter, ActionType.USER, association, associatedActions);
- if(_Context.getEnvironment().getDeploymentType().isPrototyping()) {
+ if(_Context.isPrototyping()) {
addActions(adapter, ActionType.PROTOTYPE, association, associatedActions);
}
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 316ec70..62c5dbe 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
@@ -652,7 +652,7 @@ public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implem
if(oa != null) {
return oa;
}
- if(_Context.getEnvironment().getDeploymentType().isPrototyping()) {
+ if(_Context.isPrototyping()) {
// automatically refresh if not in production
// (better support for jrebel)
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
index 3cadcb4..57c7c9c 100644
--- 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
@@ -41,7 +41,7 @@ public class LogonFixtureAuthenticator extends AuthenticatorAbstract {
@Override
protected final boolean isValid(final AuthenticationRequest request) {
- return _Context.getEnvironment().getDeploymentType().isPrototyping();
+ return _Context.isPrototyping();
}
diff --git a/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java b/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
index 7574e2b..eb40181 100644
--- a/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
+++ b/core/plugins/jaxrs-resteasy-3/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/IsisPrettyPrintingProcessor.java
@@ -24,6 +24,7 @@ import javax.xml.bind.Marshaller;
import org.jboss.resteasy.annotations.DecorateTypes;
import org.jboss.resteasy.spi.DecoratorProcessor;
+import org.apache.isis.commons.internal.context._Context;
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;
@@ -42,8 +43,7 @@ public class IsisPrettyPrintingProcessor implements DecoratorProcessor<Marshalle
protected boolean shouldPrettyPrint() {
try {
- return getConfiguration().getBoolean(KEY_PRETTY_PRINT,
- IsisContext.getEnvironment().getDeploymentType().isPrototyping());
+ return getConfiguration().getBoolean(KEY_PRETTY_PRINT, _Context.isPrototyping());
} catch (Exception e) {
return true;
}
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 51953be..5b0a61b 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
@@ -32,7 +32,7 @@ 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.context.IsisContext;
+import org.apache.isis.commons.internal.context._Context;
@DomainService(
nature = NatureOfService.DOMAIN,
@@ -90,7 +90,7 @@ public class TranslationServicePo implements TranslationService {
}
protected boolean isPrototypeOrTest() {
- return !IsisContext.getEnvironment().getDeploymentType().isProduction();
+ return _Context.isPrototyping();
}
@Programmatic
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/MenuBarsLoaderServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
index 61f6014..ecb2c35 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
@@ -26,8 +26,8 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.layout.menubars.bootstrap3.BS3MenuBars;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.menu.MenuBarsLoaderService;
+import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.commons.internal.resources._Resources;
-import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
@DomainService(nature = NatureOfService.DOMAIN)
@@ -35,7 +35,7 @@ public class MenuBarsLoaderServiceDefault implements MenuBarsLoaderService {
@Override
public boolean supportsReloading() {
- return !IsisContext.getEnvironment().getDeploymentType().isProduction();
+ return _Context.isPrototyping();
}
@Override
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
index a4881c3..0666c0a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
@@ -48,6 +48,7 @@ import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.actions.notinservicemenu.NotInServiceMenuFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
@@ -60,7 +61,6 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
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;
@DomainService(nature = NatureOfService.DOMAIN)
@@ -169,7 +169,7 @@ public class MenuBarsServiceBS3 implements MenuBarsService {
menuBars.setMetadataError(
"Exactly one menu must have 'unreferencedActions' flag set; found " + size + " such menus");
- if(!IsisContext.getEnvironment().getDeploymentType().isProduction()) {
+ if(_Context.isPrototyping()) {
messageService.warnUser("Menubars metadata errors; check the error log");
}
LOG.error("Menubar layout metadata errors:\n\n{}\n\n", jaxbService.toXml(menuBars));
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 37f14a3..e47f89f 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,6 +33,7 @@ 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.commons.internal.context._Context;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -144,7 +145,7 @@ implements ApplicationScopedComponent, AppManifestProvider {
fixtureInstaller.installFixtures();
// only allow logon fixtures if not in production mode.
- if (!IsisContext.getEnvironment().getDeploymentType().isProduction()) {
+ if (_Context.isPrototyping()) {
logonFixture = fixtureInstaller.getLogonFixture();
}
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 56c6353..8552cf2 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
@@ -114,7 +114,7 @@ public class IsisSessionFactoryBuilder {
// 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 (!IsisContext.getEnvironment().getDeploymentType().isProduction() && !Clock.isInitialized()) {
+ if (_Context.isPrototyping() && !Clock.isInitialized()) {
FixtureClock.initialize();
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_Wicket.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_Wicket.java
index 0397133..3462e40 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_Wicket.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/modules/WebModule_Wicket.java
@@ -24,7 +24,7 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
-import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.core.webapp.IsisWebAppConfigProvider;
import static java.util.Objects.requireNonNull;
@@ -66,7 +66,7 @@ final class WebModule_Wicket implements WebModule {
configProvider.peekAtOrDefault(ctx, "isis.viewer.wicket.basePath", "/wicket");
{
- deploymentMode = IsisContext.getEnvironment().getDeploymentType().isPrototyping()
+ deploymentMode = _Context.isPrototyping()
? "development" : "deployment";
}
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 ce26642..a0ceb2d 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
@@ -20,6 +20,7 @@ package org.apache.isis.viewer.restfulobjects.rendering.util;
import java.io.IOException;
+import org.apache.isis.commons.internal.context._Context;
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;
@@ -42,8 +43,8 @@ public final class JsonWriterUtil {
}
private static JsonMapper.PrettyPrinting inferPrettyPrinting() {
- return IsisContext.getEnvironment().getDeploymentType().isProduction()
- ? JsonMapper.PrettyPrinting.DISABLE
- : JsonMapper.PrettyPrinting.ENABLE;
+ return _Context.isPrototyping()
+ ? JsonMapper.PrettyPrinting.ENABLE
+ : JsonMapper.PrettyPrinting.DISABLE;
}
}
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 bda8910..8356a41 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
@@ -349,7 +349,7 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
log(mmie.getValidationErrors());
}
- if(IsisContext.getEnvironment().getDeploymentType().isPrototyping()) {
+ if(_Context.isPrototyping()) {
DebugDiskDataStore.register(this);
LOG.info("DebugDiskDataStore registered; access via ~/wicket/internal/debug/diskDataStore");
LOG.info("DebugDiskDataStore: eg, http://localhost:8080/wicket/wicket/internal/debug/diskDataStore");
@@ -432,7 +432,7 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
* app is restarted.
*/
protected String defaultEncryptionKeyIfNotConfigured() {
- return IsisContext.getEnvironment().getDeploymentType().isPrototyping()
+ return _Context.isPrototyping()
? "PrototypingEncryptionKey"
: UUID.randomUUID().toString();
}
@@ -466,7 +466,7 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
}
protected void configureWicketSourcePlugin() {
- if(IsisContext.getEnvironment().getDeploymentType().isPrototyping()) {
+ if(_Context.isPrototyping()) {
WicketSource.configure(this);
}
}
@@ -732,7 +732,7 @@ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, WicketVi
@Override //[ahuber] final on purpose! to switch DeploymentType, do this consistent with IsisContext.
public final RuntimeConfigurationType getConfigurationType() {
- return IsisContext.getEnvironment().getDeploymentType().isPrototyping()
+ return _Context.isPrototyping()
? RuntimeConfigurationType.DEVELOPMENT
: RuntimeConfigurationType.DEPLOYMENT;
}
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
index 2ea289e..c10ad2e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
@@ -25,6 +25,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.concurrency.ConcurrencyChecking;
import org.apache.isis.core.metamodel.spec.ActionType;
@@ -32,7 +33,6 @@ 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.spec.feature.OneToManyAssociation;
-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.mementos.ObjectAdapterMemento;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
@@ -79,7 +79,7 @@ public class AssociatedWithActionsHelper implements Serializable {
private static List<ActionType> inferActionTypes() {
final List<ActionType> actionTypes = _Lists.newArrayList();
actionTypes.add(ActionType.USER);
- if ( !IsisContext.getEnvironment().getDeploymentType().isProduction()) {
+ if ( _Context.isPrototyping() ) {
actionTypes.add(ActionType.PROTOTYPE);
}
return actionTypes;
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
index c96f354..5dbaf5f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
@@ -25,6 +25,7 @@ import org.apache.wicket.model.Model;
import org.apache.isis.commons.internal.base._Timing;
import org.apache.isis.commons.internal.base._Timing.StopWatch;
+import org.apache.isis.commons.internal.context._Context;
import org.apache.isis.core.runtime.system.context.IsisContext;
/**
@@ -55,10 +56,7 @@ class PrototypingMessageProvider {
private static String getTookTimingMessage() {
- final boolean isPrototyping = IsisContext.getEnvironment()
- .getDeploymentType().isPrototyping();
-
- if(!isPrototyping) {
+ if(!_Context.isPrototyping()) {
return "";
}
[isis] 01/02: ISIS-1991: polishing the deploymentType decision logic
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 71a4b84f893736d092e3194c534294fdcabf7c0b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Nov 18 09:27:50 2018 +0100
ISIS-1991: polishing the deploymentType decision logic
Task-Url: https://issues.apache.org/jira/browse/ISIS-1991
---
.../plugins/environment/IsisSystemEnvironment.java | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/core/commons/src/main/java/org/apache/isis/core/plugins/environment/IsisSystemEnvironment.java b/core/commons/src/main/java/org/apache/isis/core/plugins/environment/IsisSystemEnvironment.java
index 63b3664..f5e9107 100644
--- a/core/commons/src/main/java/org/apache/isis/core/plugins/environment/IsisSystemEnvironment.java
+++ b/core/commons/src/main/java/org/apache/isis/core/plugins/environment/IsisSystemEnvironment.java
@@ -46,18 +46,33 @@ public interface IsisSystemEnvironment {
@Override
public DeploymentType getDeploymentType() {
boolean anyVoteForPrototyping = false;
+ boolean anyVoteForProduction = false;
+
+ // system environment priming (lowest prio)
anyVoteForPrototyping|=
"true".equalsIgnoreCase(System.getenv("PROTOTYPING"));
+ // system property priming (medium prio)
+
anyVoteForPrototyping|=
- "server_prototype".equalsIgnoreCase(System.getProperty("isis.deploymentType"));
+ "true".equalsIgnoreCase(System.getProperty("PROTOTYPING"));
anyVoteForPrototyping|=
"PROTOTYPING".equalsIgnoreCase(System.getProperty("isis.deploymentType"));
+ // system property override (highest prio)
+
+ anyVoteForProduction|=
+ "false".equalsIgnoreCase(System.getProperty("PROTOTYPING"));
+
+ anyVoteForProduction|=
+ "PRODUCTION".equalsIgnoreCase(System.getProperty("isis.deploymentType"));
+
+ final boolean isPrototyping = anyVoteForPrototyping && !anyVoteForProduction;
+
final DeploymentType deploymentType =
- anyVoteForPrototyping
+ isPrototyping
? DeploymentType.PROTOTYPING
: DeploymentType.PRODUCTION;