[isis] 16/19: ISIS-2062: docs

[da...@apache.org]

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 3fab6e0ca65530c8bd2ea722df4acc5b9856edd7
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Feb 12 09:29:02 2020 +0000

    ISIS-2062: docs
---
 .../main/java/org/apache/isis/core/config/IsisConfiguration.java  | 8 +++++---
 .../java/org/apache/isis/core/config/IsisModuleCoreConfig.java    | 2 +-
 2 files changed, 6 insertions(+), 4 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 cf7becd..9052291 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
@@ -77,7 +77,9 @@ import org.apache.isis.core.config.metamodel.services.ApplicationFeaturesInitCon
 import org.apache.isis.core.config.metamodel.specloader.IntrospectionMode;
 import org.apache.isis.core.config.viewer.wicket.DialogMode;
 
+import lombok.AccessLevel;
 import lombok.Data;
+import lombok.Getter;
 import lombok.Value;
 import lombok.var;
 
@@ -104,9 +106,9 @@ public class IsisConfiguration {
     /**
      *
      */
-    @Inject @Named("isis-config-props-as-map")
-    private Map<String, String> asMap;
-    public Map<String, String> getAsMap() { return Collections.unmodifiableMap(asMap); }
+    @Inject @Named("isis-settings")
+    @Getter(AccessLevel.PRIVATE) private Map<String, String> isisSettings;
+    public Map<String, String> getAsMap() { return Collections.unmodifiableMap(isisSettings); }
 
 
     private final Security security = new Security();
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java b/core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java
index 04052f1..d0e09af 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java
@@ -53,7 +53,7 @@ import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
 public class IsisModuleCoreConfig {
     
     @ConfigurationProperties(prefix = "isis")
-    @Bean("isis-config-props-as-map")
+    @Bean("isis-settings")
     public Map<String, String> getIsisConfigProps() {
         return new HashMap<>();
     }