[isis] 13/19: ISIS-2062: fixes configuration bean (getAsMap() -> getIsisConfigProps)

[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 c8dbcea94b1d1d3ac3fbb97e9aad2748fd9e561d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Feb 12 07:33:21 2020 +0000

    ISIS-2062: fixes configuration bean (getAsMap() -> getIsisConfigProps)
---
 .../src/main/java/org/apache/isis/core/config/IsisConfiguration.java    | 2 +-
 .../src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java | 2 +-
 2 files changed, 2 insertions(+), 2 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 b50e1b9..cf7becd 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
@@ -104,7 +104,7 @@ public class IsisConfiguration {
     /**
      *
      */
-    @Inject @Named("as-map")
+    @Inject @Named("isis-config-props-as-map")
     private Map<String, String> asMap;
     public Map<String, String> getAsMap() { return Collections.unmodifiableMap(asMap); }
 
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 d0e09af..04052f1 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-settings")
+    @Bean("isis-config-props-as-map")
     public Map<String, String> getIsisConfigProps() {
         return new HashMap<>();
     }