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 2021/04/16 15:08:53 UTC
[isis] branch master updated: ISIS-2549: make presence of a
ConfigurationViewService optional
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 6d36094 ISIS-2549: make presence of a ConfigurationViewService optional
6d36094 is described below
commit 6d36094dff6a3ec6c4df2feda35aebd6ce78e47e
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Apr 16 17:08:36 2021 +0200
ISIS-2549: make presence of a ConfigurationViewService optional
---
.../applib/services/confview/ConfigurationViewmodel.java | 14 ++++++++++----
.../isis/core/runtime/events/MetamodelEventService.java | 12 +++++++++---
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewmodel.java b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewmodel.java
index 7f4d05a..db21d02 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewmodel.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationViewmodel.java
@@ -18,9 +18,10 @@
*/
package org.apache.isis.applib.services.confview;
+import java.util.Collections;
import java.util.Set;
-import javax.inject.Inject;
+import org.springframework.beans.factory.annotation.Autowired;
import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.applib.annotation.DomainObject;
@@ -31,7 +32,8 @@ import org.apache.isis.applib.annotation.Nature;
objectType = "isis.applib.ConfigurationViewmodel")
public class ConfigurationViewmodel {
- @Inject private ConfigurationViewService configurationService;
+ @Autowired(required = false)
+ private ConfigurationViewService configurationService;
public String title() {
return "Configuration";
@@ -39,12 +41,16 @@ public class ConfigurationViewmodel {
@Collection
public Set<ConfigurationProperty> getEnvironment(){
- return configurationService.getEnvironmentProperties();
+ return configurationService!=null
+ ? configurationService.getEnvironmentProperties()
+ : Collections.emptySet();
}
@Collection
public Set<ConfigurationProperty> getConfiguration(){
- return configurationService.getVisibleConfigurationProperties();
+ return configurationService!=null
+ ? configurationService.getVisibleConfigurationProperties()
+ : Collections.emptySet();
}
}
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/MetamodelEventService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/events/MetamodelEventService.java
index 0f39bcf..5ebeeb7 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/events/MetamodelEventService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/events/MetamodelEventService.java
@@ -21,6 +21,7 @@ package org.apache.isis.core.runtime.events;
import javax.inject.Inject;
import javax.inject.Named;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Primary;
import org.springframework.core.annotation.Order;
@@ -44,12 +45,17 @@ import org.apache.isis.core.metamodel.events.MetamodelEvent;
@Qualifier("Default")
public class MetamodelEventService {
- @Inject private EventBusService eventBusService;
- @Inject private ConfigurationViewService configurationService;
+ @Inject
+ private EventBusService eventBusService;
+
+ @Autowired(required = false)
+ private ConfigurationViewService configurationService;
public void fireBeforeMetamodelLoading() {
- _Xray.addConfiguration(configurationService);
+ if(configurationService!=null) {
+ _Xray.addConfiguration(configurationService);
+ }
eventBusService.post(MetamodelEvent.BEFORE_METAMODEL_LOADING);
}