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:14 UTC
[isis] 03/03: ISIS-2158: removes the IsisSystemEnvironmentProvider
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