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 2020/01/06 10:32:20 UTC
[isis] branch master updated: ISIS-2183: fixes case when there is
no ValuePropertyPlugin available
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 05f54bf ISIS-2183: fixes case when there is no ValuePropertyPlugin available
05f54bf is described below
commit 05f54bf51d596be2a562817d2048ec2660eceb30
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 6 11:32:09 2020 +0100
ISIS-2183: fixes case when there is no ValuePropertyPlugin available
---
.../service/swagger/internal/ValuePropertyFactoryDefault.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
index f551a99..79bd5df 100644
--- a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
@@ -26,14 +26,15 @@ import java.util.Map;
import java.util.UUID;
import java.util.function.Supplier;
-import javax.inject.Inject;
import javax.inject.Named;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.ValuePropertyPlugin.ValuePropertyCollector;
@@ -57,7 +58,7 @@ public class ValuePropertyFactoryDefault implements ValuePropertyFactory {
private final Map<Class<?>, Factory> propertyFactoryByClass = _Maps.newHashMap();
- @Inject private List<ValuePropertyPlugin> valuePropertyPlugins;
+ @Autowired(required = false) private List<ValuePropertyPlugin> valuePropertyPlugins;
public static interface Factory extends Supplier<Property> {};
@@ -138,7 +139,7 @@ public class ValuePropertyFactoryDefault implements ValuePropertyFactory {
private ValuePropertyCollector discoverValueProperties() {
final ValuePropertyCollector collector = ValuePropertyPlugin.collector();
- valuePropertyPlugins.forEach(plugin->{
+ _NullSafe.stream(valuePropertyPlugins).forEach(plugin->{
plugin.plugin(collector);
});
return collector;