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/10/02 09:46:11 UTC
[isis] branch v2 updated (897b4f1 -> f7864f4)
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.
discard 897b4f1 ISIS-2158: convert IsisSystemEnvironment to be a Spring managed bean
add 1caca53 ISIS-2163: IsisSystemEnvironment is now a Spring-managed bean.
new a955ed4 ISIS-2158: move JdoPersistenceLifecycleService -> jdo-common
new 2bf3f12 ISIS-2158: fixing tests after isis-sys-env was migrated to a bean
new f7864f4 ISIS-2158: removes the IsisSystemEnvironmentProvider
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (897b4f1)
\
N -- N -- N refs/heads/v2 (f7864f4)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 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 | 22 +----
.../plugins/environment/IsisSystemEnvironment.java | 100 +++++++++++----------
.../org/apache/isis/config/IsisConfigModule.java | 11 +--
.../org/apache/isis/config/IsisConfiguration.java | 1 +
.../isis/config/IsisConfigurationLegacy.java | 6 +-
.../metamodel/specloader/IntrospectionMode.java | 5 +-
.../action/ActionAnnotationFacetFactory.java | 3 +-
.../param/DeriveFacetsPostProcessor.java | 3 +-
.../services/grid/GridLoaderServiceDefault.java | 4 +-
.../services/grid/GridSystemServiceAbstract.java | 4 +-
.../services/registry/ServiceRegistryDefault.java | 9 +-
.../isis/metamodel/spec/feature/ObjectAction.java | 5 +-
.../specloader/SpecificationLoaderDefault.java | 18 ++--
.../specimpl/ObjectSpecificationAbstract.java | 2 +-
.../SpecificationLoaderTestAbstract.java | 2 +
.../specloader/SpecificationLoaderTest_array.java | 9 --
.../service}/JdoPersistenceLifecycleService.java | 4 +-
.../org/apache/isis/jdo/IsisBootDataNucleus.java | 2 +
.../confmenu/ConfigurationViewServiceDefault.java | 13 ++-
.../services/i18n/po/TranslationServicePo.java | 4 +-
.../menubars/MenuBarsLoaderServiceDefault.java | 4 +-
.../menubars/bootstrap3/MenuBarsServiceBS3.java | 4 +-
.../modules/h2console/WebModuleH2Console.java | 8 +-
.../fixtures/LogonFixtureAuthenticator.java | 8 +-
.../jmocking/JUnitRuleMockery2.java | 4 +-
.../rendering/util/JsonWriterUtil.java | 7 +-
.../wicket/viewer/IsisWicketApplication.java | 49 ++++++----
.../isis/viewer/wicket/viewer/WebModuleWicket.java | 6 +-
.../collection/AssociatedWithActionsHelper.java | 3 +-
.../ajaxtable/PrototypingMessageProvider.java | 3 +-
.../DomainModelTest_usingBadDomain.java | 4 +-
.../fixtures/FixturesLifecyleService.java | 4 +-
32 files changed, 175 insertions(+), 156 deletions(-)
rename core/{runtime/src/main/java/org/apache/isis/runtime/system/persistence => plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/service}/JdoPersistenceLifecycleService.java (96%)
[isis] 02/03: ISIS-2158: fixing tests after isis-sys-env was
migrated to a bean
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 2bf3f12963900606c34b0b3fda8205e695659f08
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Oct 2 11:36:13 2019 +0200
ISIS-2158: fixing tests after isis-sys-env was migrated to a bean
---
.../isis/metamodel/specloader/SpecificationLoaderDefault.java | 8 +++++---
.../metamodel/specloader/SpecificationLoaderTestAbstract.java | 2 ++
.../isis/metamodel/specloader/SpecificationLoaderTest_array.java | 9 ---------
3 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
index 3cae6ba..b5f6bb0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/specloader/SpecificationLoaderDefault.java
@@ -98,13 +98,15 @@ public class SpecificationLoaderDefault implements SpecificationLoader {
/** JUnit Test Support */
public static SpecificationLoaderDefault getInstance (
- final IsisConfiguration configuration,
- final ProgrammingModel programmingModel,
- final MetaModelValidator metaModelValidator) {
+ IsisConfiguration configuration,
+ IsisSystemEnvironment isisSystemEnvironment,
+ ProgrammingModel programmingModel,
+ MetaModelValidator metaModelValidator) {
val instance = new SpecificationLoaderDefault();
instance.isisConfiguration = configuration;
+ instance.isisSystemEnvironment = isisSystemEnvironment;
instance.programmingModel = programmingModel;
instance.metaModelValidator = metaModelValidator;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
index 27be31b..20333b1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTestAbstract.java
@@ -30,6 +30,7 @@ import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.i18n.TranslationService.Mode;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.commons.internal.base._Timing;
+import org.apache.isis.commons.internal.plugins.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.metamodel.MetaModelContext;
import org.apache.isis.metamodel.facetapi.Facet;
@@ -91,6 +92,7 @@ abstract class SpecificationLoaderTestAbstract {
SpecificationLoader getSpecificationLoader(IsisConfiguration configuration) {
return SpecificationLoaderDefault.getInstance(
configuration,
+ new IsisSystemEnvironment(),
new ProgrammingModelFacetsJava8(ProgrammingModelAbstract.DeprecatedPolicy.HONOUR),
new MetaModelValidatorDefault());
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTest_array.java b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTest_array.java
index 230b94e..2a99967 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTest_array.java
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/specloader/SpecificationLoaderTest_array.java
@@ -62,13 +62,4 @@ class SpecificationLoaderTest_array extends SpecificationLoaderTestAbstract {
assertEquals(ReflectorTestPojo.class, facet.value());
}
- //TODO [2033] performance testing the spec loader
- // @Test @RepeatedTest(1000)
- // public void testTypeOfFacet1000(TestInfo testInfo) throws Exception {
- // final TypeOfFacet facet =
- // _Timing.callVerbose("*** Loop " + testInfo.getDisplayName(), ()->specification.getFacet(TypeOfFacet.class));
- // assertNull(facet);
- // }
-
-
}
[isis] 03/03: ISIS-2158: removes the IsisSystemEnvironmentProvider
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 f7864f4c1cba1c5083c87454b6f3a72c68e3fc98
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Oct 2 11:45:39 2019 +0200
ISIS-2158: removes the IsisSystemEnvironmentProvider
- this indirection is not required
---
.../plugins/environment/IsisSystemEnvironment.java | 9 +++--
.../environment/IsisSystemEnvironmentProvider.java | 41 ----------------------
.../org/apache/isis/config/IsisConfigModule.java | 5 +--
.../DomainModelTest_usingBadDomain.java | 6 ++--
4 files changed, 13 insertions(+), 48 deletions(-)
diff --git a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/environment/IsisSystemEnvironment.java b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/environment/IsisSystemEnvironment.java
index ba500d2..b84015e 100644
--- a/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/environment/IsisSystemEnvironment.java
+++ b/core/commons/src/main/java/org/apache/isis/commons/internal/plugins/environment/IsisSystemEnvironment.java
@@ -18,16 +18,21 @@
*/
package org.apache.isis.commons.internal.plugins.environment;
-import org.apache.isis.commons.internal.base._Lazy;
+import javax.inject.Singleton;
+
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
+import org.apache.isis.commons.internal.base._Lazy;
+
/**
* Represents configuration, that is available in an early phase of bootstrapping.
* It is regarded immutable for an application's life-cycle.
*
* @since 2.0
*/
-@Service
+@Service @Singleton @Order(value = Ordered.LOWEST_PRECEDENCE)
public class IsisSystemEnvironment {
private static _Lazy<IsisSystemEnvironment> singleton = _Lazy.threadSafe(IsisSystemEnvironment::new);
diff --git a/core/config/src/main/java/org/apache/isis/commons/internal/plugins/environment/IsisSystemEnvironmentProvider.java b/core/config/src/main/java/org/apache/isis/commons/internal/plugins/environment/IsisSystemEnvironmentProvider.java
deleted file mode 100644
index bdc469e..0000000
--- a/core/config/src/main/java/org/apache/isis/commons/internal/plugins/environment/IsisSystemEnvironmentProvider.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.commons.internal.plugins.environment;
-
-import java.util.Set;
-
-import javax.inject.Singleton;
-
-import org.apache.isis.commons.internal.plugins.environment.IsisSystemEnvironment;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Simply responsible for instantiating the singleton {@link IsisSystemEnvironment} through its factory method.
- */
-@Configuration
-public class IsisSystemEnvironmentProvider {
-
- @Bean @Singleton
- public IsisSystemEnvironment isisSystemEnvironment() {
- return IsisSystemEnvironment.get();
- }
-}
-
-
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfigModule.java b/core/config/src/main/java/org/apache/isis/config/IsisConfigModule.java
index 802def9..3938880 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfigModule.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfigModule.java
@@ -18,16 +18,17 @@
*/
package org.apache.isis.config;
-import org.apache.isis.commons.internal.plugins.environment.IsisSystemEnvironmentProvider;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import org.apache.isis.commons.internal.plugins.environment.IsisSystemEnvironment;
+
@Configuration
@Import({
//IsisConfiguration.class // not required
IsisConfiguration.PatternsConverter.class,
- IsisSystemEnvironmentProvider.class
+ IsisSystemEnvironment.class
})
@EnableConfigurationProperties(IsisConfiguration.class)
public class IsisConfigModule {
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
index 4f94e17..2e0725e 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
-import org.apache.isis.commons.internal.plugins.environment.IsisSystemEnvironmentProvider;
+import org.apache.isis.commons.internal.plugins.environment.IsisSystemEnvironment;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.IsisPresets;
import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
@@ -62,11 +62,11 @@ import lombok.val;
class DomainModelTest_usingBadDomain {
@Inject private IsisConfiguration configuration;
- @Inject private IsisSystemEnvironmentProvider isisSystemEnvironmentProvider;
+ @Inject private IsisSystemEnvironment isisSystemEnvironment;
@Test
void fullIntrospection_shouldBeEnabledByThisTestClass() {
- assertTrue(IntrospectionMode.isFullIntrospect(configuration, isisSystemEnvironmentProvider.isisSystemEnvironment()));
+ assertTrue(IntrospectionMode.isFullIntrospect(configuration, isisSystemEnvironment));
}
@Test
[isis] 01/03: ISIS-2158: move JdoPersistenceLifecycleService ->
jdo-common
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 a955ed4c3108660ac3d5f668a9a941523294a4e8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Oct 2 11:22:17 2019 +0200
ISIS-2158: move JdoPersistenceLifecycleService -> jdo-common
- fixes smoketests with headless config
---
.../isis/jdo/datanucleus/service}/JdoPersistenceLifecycleService.java | 4 +++-
.../src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java | 2 ++
.../isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java | 4 +++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/JdoPersistenceLifecycleService.java b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/service/JdoPersistenceLifecycleService.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/JdoPersistenceLifecycleService.java
rename to core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/service/JdoPersistenceLifecycleService.java
index 0f246f0..9358d5d 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/system/persistence/JdoPersistenceLifecycleService.java
+++ b/core/plugins/jdo/common/src/main/java/org/apache/isis/jdo/datanucleus/service/JdoPersistenceLifecycleService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system.persistence;
+package org.apache.isis.jdo.datanucleus.service;
import javax.annotation.PostConstruct;
import javax.inject.Singleton;
@@ -31,6 +31,8 @@ import org.apache.isis.config.registry.IsisBeanTypeRegistry;
import org.apache.isis.runtime.persistence.IsisJdoRuntimePlugin;
import org.apache.isis.runtime.system.context.session.AppLifecycleEvent;
import org.apache.isis.runtime.system.context.session.SessionLifecycleEvent;
+import org.apache.isis.runtime.system.persistence.PersistenceSession;
+import org.apache.isis.runtime.system.persistence.PersistenceSessionFactory;
import org.apache.isis.runtime.system.session.IsisSession;
import org.apache.isis.runtime.system.session.IsisSessionFactory;
diff --git a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java
index 787a7a9..092e6c6 100644
--- a/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java
+++ b/core/plugins/jdo/datanucleus-5/src/main/java/org/apache/isis/jdo/IsisBootDataNucleus.java
@@ -30,6 +30,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.jdo.datanucleus.DataNucleusSettings;
+import org.apache.isis.jdo.datanucleus.service.JdoPersistenceLifecycleService;
import org.apache.isis.jdo.jdosupport.IsisJdoSupportDN5;
import org.apache.isis.jdo.jdosupport.mixins.Persistable_datanucleusIdLong;
import org.apache.isis.jdo.metrics.MetricsServiceDefault;
@@ -38,6 +39,7 @@ import org.apache.isis.jdo.persistence.IsisPlatformTransactionManagerForJdo;
@Configuration
@Import({
DataNucleusSettings.class, // config bean
+ JdoPersistenceLifecycleService.class,
MetricsServiceDefault.class,
IsisJdoSupportDN5.class,
IsisPlatformTransactionManagerForJdo.class,
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
index a6b1630..4f94e17 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
@@ -24,6 +24,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.TestPropertySource;
+import org.apache.isis.commons.internal.plugins.environment.IsisSystemEnvironmentProvider;
import org.apache.isis.config.IsisConfiguration;
import org.apache.isis.config.IsisPresets;
import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
@@ -61,10 +62,11 @@ import lombok.val;
class DomainModelTest_usingBadDomain {
@Inject private IsisConfiguration configuration;
+ @Inject private IsisSystemEnvironmentProvider isisSystemEnvironmentProvider;
@Test
void fullIntrospection_shouldBeEnabledByThisTestClass() {
- assertTrue(IntrospectionMode.isFullIntrospect(configuration));
+ assertTrue(IntrospectionMode.isFullIntrospect(configuration, isisSystemEnvironmentProvider.isisSystemEnvironment()));
}
@Test