This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b4ea2c7cc52ac5e3ed9514c7520a3c1337813551
Author: danhaywood <d...@haywood-associates.co.uk>
AuthorDate: Tue Feb 11 08:15:16 2020 +0000
ISIS-2158: minor code tidy-up : use constructor injection for
IsisConfiguration
---
.../main/java/org/apache/isis/core/config/IsisConfiguration.java | 8 ++++++--
.../IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java | 2 +-
...sisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java | 2 +-
.../apache/isis/core/metamodel/MetaModelContext_forTesting.java | 3 +--
.../facets/object/ViewModelSemanticCheckingFacetFactoryTest.java | 2 +-
.../promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java | 2 +-
.../metamodel/specloader/SpecificationLoaderTestAbstract.java | 3 +--
.../shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java | 2 +-
.../ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java | 2 +-
9 files changed, 14 insertions(+), 12 deletions(-)
diff --git
a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index 3c6f6f1..839540d 100644
---
a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++
b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -78,8 +78,12 @@ import lombok.Value;
public class IsisConfiguration {
public static final String ROOT_PREFIX = "isis";
- @Autowired private ConfigurableEnvironment environment;
-
+
+ private final ConfigurableEnvironment environment;
+ public IsisConfiguration(final ConfigurableEnvironment environment) {
+ this.environment = environment;
+ }
+
@Inject @Named("isis-settings") private Map<String, String> isisSettings;
public Map<String, String> getAsMap() { return
Collections.unmodifiableMap(isisSettings); }
diff --git
a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
index 049f7a1..1018905 100644
---
a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
+++
b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
@@ -10,7 +10,7 @@ public class
IsisConfiguration_getMaxTitleLengthInParentedTables_Test {
@Before
public void setUp() throws Exception {
- configuration = new IsisConfiguration();
+ configuration = new IsisConfiguration(null);
}
@Test
diff --git
a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
index 6434437..41dbe5c 100644
---
a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
+++
b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
@@ -10,7 +10,7 @@ public class
IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test {
@Before
public void setUp() throws Exception {
- configuration = new IsisConfiguration();
+ configuration = new IsisConfiguration(null);
}
@Test
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
index 19cda70..52c34ce 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
@@ -177,8 +177,7 @@ public final class MetaModelContext_forTesting implements
MetaModelContext {
}
private static IsisConfiguration newIsisConfiguration() {
- val config = new IsisConfiguration();
- config.setEnvironment(new AbstractEnvironment() {
+ val config = new IsisConfiguration(new AbstractEnvironment() {
@Override
public String getProperty(String key) {
return _Config.getConfiguration().getString(key);
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index cb8b91c..85cfcfb 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -82,7 +82,7 @@ public class ViewModelSemanticCheckingFacetFactoryTest {
_Context.clear();
_Config.clear();
- val configuration = new IsisConfiguration();
+ val configuration = new IsisConfiguration(null);
configuration.getApplib().getAnnotation().getViewModel().getValidation().getSemanticChecking().setEnable(true);
metaModelContext = MetaModelContext_forTesting.builder()
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
index b07a27b..bcba2f3 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
@@ -46,7 +46,7 @@ public class PromptStyleFacetFromPropertyAnnotation_Test {
@Rule
public JUnitRuleMockery2 context =
JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
- IsisConfiguration stubConfiguration = new IsisConfiguration();
+ IsisConfiguration stubConfiguration = new IsisConfiguration(null);
@Mock
FacetHolder mockFacetHolder;
diff --git
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
index 26ba76e..c1bd33b 100644
---
a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
+++
b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
@@ -64,9 +64,8 @@ abstract class SpecificationLoaderTestAbstract {
}
IsisConfiguration newConfiguration() {
- val config = new IsisConfiguration(); // uses defaults!
+ val config = new IsisConfiguration(newConfigurableEnvironment());
// uses defaults!
config.getCore().getMetaModel().getIntrospector().setLockAfterFullIntrospection(false);
- config.setEnvironment(newConfigurableEnvironment());
return config;
}
diff --git
a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
index 7444b9f..b6774ce 100644
---
a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
+++
b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
@@ -59,7 +59,7 @@ public class ShiroAuthenticatorOrAuthorizorTest_authenticate {
// PRODUCTION
- val configuration = new IsisConfiguration();
+ val configuration = new IsisConfiguration(null);
configuration.getSecurity().getShiro().setAutoLogoutIfAlreadyAuthenticated(false);
authenticator = new AuthenticatorShiro(configuration);
diff --git
a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index 4269c68..7216d33 100644
---
a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++
b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -56,7 +56,7 @@ public class
ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole {
// PRODUCTION
- val configuration = new IsisConfiguration();
+ val configuration = new IsisConfiguration(null);
configuration.getSecurity().getShiro().setAutoLogoutIfAlreadyAuthenticated(false);
authenticator = new AuthenticatorShiro(configuration);
